22 removed + 8 modified, total 30 files
projects/slic/trunk/include
--- projects/slic/trunk/include/CommandLineOption.hh 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/include/CommandLineOption.hh 2014-08-07 20:29:21 UTC (rev 3240)
@@ -26,10 +26,18 @@
* @param[in] maxArgs The maximum number of arguments.
* @param[in] macroCommand The corresponding Geant4 macro string.
*/
- CommandLineOption(const std::string& shortname, const std::string& longname, const std::string& description, unsigned int minArgs = 0,
- unsigned int maxArgs = 0, const std::string& macroCommand = "") :
- m_shortname(shortname), m_longname(longname), m_description(description), m_g4cmdstr(macroCommand), m_minArgs(minArgs), m_maxArgs(maxArgs) {
- ;
+ CommandLineOption(const std::string& shortname,
+ const std::string& longname,
+ const std::string& description,
+ unsigned int minArgs = 0,
+ unsigned int maxArgs = 0,
+ const std::string& macroCommand = "") :
+ m_shortname(shortname),
+ m_longname(longname),
+ m_description(description),
+ m_g4cmdstr(macroCommand),
+ m_minArgs(minArgs),
+ m_maxArgs(maxArgs) {
}
/**
projects/slic/trunk/include
--- projects/slic/trunk/include/LcioManager.hh 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/include/LcioManager.hh 2014-08-07 20:29:21 UTC (rev 3240)
@@ -50,14 +50,12 @@
* Enum for setting what action to take when an output LCIO file already exists.
*/
enum EFileExistsAction {
- eInvalid = -1, eFail = 0, eDelete = 1, eAppend = 2
+ eInvalid = -1,
+ eFail = 0,
+ eDelete = 1,
+ eAppend = 2
};
- /**
- * Typedef for run number.
- */
- typedef unsigned int RunNumberType;
-
public:
/**
@@ -110,7 +108,7 @@
* Set the current run number.
* @param[in] runNumber The run number.
*/
- void setRunNumber(RunNumberType runNumber);
+ void setRunNumber(int runNumber);
/**
* Begin of run hook.
@@ -316,7 +314,7 @@
EFileExistsAction m_fileExistsAction;
// starting run number
- RunNumberType m_runNumber;
+ int m_runNumber;
LcioFileNamer* m_namer;
projects/slic/trunk/include
--- projects/slic/trunk/include/TrackUtil.hh 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/include/TrackUtil.hh 2014-08-07 20:29:21 UTC (rev 3240)
@@ -2,7 +2,7 @@
#define SLIC_TRACKUTIL_HH_ 1
// LCDD
-#include "lcdd/geant4/UserRegionInformation.hh"
+#include "lcdd/core/UserRegionInformation.hh"
// SLIC
#include "TrackManager.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/UserTrackInformation.hh 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/include/UserTrackInformation.hh 2014-08-07 20:29:21 UTC (rev 3240)
@@ -2,7 +2,7 @@
#define SLIC_USERTRACKINFORMATION_HH_ 1
// LCDD
-#include "lcdd/geant4/VUserTrackInformation.hh"
+#include "lcdd/core/VUserTrackInformation.hh"
// SLIC
#include "TrackSummary.hh"
projects/slic/trunk/macros
--- projects/slic/trunk/macros/NPCylBarr.mac 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/macros/NPCylBarr.mac 2014-08-07 20:29:21 UTC (rev 3240)
@@ -1,89 +0,0 @@
-# $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/macros/NPCylBarr.mac,v 1.8 2005-06-27 18:48:06 jeremy Exp $
-# set G4 verbosities
-/control/verbose 2
-/run/verbose 0
-/tracking/verbose 0
-/event/verbose 0
-
-# load geometry
-/lcdd/url examples/segtest/NPCylBarr.lcdd
-
-# set lcio verbosity
-/lcio/verbose 4
-
-# set lcio path and filename
-/lcio/path .
-/lcio/filename lcioOutputFile
-
-# set Monte Carlo engine verbosity
-/mcp/verbose 0
-
-# set tolerance for vertexIsNotEndpointOfParent flag
-#/mcp/setVertexTolerance 1.0
-
-# set minimum tracking distance for MCP
-/mcp/minimumTrackingDistance 1.0
-
-# select stdhep generator
-/generator/select stdhep
-
-# set stdhep filename and events to skip
-/generator/filename stdhep/muons
-/generator/skipEvents 0
-
-# random seed with user value
-/random/seed 329583482
-
-# random seed from time
-#/random/seed
-
-/physics/select LHEP
-
-# initialize G4RunManager
-/run/initialize
-
-# visualization
-/vis/scene/create
-/vis/scene/add/volume
-/vis/scene/add/trajectories
-/vis/scene/add/hits
-
-/vis/open OGLSX
-/vis/viewer/zoom 8
-
-# execute events
-/run/beamOn 1
-/stdhep
-€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kra.stdhep:w
-:n
-n:n
-nn€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kra.stdhep:w
-nnnnn:n
-nn:n
-nn:n
-nn:n
-nn:n
-:n
-n:n
-n:n
-nn€kl€kl€kl€kl€kl€kl€kl:w
-:n
-:n
-:n
-:n
-:n
-:n
-n€kd€kd€ku€ku€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kra.stdhep:w
-€kd€kd€kd€kd€kd€kd€kd€ku€ku€ku€ku€ku€ku€ku€ku€kd€kl€kl€kl€kl€kl€kl€kl€kl€kl€kl€klistdhep/ttbar`xxxxxx:w
-€krnnnnnnnnnnnn:w
-:n
-nnnn€kd€kd€kd€kd€kd€kd€kd€kd€ku€ku€ku€ku€ku€ku€kd€ku€kl€ku€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kr€kddddddd€ku€kdi
-€ku#/generator/filename ttbar:w
-€ku€ku€kl€kl€kl€klistdhep/€kr€kr€kr€kr€kr.stdhep€kd€kl€kl€kl€kl€klstdhep/€kr€kr€kr€kr€kr.stdhep€kd€kl€kl€kl€kl€klstdhep/€kr/€kl€kl€krxx€kr€kr€kr€kra€kl€kl€klt€kr€kr€kr.stdhep:w
-:wq
-
-:w
-:n
-nn:n
-nn:n
-nn:wq
projects/slic/trunk/macros
--- projects/slic/trunk/macros/NPPolyEcap.mac 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/macros/NPPolyEcap.mac 2014-08-07 20:29:21 UTC (rev 3240)
@@ -1,30 +0,0 @@
-/control/verbose 2
-
-/lcdd/url examples/segtest/NPPolyEcap.lcdd
-
-/lcio/path .
-/lcio/filename lcioOutputFile
-
-/physics/select LHEP
-
-/generator/select gps
-
-/run/initialize
-
-/gps/particle mu-
-/gps/energy 10 GeV
-/gps/position 0 600 300 mm
-/gps/direction 0 0 -1
-
-/control/execute macros/heprep2.mac
-
-/vis/drawTree
-/vis/scene/add/hits
-/vis/scene/add/trajectories
-
-/vis/open OGLIX
-/vis/viewer/panTo ! .7
-/vis/viewer/zoom 2
-/vis/viewer/set/viewpointThetaPhi 90 0
-
-/run/beamOn
projects/slic/trunk/macros
--- projects/slic/trunk/macros/PrjBarr.mac 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/macros/PrjBarr.mac 2014-08-07 20:29:21 UTC (rev 3240)
@@ -1,54 +0,0 @@
-# set G4 verbosities
-/control/verbose 2
-/run/verbose 0
-/tracking/verbose 0
-/event/verbose 0
-
-# load geometry
-/lcdd/url examples/segtest/PrjBarr.lcdd
-
-# set lcio verbosity
-/lcio/verbose 4
-
-# set lcio path and filename
-/lcio/path .
-/lcio/filename lcioOutputFile
-
-# set Monte Carlo engine verbosity
-/mcp/verbose 0
-
-# set tolerance for vertexIsNotEndpointOfParent flag
-#/mcp/setVertexTolerance 1.0
-
-# set minimum tracking distance for MCP
-/mcp/minimumTrackingDistance 1.0
-
-# select stdhep generator
-/generator/select stdhep
-
-# set stdhep filename and events to skip
-/generator/filename stdhep/muons.stdhep
-/generator/skipEvents 0
-
-# random seed with user value
-/random/seed 329583482
-
-# random seed from time
-#/random/seed
-
-/physics/select LHEP
-
-# initialize G4RunManager
-/run/initialize
-
-# visualization
-/vis/scene/create
-/vis/scene/add/volume
-/vis/scene/add/trajectories
-/vis/scene/add/hits
-
-/vis/open OGLSX
-/vis/viewer/zoom 8
-
-# execute events
-/run/beamOn 1
projects/slic/trunk/macros
--- projects/slic/trunk/macros/PrjEcap.mac 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/macros/PrjEcap.mac 2014-08-07 20:29:21 UTC (rev 3240)
@@ -1,29 +0,0 @@
-/control/verbose 2
-
-/lcdd/url examples/segtest/PrjEcap.lcdd
-
-/lcio/path .
-/lcio/filename lcioOutputFile
-
-/physics/select LHEP
-
-/generator/select gps
-
-/run/initialize
-
-/gps/particle mu-
-/gps/energy 10 GeV
-/gps/position 0 850 300 mm
-/gps/direction 0 0 1
-
-#/control/execute macros/heprep2.mac
-
-/vis/drawTree
-/vis/scene/add/hits
-/vis/scene/add/trajectories
-
-/vis/open OGLIX
-/vis/viewer/zoom 3
-/vis/viewer/set/viewpointThetaPhi 25 20
-
-/run/beamOn
projects/slic/trunk/macros
--- projects/slic/trunk/macros/append.mac 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/macros/append.mac 2014-08-07 20:29:21 UTC (rev 3240)
@@ -1 +0,0 @@
-/lcio/fileExists append
projects/slic/trunk/macros
--- projects/slic/trunk/macros/barr.mac 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/macros/barr.mac 2014-08-07 20:29:21 UTC (rev 3240)
@@ -1,23 +0,0 @@
-/control/verbose 2
-
-/lcdd/url examples/cal/barr.lcdd
-
-/lcio/path .
-/lcio/filename lcioOutputFile
-
-/run/initialize
-
-/gps/particle pi+
-/gps/energy 1 GeV
-/gps/position 0 0 0
-/gps/direction 0 1 0
-
-/control/execute macros/vis_gl.mac
-/vis/viewer/zoom 5.5
-/vis/viewer/panTo .4 .8
-
-/lcio/fileExists overwrite
-
-/run/beamOn
-
-/control/interactive
projects/slic/trunk/macros
--- projects/slic/trunk/macros/cleanup.mac 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/macros/cleanup.mac 2014-08-07 20:29:21 UTC (rev 3240)
@@ -1,5 +0,0 @@
-/event/enableEventTimer false
-/mcp/printInitialCollection false
-/mcp/printFinalCollection false
-/tracking/verbose 0
-/mcp/verbose 0
projects/slic/trunk/macros
--- projects/slic/trunk/macros/debug.mac 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/macros/debug.mac 2014-08-07 20:29:21 UTC (rev 3240)
@@ -1,5 +0,0 @@
-/event/enableEventTimer
-/mcp/verbose 4
-/mcp/printInitialCollection
-/mcp/printFinalCollection
-/tracking/verbose 2
projects/slic/trunk/macros
--- projects/slic/trunk/macros/debugTest.mac 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/macros/debugTest.mac 2014-08-07 20:29:21 UTC (rev 3240)
@@ -1,11 +0,0 @@
-/lcdd/url ./examples/template.lcdd
-
-/debug/addEvents 0 2
-/debug/debugMacro ./macros/debug.mac
-/debug/cleanupMacro ./macros/cleanup.mac
-
-/lcio/fileExists delete
-
-/run/initialize
-
-/run/beamOn 3
projects/slic/trunk/macros
--- projects/slic/trunk/macros/ecap.mac 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/macros/ecap.mac 2014-08-07 20:29:21 UTC (rev 3240)
@@ -1,26 +0,0 @@
-/control/verbose 2
-
-/lcdd/url examples/cal/ecap.lcdd
-
-/lcio/path .
-/lcio/filename lcioOutputFile
-
-/run/initialize
-
-/gps/particle mu-
-/gps/energy 10 GeV
-/gps/position 0 600 300 mm
-/gps/direction 0 0 -1
-
-/control/execute macros/heprep2.mac
-
-/vis/drawTree
-/vis/scene/add/hits
-/vis/scene/add/trajectories
-
-/vis/open OGLIX
-/vis/viewer/panTo ! .7
-/vis/viewer/zoom 2
-/vis/viewer/set/viewpointThetaPhi 90 0
-
-#/run/beamOn
projects/slic/trunk/macros
--- projects/slic/trunk/macros/geom_chk.mac 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/macros/geom_chk.mac 2014-08-07 20:29:21 UTC (rev 3240)
@@ -1 +0,0 @@
-/geometry/test/recursive_test
projects/slic/trunk/macros
--- projects/slic/trunk/macros/heprep2.mac 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/macros/heprep2.mac 2014-08-07 20:29:21 UTC (rev 3240)
@@ -1,12 +0,0 @@
-/vis/scene/create
-/vis/open HepRepXML
-/vis/viewer/set/culling global false
-
-# use first to set volume depth cutoff
-#/vis/scene/add/volume ! ! 2
-/vis/scene/add/volume
-
-/vis/scene/add/trajectories
-/vis/scene/add/hits
-
-#/vis/viewer/flush
projects/slic/trunk/macros
--- projects/slic/trunk/macros/mandatory.mac 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/macros/mandatory.mac 2014-08-07 20:29:21 UTC (rev 3240)
@@ -1,13 +0,0 @@
-# mandatory actions for SLIC init
-
-# select physics list
-/physics/select LHEP
-
-# select generator
-/generator/select gps
-
-# put your geo file here
-/lcdd/url examples/template.lcdd
-
-# initialize the simulation
-/run/initialize
projects/slic/trunk/macros
--- projects/slic/trunk/macros/run1.mac 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/macros/run1.mac 2014-08-07 20:29:21 UTC (rev 3240)
@@ -1 +0,0 @@
-/run/beamOn 1
projects/slic/trunk/macros
--- projects/slic/trunk/macros/run10.mac 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/macros/run10.mac 2014-08-07 20:29:21 UTC (rev 3240)
@@ -1 +0,0 @@
-/run/beamOn 10
projects/slic/trunk/macros
--- projects/slic/trunk/macros/run10k.mac 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/macros/run10k.mac 2014-08-07 20:29:21 UTC (rev 3240)
@@ -1 +0,0 @@
-/run/beamOn 10000
projects/slic/trunk/macros
--- projects/slic/trunk/macros/run1k.mac 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/macros/run1k.mac 2014-08-07 20:29:21 UTC (rev 3240)
@@ -1 +0,0 @@
-/run/beamOn 1000
projects/slic/trunk/macros
--- projects/slic/trunk/macros/run5k.mac 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/macros/run5k.mac 2014-08-07 20:29:21 UTC (rev 3240)
@@ -1 +0,0 @@
-/run/beamOn 5000
projects/slic/trunk/macros
--- projects/slic/trunk/macros/sdjan03.mac 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/macros/sdjan03.mac 2014-08-07 20:29:21 UTC (rev 3240)
@@ -1,83 +0,0 @@
-# $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/macros/sdjan03.mac,v 1.11 2005-06-27 18:48:07 jeremy Exp $
-
-# set G4 verbosities
-/control/verbose 2
-/run/verbose 0
-/tracking/verbose 0
-/event/verbose 0
-
-# set Monte Carlo engine verbosity
-/mcp/verbose 0
-
-# set lcio verbosity
-/lcio/verbose 0
-
-# select physics list
-/physics/select LHEP
-
-# load geometry file
-/lcdd/url examples/sdjan03/SDJan03.lcdd
-/lcdd/setupName Default
-/lcdd/version 1.0
-
-# set lcio path and filename
-#/lcio/path .
-#/lcio/filename slic_sdjan03_muons_Theta4-176_1-10GeV_100evt
-/lcio/autoname
-
-# set tolerance for vertexIsNotEndpointOfParent flag
-#/mcp/setVertexTolerance 1.0
-
-# set minimum tracking distance for MCP
-/mcp/minimumTrackingDistance 1.0
-
-# select GPS generator
-#/generator/select gps
-#/gps/particle mu-
-#/gps/energy 10 GeV
-#/gps/position 0 0 0
-#/gps/direction 0 1 0
-
-# select stdhep generator
-/generator/select stdhep
-# set stdhep filename and events to skip
-#/generator/filename stdhep/muons.stdhep
-/generator/filename stdhep/zpole.stdhep
-#/generator/filename stdhep/ttbar.stdhep
-#/generator/skipEvents 0
-
-# random seed with user value
-/random/seed 329583482
-
-# random seed from time
-#/random/seed
-
-# initialize G4RunManager
-/run/initialize
-
-# dump Geant4 store info
-#/stores/print lv
-#/stores/print solid
-#/stores/print region
-#/stores/print pv
-
-/vis/drawTree
-
-# visualization
-/vis/scene/create
-/vis/scene/add/volume
-/vis/scene/add/trajectories
-/vis/scene/add/hits
-
-#/vis/open DAWNFILE
-#/vis/open OGLSX
-
-/vis/viewer/set/viewpointThetaPhi 90 0
-/vis/viewer/zoom 6
-
-#/control/execute macros/heprep2.mac
-
-#/geometry/test/recursive_test
-
-# execute events
-/run/beamOn 1
projects/slic/trunk/macros
--- projects/slic/trunk/macros/sdjan03_dbg.mac 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/macros/sdjan03_dbg.mac 2014-08-07 20:29:21 UTC (rev 3240)
@@ -1,98 +0,0 @@
-# $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/macros/sdjan03_dbg.mac,v 1.14 2005-06-27 18:51:18 jeremy Exp $
-
-#
-# Simulator setup for debugging LCIO output with StdHep input or GPS.
-#
-
-# echo on
-/control/verbose 2
-
-# set geometry file
-/lcdd/url examples/sdjan03/SDJan03.lcdd
-
-# select physics list
-/physics/select LHEP
-
-# set G4 verbosities
-/run/verbose 0
-/tracking/verbose 0
-/event/verbose 0
-
-# set Monte Carlo engine verbosity
-/mcp/verbose 0
-
-# set minimum tracking distance for Mcp
-# to be created in simulator from StdHep input
-/mcp/minimumTrackingDistance 0.1
-
-# set lcio verbosity
-/lcio/verbose 0
-
-# set lcio output path
-/lcio/path .
-
-# set CHBIT_LONG
-/lcio/longFlag true
-
-# set CHBIT_PDG
-/lcio/PDGFlag true
-
-# file exists mode
-/lcio/fileExists fail
-
-# choose LCIO filename
-/lcio/filename slic_sdjan03_muons_Theta4-176_1-10GeV
-#/lcio/filename slic_sdjan03_lambda_Theta90_1-10Gev
-#/lcio/filename slic_sdjan03_K0S_Theta90_1-10GeV
-#/lcio/filename slic_sdjan03_K_5GeV_Theta90
-#/lcio/filename slic_sdjan03_zpole
-
-# select stdhep generator
-/generator/select stdhep
-
-# choose stdhep file
-/generator/filename stdhep/zpole.stdhep
-#/generator/filename stdhep/muons.stdhep
-#/generator/filename stdhep/ttbar.stdhep
-
-# select GPS generator
-#/generator/select gps
-
-# set GPS parameters
-#/gps/particle mu-
-#/gps/energy 10 GeV
-#/gps/position 0 0 0
-#/gps/direction 0 1 0
-
-# set number of StdHep events to skip
-#/generator/skipEvents 454
-
-# set random seed with user value
-/random/seed 329583482
-
-# set random seed from time
-#/random/seed
-
-# initialize G4RunManager
-/run/initialize
-
-# draw ASCII tree
-/vis/drawTree
-
-# visualization
-#/vis/scene/create
-#/vis/scene/add/volume
-#/vis/scene/add/trajectories
-#/vis/scene/add/hits
-
-#/vis/open OGLSX
-#/vis/viewer/zoom 2.5
-
-# random save at each event
-/random/setSavingFlag 1
-
-# set starting random state from file for debugging
-#/random/resetEngineFrom currentEvent.rndm
-
-# execute events
-/run/beamOn 1
projects/slic/trunk/macros
--- projects/slic/trunk/macros/stores.mac 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/macros/stores.mac 2014-08-07 20:29:21 UTC (rev 3240)
@@ -1,13 +0,0 @@
-# Geant4 objects from the Store vectors
-/stores/G4Material/print
-/stores/G4VSolid/print
-/stores/G4VPhysicalVolume/print
-/stores/G4LogicalVolume/print
-
-# LCDD managed stores from LCDDProcessor
-/stores/IdSpec/print
-/stores/G4SensitiveDetector/print
-/stores/G4VisAttributes/print
-/stores/G4MagneticField/print
-/stores/G4LimitSet/print
-/stores/G4Region/print
projects/slic/trunk/macros
--- projects/slic/trunk/macros/tbeam.mac 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/macros/tbeam.mac 2014-08-07 20:29:21 UTC (rev 3240)
@@ -1,25 +0,0 @@
-/control/verbose 2
-
-/lcdd/url examples/tbeam/tb.lcdd
-
-/physics/select LHEP
-
-/generator/select gps
-
-/run/initialize
-
-/vis/scene/create
-/vis/scene/add/volume
-/vis/scene/add/trajectories
-/vis/scene/add/hits
-/vis/open OGLSX
-/vis/viewer/set/viewpointThetaPhi 90 0
-
-/gps/particle pi+
-/gps/direction 0 0 1
-/gps/position 0 0 -4.9 m
-/gps/energy 2 GeV
-
-/lcio/fileExists append
-
-/run/beamOn 1
projects/slic/trunk/src
--- projects/slic/trunk/src/LcioFileNamer.cc 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/src/LcioFileNamer.cc 2014-08-07 20:29:21 UTC (rev 3240)
@@ -44,17 +44,17 @@
static std::string sep("-");
- if (field == "application" || field == "app") {
+ if (field == "application") {
value = PackageInfo::getShortName() + "-v" + PackageInfo::getVersion(sep);
- } else if (field == "geometry" || field == "geo") {
+ } else if (field == "geometry") {
value = LCDDProcessor::instance()->getDetectorName();
} else if (field == "date") {
value = TimeUtil::getDate();
} else if (field == "event" || field == "evt") {
value = LcioFileNamer::makeEventName();
- } else if (field == "eventNumber" || field == "evtNum") {
+ } else if (field == "eventNumber") {
value = LcioFileNamer::makeEventNumberString();
- } else if (field == "run" || field == "runNumber" || field == "runNum") {
+ } else if (field == "run") {
value = LcioFileNamer::makeRunNumberString();
} else if (field == "binary") {
value = SlicApplication::instance()->getBinaryBasename();
projects/slic/trunk/src
--- projects/slic/trunk/src/LcioManager.cc 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/src/LcioManager.cc 2014-08-07 20:29:21 UTC (rev 3240)
@@ -52,8 +52,15 @@
string LcioManager::m_defaultFileName = "slicEvents";
LcioManager::LcioManager() :
- Module("LcioManager"), m_writer(0), m_runHdr(0), m_fileExistsAction(LcioManager::eFail),
- m_runNumber(0), m_enableDumpEvent(false), m_writerIsOpen(false), m_usingAutoname(false) {
+ Module("LcioManager"),
+ m_writer(NULL),
+ m_runHdr(NULL),
+ m_fileExistsAction(LcioManager::eFail),
+ m_runNumber(0),
+ m_enableDumpEvent(false),
+ m_writerIsOpen(false),
+ m_usingAutoname(false) {
+
// Initialize the Geant4 UI messenger for the LCIO.
m_messenger = new LcioMessenger(this);
@@ -143,10 +150,9 @@
return fea;
}
-void LcioManager::setRunNumber(RunNumberType rnt) {
- m_runNumber = rnt;
-
- log().verbose("Set starting run number <" + StringUtil::toString((int) m_runNumber) + ">");
+void LcioManager::setRunNumber(int runNumber) {
+ m_runNumber = runNumber;
+ log().verbose("Set starting run number <" + StringUtil::toString((int) runNumber) + ">");
}
void LcioManager::createWriter() {
@@ -191,19 +197,17 @@
void LcioManager::beginRun(const G4Run* aRun) {
- // Automatically create LCIO output file name if option was selected.
- if (m_usingAutoname) {
- makeAutoname();
- }
-
// Set the G4Run counter.
- G4RunManager::GetRunManager()->SetRunIDCounter(m_runNumber);
+ G4RunManager::GetRunManager()->GetNonConstCurrentRun()->SetRunID(m_runNumber);
+ // Automatically create LCIO output file name if option was selected.
+ if (m_usingAutoname) {
+ makeAutoname();
+ }
+
// Open the LCIO output file for writing.
openLcioFile();
- //std::cout << "abortCurrentRun = " << m_abortCurrentRun << std::endl;
-
// Run aborted, because LCIO output file already exists.
if (!RunManager::instance()->isRunAborted()) {
projects/slic/trunk/src
--- projects/slic/trunk/src/RunManager.cc 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/src/RunManager.cc 2014-08-07 20:29:21 UTC (rev 3240)
@@ -79,11 +79,13 @@
}
void RunManager::InitializeGeometry() {
+ // Was a valid LCDD setup given?
if (!LCDDParser::instance()->isValidSetup()) {
- //G4Exception("", "", FatalException, "Current LCDD geometry setup is not valid.");
+ // Abort the run as the LCDD URL was probably not set.
SlicApplication::instance()->setReturnCode(SlicApplication::INVALID_GEOMETRY_SETUP);
this->abortRun();
} else {
+ // Initialize the geometry.
G4RunManager::InitializeGeometry();
}
}
projects/slic/trunk/src
--- projects/slic/trunk/src/SteppingAction.cc 2014-08-07 20:26:41 UTC (rev 3239)
+++ projects/slic/trunk/src/SteppingAction.cc 2014-08-07 20:29:21 UTC (rev 3240)
@@ -5,7 +5,7 @@
#include "TrackUtil.hh"
// LCDD
-#include "lcdd/geant4/UserRegionInformation.hh"
+#include "lcdd/core/UserRegionInformation.hh"
// Geant4
#include "G4SteppingManager.hh"
SVNspam 0.1