Skip to content
Closed
Show file tree
Hide file tree
Changes from 213 commits
Commits
Show all changes
214 commits
Select commit Hold shift + click to select a range
ba187a4
Update StPicoDstMaker.cxx
klendathu2k Jun 11, 2021
a397637
Update StRoot/StPicoDstMaker/StPicoDstMaker.cxx
nigmatkulov Jun 11, 2021
c3ccb18
Merge branch 'star-bnl:main' into main
klendathu2k Jun 25, 2021
e161802
Merge branch 'star-bnl:main' into main
klendathu2k Jun 29, 2021
20c3175
Merge branch 'star-bnl:main' into main
klendathu2k Jul 1, 2021
05f3ea7
Star6 StTofHitMaker
perevbnlgov Aug 9, 2021
a1d3f34
Merge branch 'star-bnl:main' into main
klendathu2k Aug 11, 2021
1cbe68f
Merge branch 'star-bnl:main' into main
klendathu2k Aug 12, 2021
b6622a6
Merge branch 'star-bnl:main' into main
klendathu2k Aug 13, 2021
b94d0ab
Merge branch 'star-bnl:main' into main
klendathu2k Aug 19, 2021
c459e2f
Merge pull request #3 from perevbnlgov/Star6
klendathu2k Aug 19, 2021
790527e
Fix typo
perevbnlgov Aug 21, 2021
3c50c29
Merge branch 'star-bnl:main' into star-root6.16.00
klendathu2k Aug 23, 2021
edd1754
Merge branch 'star-bnl:main' into main
klendathu2k Aug 23, 2021
8d88f0b
Add missing EPD nhits and hit pointer
klendathu2k Aug 23, 2021
d4efff5
Add EPD hit information to the track.
klendathu2k Aug 24, 2021
2ff2ee7
Add map of GEANT3 paramaters and cuts associated to volumes.
klendathu2k Aug 24, 2021
e23720a
AgMLExtension inherits from TGeoExtension, which allows user and/or
klendathu2k Aug 24, 2021
c0bfa44
Cleanup memory.
klendathu2k Aug 24, 2021
c19b6ba
General cleanup, and moving mixture component to protected.
klendathu2k Aug 24, 2021
582e8cf
AgMath provides math functions used by AgML codes. A few of these
klendathu2k Aug 24, 2021
bac7771
Attach AgMLExtensions to the modules
klendathu2k Aug 24, 2021
22592e6
Cleanup and replace ROOT types with basic types
klendathu2k Aug 24, 2021
29a52ae
WARN: Temp disable misalignment under ROOT6
klendathu2k Aug 24, 2021
35c76ac
We don't even need a classdef here...
klendathu2k Aug 24, 2021
458b32f
We don't need to access most of this interactively... so comment out …
klendathu2k Aug 24, 2021
41f2fe2
Responsible for setting up the AgMLExtensions in the TGeoVolumes,
klendathu2k Aug 24, 2021
85690cf
Dummy handler for the UserHit command
klendathu2k Aug 24, 2021
3cc2578
- Process the <UserHit ...> syntax and make relevant calls into the s…
klendathu2k Aug 24, 2021
42c853a
UserHit syntax
klendathu2k Aug 24, 2021
762d2d8
Back to standard StMessMgr... ENDL-->endm
klendathu2k Aug 24, 2021
d250ec7
Back to standard StMessMgr... ENDL-->endm
klendathu2k Aug 24, 2021
70516d6
Merge branch 'star-root6.16.00' into star-geant4maker-dev
klendathu2k Aug 24, 2021
6a5bfa2
Merge remote-tracking branch 'origin/star-g2t-event' into star-geant4…
klendathu2k Aug 24, 2021
0e7c238
Merge remote-tracking branch 'origin/star-agml-dev' into star-geant4m…
klendathu2k Aug 24, 2021
ff8bf3a
Merge branch 'star-bnl:main' into star-root6.16.00
klendathu2k Aug 25, 2021
fede61b
Add map of GEANT3 paramaters and cuts associated to volumes.
klendathu2k Aug 24, 2021
3b2cf8d
AgMLExtension inherits from TGeoExtension, which allows user and/or
klendathu2k Aug 24, 2021
60158a4
Cleanup memory.
klendathu2k Aug 24, 2021
f4968d4
General cleanup, and moving mixture component to protected.
klendathu2k Aug 24, 2021
43331b5
AgMath provides math functions used by AgML codes. A few of these
klendathu2k Aug 24, 2021
c6cd5ac
Attach AgMLExtensions to the modules
klendathu2k Aug 24, 2021
e44b8a7
Cleanup and replace ROOT types with basic types
klendathu2k Aug 24, 2021
f2c7531
WARN: Temp disable misalignment under ROOT6
klendathu2k Aug 24, 2021
500c643
We don't even need a classdef here...
klendathu2k Aug 24, 2021
f85bcc8
We don't need to access most of this interactively... so comment out …
klendathu2k Aug 24, 2021
7a1d9ef
Responsible for setting up the AgMLExtensions in the TGeoVolumes,
klendathu2k Aug 24, 2021
694388b
Dummy handler for the UserHit command
klendathu2k Aug 24, 2021
0cb4aa1
- Process the <UserHit ...> syntax and make relevant calls into the s…
klendathu2k Aug 24, 2021
c848963
UserHit syntax
klendathu2k Aug 24, 2021
2b17bc3
Back to standard StMessMgr... ENDL-->endm
klendathu2k Aug 24, 2021
aeea72e
Simple test script for geometries. Compares local build of the
klendathu2k Aug 25, 2021
6c546aa
Initial commit setup contradictory tests. This commit fixes that issue.
klendathu2k Aug 26, 2021
8143f2e
This macro is required for the testGeometry.csh script
klendathu2k Aug 26, 2021
314fac8
Disable dead code
klendathu2k Aug 26, 2021
c763f94
The sanity check on the main branch is newer than the geant4star vers…
klendathu2k Aug 26, 2021
a6dc64d
St.h St.cxx St::call(...)
perevbnlgov Aug 30, 2021
d5ad249
ReadMe file of StarEtc directory. Containss different auxiliary files…
perevbnlgov Aug 31, 2021
3a99ab6
Merge branch 'star-bnl:main' into star-root6.16.00
klendathu2k Sep 3, 2021
52cb9c0
Pull in strstrstream fix.
klendathu2k Sep 3, 2021
f09e712
Merge pull request #4 from perevbnlgov/Star6
klendathu2k Sep 4, 2021
edabc84
Merge branch 'star-root6.16.00' into star-geant4maker-dev
klendathu2k Sep 4, 2021
21aadf9
G4star requires direct stack access
klendathu2k Sep 6, 2021
227ee2a
Add entries for geant4, geant4vmc and geant4star maker (plus agml w/ …
klendathu2k Sep 6, 2021
71921c9
Expose pi to geoemtry modules
klendathu2k Sep 6, 2021
7dcbd58
Merge branch 'star-agml-dev' into star-geant4maker-dev
klendathu2k Sep 7, 2021
bac36f6
Remove the TGiant3/St_geant_Maker dependence from StarGenerator
klendathu2k Sep 7, 2021
9efe43f
Particle data and the particle stack should be set as ".const" rather
klendathu2k Sep 8, 2021
b02c987
Particle data and particle stack should be persistent for duration of
klendathu2k Sep 8, 2021
6dbf404
Merge remote-tracking branch 'origin/star-stargen-fix' into star-star…
klendathu2k Sep 8, 2021
0521fc3
Merge branch 'star-stargenerator-dev' into star-geant4maker-dev
klendathu2k Sep 8, 2021
caf21a1
Initial commit
klendathu2k Sep 10, 2021
9cb4e24
Initialize common block pointer to zero, and assert that it exists
klendathu2k Sep 11, 2021
856a87b
Break out each generator library as its own option
klendathu2k Sep 11, 2021
eb0befc
geant4star script
klendathu2k Sep 11, 2021
89222ab
Issue #45 notes an issue with building the geometry codes. This is c…
klendathu2k Sep 11, 2021
ab82186
Merge branch 'star-bnl:main' into star-buildgeom-fix
klendathu2k Sep 14, 2021
594b765
Merge branch 'star-bnl:main' into star-geant4maker-dev
klendathu2k Sep 14, 2021
1a79e4a
Forward declaration of ostrstream is incompatible w/ the aliasing to …
klendathu2k Sep 14, 2021
cba9a12
cons requires the full path in order to infer the dependency
klendathu2k Sep 14, 2021
6310df2
Fix issue with dependency discovery in cons (#include's must have the
klendathu2k Sep 14, 2021
34e5616
Until we have time to separate the geometry build area from the code …
klendathu2k Sep 15, 2021
e5bd74a
Explicitly disable multi-threaded run to avoid hitting an exception (…
klendathu2k Sep 16, 2021
d2b7e24
Let's be pendantic
klendathu2k Sep 16, 2021
349269f
Annoyingly, the _ wasn't appended by the cpp macro.
klendathu2k Sep 16, 2021
798cb24
Temp remove the alpha from unit test
klendathu2k Sep 17, 2021
113e2bf
Move particle DB out of common scope / throw assert if requested part…
klendathu2k Sep 17, 2021
a26a07c
Merge branch 'star-bnl:main' into star-geant4maker-dev
klendathu2k Sep 17, 2021
e859274
Merge branch 'star-bnl:main' into star-geant4maker-dev
klendathu2k Sep 20, 2021
0c305ea
Merge branch 'star-bnl:main' into star-geant4maker-dev
klendathu2k Sep 21, 2021
4249361
Merge branch 'star-bnl:main' into star-geant4maker-dev
klendathu2k Sep 23, 2021
69685d9
Update for eval installation
klendathu2k Sep 23, 2021
354eacd
Merge branch 'star-bnl:main' into star-geant4maker-dev
klendathu2k Sep 25, 2021
c2b4b0d
Hide hardcoded geometry parameters in namespace
klendathu2k Sep 25, 2021
ef955a8
Ensure mysql is preloaded before BFC
klendathu2k Sep 25, 2021
957f136
Merge branch 'star-geant4maker-dev' of https://github.com/klendathu2k…
klendathu2k Sep 25, 2021
a5a1b7a
Add ROOT include path, and export include files needed by cling.
klendathu2k Sep 26, 2021
c7485f5
Enable pythia6 option
klendathu2k Sep 29, 2021
64beaf7
Resolve conflicts w/ star repo
klendathu2k Sep 30, 2021
e0a66fb
Merge branch 'star-geant4maker-merge-pull' into star-geant4maker-dev
klendathu2k Sep 30, 2021
4c5edb1
Bring in codes which were sitting on the G4star/eval branch, but
klendathu2k Oct 1, 2021
b54fe70
Add variables missing from previous commit
klendathu2k Oct 1, 2021
95923fe
Explicitly disable multi-threaded run.
klendathu2k Oct 1, 2021
e50a895
Merge branch 'main' into star-geant4maker-dev
klendathu2k Oct 1, 2021
14ca139
Merge branch 'main' into star-geant4maker-g4star-patch
klendathu2k Oct 1, 2021
b9a433e
Merge branch 'star-geant4maker-g4star-patch' into star-geant4maker-dev
klendathu2k Oct 1, 2021
9bca3d8
Delete .StMCParticleHistory.h.swp
klendathu2k Oct 1, 2021
c8bedc6
__geometry_tag is now defined in the macro / no need to process line
klendathu2k Oct 2, 2021
440134f
Merge branch 'star-geant4maker-dev' of https://github.com/klendathu2k…
klendathu2k Oct 2, 2021
3962afc
The chain option is geantout, not geant4out
klendathu2k Oct 4, 2021
38cfb7a
geant4out chain option should trigger geant4maker datasets being adde…
klendathu2k Oct 5, 2021
ec75279
Merge branch 'star-geant4maker-dev' of https://github.com/klendathu2k…
klendathu2k Oct 5, 2021
f33990f
Commit pythia6 and pythia8 generator macros.
klendathu2k Oct 7, 2021
5e0659e
Merge branch 'star-geant4maker-dev' of https://github.com/klendathu2k…
klendathu2k Oct 7, 2021
72c17f6
Add code which allows user to attach event generator filters via comm…
klendathu2k Oct 9, 2021
e830dc9
Merge branch 'star-geant4maker-dev' of https://github.com/klendathu2k…
klendathu2k Oct 9, 2021
8346a8c
Truncate precision of floats (aka real*4) passed through command line…
klendathu2k Oct 14, 2021
a2baef4
Something is not quite right with the accepted event list, leading to…
klendathu2k Oct 14, 2021
989c4d4
Convert string to float before truncation...
klendathu2k Oct 14, 2021
9a457bf
Add hit summary to the geant4 maker at chain finish
klendathu2k Oct 21, 2021
b49f855
Updating to latest star-bnl main & resolve xgeometry conflict
klendathu2k Nov 16, 2021
273ea81
Merge branch 'star-bnl-main' into star-geant4maker-dev
klendathu2k Nov 16, 2021
3ec9550
Make sure include path is available for rootcint
klendathu2k Nov 17, 2021
0e73220
Merge branch 'star-bnl:main' into star-geant4maker-dev
klendathu2k Nov 19, 2021
01ecad0
Refactor AgML volume extensions to utilize a map (global, static, ugly)
klendathu2k Dec 9, 2021
abe44c1
Refactor AgML volume extensions to utilize a map (global, static, ugly)
klendathu2k Dec 9, 2021
c11dcd0
Merge branch 'star-geant4maker-dev' of https://github.com/klendathu2k…
klendathu2k Dec 9, 2021
bd081f1
Setup code to enable standalone simulation with GEANT3, Geant 4 or
klendathu2k Dec 9, 2021
d413910
Reduce verbosity during SD construction
klendathu2k Dec 10, 2021
bb55827
AgMLExtension extends the 'class' of volumes that share a name
klendathu2k Dec 10, 2021
d8a5ac1
Several code cleanups, removing debug printouts.
klendathu2k Dec 14, 2021
8c9c39c
Cleanup / reduce verbosity
klendathu2k Dec 14, 2021
98402f0
Address compiler warnings
klendathu2k Dec 14, 2021
4ea6e2f
abs-->TMath::Abs b/c ...
klendathu2k Dec 14, 2021
fad168f
Obtain current engine in multi-engine run
klendathu2k Dec 15, 2021
cbcd262
Forward track through the TMCManager, if it has been created
klendathu2k Dec 15, 2021
f50ab9e
Set stack in multi-engine run.
klendathu2k Dec 15, 2021
a2be008
Removed unused dependency
klendathu2k Dec 20, 2021
41c6837
User stack is set on single-engine mode only
klendathu2k Dec 20, 2021
976cc66
When using multi-engine mode, the stack is managed by the TMCManager.
klendathu2k Dec 21, 2021
3d2b98c
Support for per-volume MC engine selection in multi-engine runs.
klendathu2k Dec 28, 2021
f6e54a6
MC engine is obtained from the MC manager in MC runs.
klendathu2k Dec 28, 2021
e6e901d
Add support for per-module MC engine selection
klendathu2k Dec 28, 2021
818ae1a
Add method to change the engine-volume assignment during the run.
klendathu2k Dec 28, 2021
e7f93e8
Reduce verbosity
klendathu2k Dec 28, 2021
0975fe4
Test G3/G4 consistency in multi-engine mode
klendathu2k Dec 28, 2021
9c52905
nevents should be ntracks
klendathu2k Dec 29, 2021
bbdcad5
Add linked hit list to STGC
klendathu2k Dec 29, 2021
5ac93ba
Fill linked hit list on tracks
klendathu2k Dec 29, 2021
4bab5bf
Sampling fraction histograms
klendathu2k Dec 29, 2021
e0fc239
Throw over range in pt, eta to create sampling fraction plots
klendathu2k Dec 30, 2021
28497cb
Test ID truth for single engine mode (or for that matter, multi engine
klendathu2k Dec 30, 2021
8da1ae2
Minor comment added
klendathu2k Jan 2, 2022
64da5e2
Minor debug output
klendathu2k Jan 2, 2022
13d9013
Deference to MC particle to get energy, and minor debug output added
klendathu2k Jan 2, 2022
2fbf66a
Use an array of StarMCParticle s, parallel to the TParticle array, to
klendathu2k Jan 7, 2022
2f216df
StarMCParticle knows its idTruth. StackDump can select out track (an…
klendathu2k Jan 11, 2022
cd5d19d
Expose stack through a getter
klendathu2k Jan 11, 2022
32c3038
StackDump to be called by testing macros rather than internally
klendathu2k Jan 11, 2022
7d028b0
Throw over a narrower range in eta, and StackDump for testing.
klendathu2k Jan 11, 2022
5f8379f
--whitespace
klendathu2k Jan 11, 2022
1ed326f
Call to FindNode invalidates the navigator state, making StackDump un…
klendathu2k Jan 11, 2022
8d46869
Setup method for user code to be added / executed at the conclusion
klendathu2k Jan 11, 2022
127b8c2
Restore loop over all sectors.
klendathu2k Jan 12, 2022
7168128
Update application and volume engine defaults
klendathu2k Jan 12, 2022
1749523
Minor cleanups
klendathu2k Jan 12, 2022
92950d0
Cleanup and improve comments
klendathu2k Jan 12, 2022
472f360
Multi-engine fix: initialize track propagation cuts / parameters on all
klendathu2k Jan 12, 2022
68f0494
Fix const-ness on vertex
klendathu2k Jan 12, 2022
13dff6b
Merge pull request #12 from klendathu2k/star-geant4maker-persistent-t…
klendathu2k Feb 15, 2022
e818540
Merge from upstream
klendathu2k Feb 15, 2022
16324b9
Merge this
klendathu2k Feb 16, 2022
180d276
Merge branch 'main' into star-geant4maker-dev
klendathu2k Feb 16, 2022
6f8130d
Merge branch 'star-bnl:main' into star-geant4maker-dev
klendathu2k Feb 16, 2022
7e11381
Add linked hit list to STGC
klendathu2k Dec 29, 2021
ab4f615
Simple test script for geometries. Compares local build of the
klendathu2k Aug 25, 2021
7fad3d1
Initial commit setup contradictory tests. This commit fixes that issue.
klendathu2k Aug 26, 2021
c06e35b
This macro is required for the testGeometry.csh script
klendathu2k Aug 26, 2021
1b23d86
Add map of GEANT3 paramaters and cuts associated to volumes.
klendathu2k Aug 24, 2021
0c778fe
AgMLExtension inherits from TGeoExtension, which allows user and/or
klendathu2k Aug 24, 2021
b328dfd
Cleanup memory.
klendathu2k Aug 24, 2021
34f44a5
General cleanup, and moving mixture component to protected.
klendathu2k Aug 24, 2021
2026902
AgMath provides math functions used by AgML codes. A few of these
klendathu2k Aug 24, 2021
d069ddf
Attach AgMLExtensions to the modules
klendathu2k Aug 24, 2021
f21ccd7
Cleanup and replace ROOT types with basic types
klendathu2k Aug 24, 2021
a84c7ef
WARN: Disables misalignment when run under ROOT6. Still
klendathu2k Aug 24, 2021
b3e86f1
We don't even need a classdef here...
klendathu2k Aug 24, 2021
090f09a
We don't need to access most of this interactively... so comment out …
klendathu2k Aug 24, 2021
082f319
Responsible for setting up the AgMLExtensions in the TGeoVolumes,
klendathu2k Aug 24, 2021
7c4ba37
Back to standard StMessMgr... ENDL-->endm
klendathu2k Aug 24, 2021
9cd8f8b
Back to standard StMessMgr... ENDL-->endm
klendathu2k Aug 24, 2021
c458751
The sanity check on the main branch is newer than the geant4star vers…
klendathu2k Aug 26, 2021
866bde4
Expose pi to geoemtry modules
klendathu2k Sep 6, 2021
5bcabb6
Merge branch 'star-bnl:main' into star-geant4maker-dev
klendathu2k Feb 18, 2022
de7f264
Print default command options
klendathu2k Feb 22, 2022
1e2468e
Merge branch 'star-geant4maker-dev' of https://github.com/klendathu2k…
klendathu2k Feb 22, 2022
37dcb01
Merge branch 'star-bnl:main' into star-geant4maker-dev
klendathu2k Feb 22, 2022
e964105
Merge pull request #15 from klendathu2k/star-geant4maker-starvmc-geom…
klendathu2k Feb 22, 2022
dbd1118
Merge pull request #16 from klendathu2k/star-geant4star-starvmc-stara…
klendathu2k Feb 22, 2022
ee4c393
Merge branch 'star-main-geant4star' into star-geant4maker-dev
klendathu2k Feb 22, 2022
7dea302
Merge pull request #17 from klendathu2k/star-geant4maker-dev
klendathu2k Feb 22, 2022
715a4f3
Merge pull request #14 from klendathu2k/star-geant4maker-pams
klendathu2k Feb 23, 2022
2926ee8
Restore working version of StGeant4Maker
klendathu2k Feb 24, 2022
87b09f8
Merge branch 'star-main-geant4star' of https://github.com/klendathu2k…
klendathu2k Feb 24, 2022
937aa3f
Merge branch 'star-bnl:main' into star-main-geant4star
klendathu2k Mar 3, 2022
425635b
Scripts to setup the environment and build the code
klendathu2k Mar 4, 2022
82d59be
SD construction is called during initialization, through the
klendathu2k Mar 7, 2022
a0b6303
Fixes an initializtion error in geant4star. As previously
klendathu2k Mar 9, 2022
d510515
The user-stepping routine is responsible for scoring hits, recording
klendathu2k Mar 9, 2022
ffdd98d
Additional debugging output
klendathu2k Mar 9, 2022
c053385
Functions to select cells for debugging / whitespace changes
klendathu2k Mar 10, 2022
509d310
Merge from upstream / resolve conflicting .gitignore
klendathu2k Mar 10, 2022
c8fd5ea
Merge branch 'star-bnl-main' into star-main-geant4star
klendathu2k Mar 10, 2022
74091e1
Merge branch 'star-bnl:main' into star-main-geant4star
klendathu2k Apr 20, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 54 additions & 13 deletions StRoot/StBFChain/BigFullChain.h
Original file line number Diff line number Diff line change
Expand Up @@ -1211,6 +1211,7 @@ Bfc_st BFC[] = { // standard chains
{"McEvOut" ,"" ,"","StMcEvent,Tree" ,"","","Write StMcEvent to StTree",kFALSE},
{"EvOut" ,"" ,"","Tree" ,"","","Write StEvent to StTree",kFALSE},
{"GeantOut" ,"" ,"","Tree" ,"","","Write g2t tables to StTree",kFALSE},
{"Geant4Out" ,"" ,"","Tree" ,"","","Write g2t tables to StTree from G4",kFALSE},
{"Simu" ,"" ,"","" ,"","","Simulated Data, force to use Db time stamp from used geometry",kFALSE},
{"HitsBranch" ,"" ,"","" ,"","","take out points from dst branch and put them into HitsBranch",kFALSE},
{"paw" ,"" ,"","" ,"","","Allocate memory for pawc",kFALSE},
Expand Down Expand Up @@ -1376,12 +1377,64 @@ Bfc_st BFC[] = { // standard chains
{"------------","-----------","-----------","------------------------------------------","","","",kFALSE},
{"Generators ","-----------","-----------","------------------------------------------","","","",kFALSE},
{"------------","-----------","-----------","------------------------------------------","","","",kFALSE},
{"stargen", "","", "gen_T,sim_T"/*+++*/, "", "libVMC.so,libStarGeneratorUtil.so,libStarGeneratorEvent.so,libStarGeneratorBase.so,libStarGeneratorFilt.so,libMathMore.so","STAR Generator BASE",false},
{"stargen.filt", "","", "gen_T,sim_T"/*+++*/, "", "libVMC.so,libStarGeneratorFilt.so,libMathMore.so","STAR Generator BASE",false},
{"stargen.util", "","", "gen_T,sim_T"/*+++*/, "", "libVMC.so,libStarGeneratorUtil.so,libMathMore.so","STAR Generator BASE",false},
{"stargen.event","","", "gen_T,sim_T"/*+++*/, "", "libVMC.so,libStarGeneratorEvent.so,libMathMore.so","STAR Generator BASE",false},
{"stargen.base", "","", "gen_T,sim_T"/*+++*/, "", "libVMC.so,libStarGeneratorBase.so,libMathMore.so","STAR Generator BASE",false},
{"stargen", "","", "stargen.util,stargen.event,stargen.base"/*+++*/, "", "","STAR Generator BASE",false},
{"pythia6.4.28","","","stargen", "", "Pythia6_4_28.so", "Load Pythia 6.4.28 generator", false },
{"pythia8.1.86","","","stargen", "", "Pythia8_1_86.so", "Load Pythia 8.1.86 generator", false },
{"pythia8.2.35","","","stargen", "", "Pythia8_2_35.so", "Load Pythia 8.1.86 generator", false },
{"hijing1.383" ,"","","stargen", "", "Hijing1_383.so", "Load Hijing 1.383 generator", false },
{"kinematics" ,"","","stargen", "", "Kinematics.so", "Load STAR Particle Gun", false },
{"genreader" ,"","","stargen", "", "StarGenEventReader.so", "Load STAR Gen Event Reader", false },
{"------------","-----------","-----------","------------------------------------------","","","",kFALSE},
{"Geant4star ","-----------","-----------","------------------------------------------","","","",kFALSE},
{"------------","-----------","-----------","------------------------------------------","","","",kFALSE},
{"g4clhep", "","", "", "", "libG4clhep.so","Load G4 libs",false},
{"g4global", "","", "g4clhep", "", "libG4global.so","Load G4 libs",false},
{"g4intercoms", "","", "g4global", "", "libG4intercoms.so","Load G4 libs",false},
{"g4materials", "","", "g4intercoms", "", "libG4materials.so","Load G4 libs",false},
{"g4interfaces","","", "g4intercoms", "", "libG4interfaces.so","Load G4 libs",false},
{"g4graphics", "","", "g4intercoms", "", "libG4graphics_reps.so","Load G4 libs",false},
{"g4geometry", "","", "g4graphics,g4materials","", "libG4geometry.so","Load G4 libs",false},
{"g4particles", "","", "g4geometry", "", "libG4particles.so", "Load G4",false},
{"g4track" , "","", "g4particles", "", "libG4track.so", "Load G4",false},
{"g4digits", "","", "g4track", "", "libG4zlib.so,libG4digits_hits.so", "Load G4",false},
{"g4processes", "","", "g4digits", "", "libG4processes.so", "Load G4",false},

{"g4tracking" , "","", "g4processes", "", "libG4tracking.so", "Load G4",false},
{"g4event", "","", "g4tracking", "", "libG4event.so", "Load G4",false},
{"g4run", "", "","g4event", "", "libG4run.so", "Load G4",false},
{"g4physics", "", "", "g4run", "", "libG4physicslists.so", "Load G4",false},

{"g4modeling", "", "", "g4physics", "", "libG4modeling.so", "Load G4", false},
{"g4persist", "", "", "", "", "libG4persistency.so", "Geant4 persistency",false},
{"g4errprop", "", "", "", "", "libG4error_propagation.so", "Geant4 error propagation",false},
{"g4readout", "", "", "", "", "libG4readout.so","G4 readout",false},
{"g4parmodels", "", "", "", "", "libG4parmodels.so", "G4 par models", false},
{"g4analysis", "","", "g4errprop,g4readout,g4parmodels", "", "libG4analysis.so",false},

{"g4visual", "", "", "g4modeling", "", "libG4vis_management.so", "Load G4", false},
{"g4ascii", "", "", "g4visual", "", "libG4Tree.so", "G4 ASCII Tree", false},
{"g4vrml", "", "", "g4visual", "", "libG4VRML.so", "G4 ASCII Tree", false},
{"g4dawn", "", "", "g4visual", "", "libG4FR.so", "G4 DAWN", false},
{"g4heprep", "", "", "g4visual", "", "libG4zlib.so,libG4visHepRep.so", "G4 DAWN", false},
{"g4raytracer", "", "", "g4visual", "", "libG4RayTracer.so", "G4 DAWN", false},
{"g4gmocren", "", "", "g4visual", "", "libG4GMocren.so", "G4 ASCII Tree", false},
{"g4opengl", "", "", "g4visual", "", "libG4gl2ps.so,libG4OpenGL.so", "G4 ASCII Tree", false},
{"g4geant3", "", "", "", "", "libG3toG4.so", "Load g3 to g4 support", false },
{"geant4", "","", "g4physics,g4interfaces,g4visual","","","Load G4 libs", false},

{"g4root", "","", "g4analysis", "", "libg4root.so", "Load g4root support", false },
{"geant4vmc", "","", "geant4,g4root,g4ascii,g4dawn,g4heprep,g4raytracer,g4vrml,g4gmocren,g4opengl,g4persist", "",
"libVMC.so,libgeant4vmc.so", "Load G4 VMC libs", false},

{"ag4ml", "","", "g4geometry, agml" ,"","", "AgML + g4",false},
{"stargen", "","", "gen_T,sim_T"/*+++*/, "", "libStarGeneratorUtil.so,libStarGeneratorEvent.so,libStarGeneratorBase.so,libStarGeneratorFilt.so,libMathMore.so","STAR Generator BASE",false},
{"geant4mk", "","", "stargen,geant4vmc", "", "StGeant4Maker.so,StarMagField.so", "Load G4 VMC libs", false},
{"geant321", "", "", "", "", "/star/simu/simu/jwebb/GEANT3/lib64/libgeant321.so", "Load G3 VMC library", false},

{"------------","-----------","-----------","------------------------------------------","","","",kFALSE},
{"I/O Makers ","-----------","-----------","------------------------------------------","","","",kFALSE},
{"------------","-----------","-----------","------------------------------------------","","","",kFALSE},
Expand Down Expand Up @@ -1587,18 +1640,6 @@ Bfc_st BFC[] = { // standard chains
kFALSE},
{"fstUtil" , "", "", "", "", "StFstUtil", "Fst Utilities",
kFALSE},

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why fst chain options have disappeared.

{"fstFastSim","fstChain","","StMcEvent,StEvent","StFstFastSimMaker","StFstSimMaker","FST fast simulator",
kFALSE},
{"fstRawHit", "", "fstChain", "fstUtil,fstDb","StFstRawHitMaker", "StFstRawHitMaker","FST raw hit maker",
kFALSE},
{"fstCluster", "", "fstChain", "fstRawHit","StFstClusterMaker", "StFstClusterMaker","FST Cluster maker",
kFALSE},
{"fstHit", "", "fstChain", "event,fstCluster", "StFstHitMaker", "StFstHitMaker","FST Hit Maker",
kFALSE},
{"fstUtil" , "", "fstChain", "", "", "StFstUtil", "Fst Utilities",
kFALSE},

{"ssddat" ,"","","ssd_daq" ,"","","SSD full chain for Real Data",kFALSE},
{"sstdat" ,"","","sst_daq" ,"","","SST full chain for Real Data",kFALSE},
{"ssd_daq","","","ssdCalDb,svt_T,-sls,-spa,ssdUtil","StSsdDaqMaker","StSsdDaqMaker","... SSD Daq",kFALSE},
Expand Down
1 change: 1 addition & 0 deletions StRoot/StBFChain/StBFChain.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1942,6 +1942,7 @@ void StBFChain::SetTreeOptions()
treeMk->IntoBranch("McEventBranch","StMcEvent");
}
if (GetOption("GeantOut")) treeMk->IntoBranch("geantBranch","geant");
if (GetOption("Geant4Out")) treeMk->IntoBranch("geantBranch","geant4star");
if (GetOption("AllEvent")) {
if (GetOption("fzin") ||
GetOption("ntin") ||
Expand Down
1 change: 1 addition & 0 deletions StRoot/StBTofUtil/StVpdSimConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

#include <iostream>
#include <fstream>
#include "StMessMgr.h"
#include <vector>
#include "St_db_Maker/St_db_Maker.h"
#include "tables/St_vpdSimParams_Table.h"
Expand Down
2 changes: 1 addition & 1 deletion StRoot/StChain/StMaker.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* The method will be described.
*
*/
#define STAR_LOGGER 1
#define STAR_LOGGER 1
#include "StMaker.h"
#include "Stiostream.h"
#include <stdio.h>
Expand Down
Empty file.
38 changes: 38 additions & 0 deletions StRoot/StGeant4Maker/AgMLBTofVolumeId.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#ifndef __AgMLBtofVolumeId_h__
#define __AgMLBtofVolumeId_h__

#include <StarVMC/StarAgmlLib/AgMLExtension.h>
#include <StMessMgr.h>

class AgMLBtofVolumeId : public AgMLVolumeId {
public:

AgMLBtofVolumeId(){}
// Applies to btog.version = 8 with btog.choice =13 (run 13 onwards)

virtual int id( int* numbv ) const {

int rileft = numbv[0];
int sector = numbv[1];
int module = numbv[2];
int layer = numbv[3];

// Adjust for GMT modules
if ( rileft==1 ) {
if ( sector== 8 ) module += 4;
if ( sector==23 ) module += 4;
}
else if ( rileft==2 ) {
if ( sector == 33 ) module += 4;
if ( sector == 48 ) module += 4;
}

int _id = layer + 10 * (module + 100 * (sector+100*rileft) );

return _id;

};
};


#endif
70 changes: 70 additions & 0 deletions StRoot/StGeant4Maker/AgMLEEmcVolumeId.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
#ifndef __AgMLEEmcVolumeId_h__
#define __AgMLEEmcVolumeId_h__

#include <StarVMC/StarAgmlLib/AgMLExtension.h>
#include <TGeoNavigator.h>
#include <StMessMgr.h>
#include <TLorentzVector.h>
#include <TVirtualMC.h>
#include <TMath.h>

#include <TString.h>
#include <StMessMgr.h>

class AgMLEEmcVolumeId : public AgMLVolumeId {

const int onoff = 1;
const int fillmode = 3;
const int sectormap[2][6] = {
{ 4, 5, 6, 7, 8, 9},
{10,11,12, 1, 2, 3}
};


public:

AgMLEEmcVolumeId() : AgMLVolumeId() { /* nada */ };

virtual int id( int* numbv ) const {

// cd == ESCI
int rileft = onoff;
int shift = 0;

int wheel = numbv[0];
int section = numbv[1];
int idx = numbv[2];
int phi30d = sectormap[wheel-1][idx-1]; // sector number
int subsec = numbv[3]; // subsection (i.e. layer) within each section
int sublay = numbv[4]; // ???
int phi = numbv[5]; // phibin in sector
int eta = numbv[6];

int depth = subsec + 3 * ( section - 1 );

// int volumeid = 100000*rileft + 1000*(5*(phi30d-1)+phi) + 10*eta + depth;

int volumeid = 100000 * rileft
+ 1000 * ( 5 * ( phi30d-1 ) + phi )
+ 10 * eta
+ depth;

// LOG_INFO << Form("AgML EEmc VolumdId = wheel=%i section=%i idx=%i phi30d=%i subsection=%i %i %i %i %i",
// numbv[0],
// numbv[1],
// numbv[2],
// phi30d,
// numbv[3],
// numbv[4],
// numbv[5],
// numbv[6],
// volumeid ) << endm;


return volumeid;

};
};


#endif
66 changes: 66 additions & 0 deletions StRoot/StGeant4Maker/AgMLEmcVolumeId.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
#ifndef __AgMLEmcVolumeId_h__
#define __AgMLEmcVolumeId_h__

#include <StarVMC/StarAgmlLib/AgMLExtension.h>
#include <TGeoNavigator.h>
#include <StMessMgr.h>
#include <TLorentzVector.h>
#include <TVirtualMC.h>
#include <TMath.h>

#include <TString.h>
#include <StMessMgr.h>

class AgMLEmcVolumeId : public AgMLVolumeId {

const int numberOfEtaRings = 20;

public:

AgMLEmcVolumeId() : AgMLVolumeId() { /* nada */ };

virtual int id( int* numbv ) const {


int rileft = numbv[0]; // east barrel vs west barrel
int phi = numbv[1]; // module
int superl = numbv[2]; // before / after SMD layer

TLorentzVector _direction(0,0,0,0);
TVirtualMC::GetMC()->TrackPosition( _direction );

double xg[4], xl[4];
_direction.GetXYZT( xg );
double pseudoRapidity = TMath::Abs(_direction.Eta());

// Obtain local coordinates from global coordinates
TVirtualMC::GetMC()->Gmtod( xg, xl, 1 );

// Calculate the eta ring and submodule
int eta_tow = ( pseudoRapidity * double(numberOfEtaRings) ) + 1.0;
int phi_sub = ( xl[1]>= 0 )? 1 : 0; // (-13,0)=0, (0,13)=1

// LOG_INFO << Form("eta=%f xlocal=%f %f %f | phi_sub=%i eta_tow=%i", pseudoRapidity, xl[0], xl[1], xl[2],phi_sub,eta_tow) << endm;

int volumeid = -999;

if ( rileft==1 ) {
phi = 60 - phi + 1;
if ( phi_sub==0 ) {
phi_sub=2;
}
}
else {
phi = 60+phi;
phi_sub = phi_sub + 1;
}

volumeid=10000000*rileft+100000*eta_tow+100*phi+10*phi_sub+superl;

return volumeid;

};
};


#endif
40 changes: 40 additions & 0 deletions StRoot/StGeant4Maker/AgMLEpdVolumeId.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#ifndef __AgMLEpdVolumeId_h__
#define __AgMLEpdVolumeId_h__

#include <StarVMC/StarAgmlLib/AgMLExtension.h>
#include <StMessMgr.h>

class AgMLEpdVolumeId : public AgMLVolumeId {
public:

AgMLEpdVolumeId(){}

virtual int id( int* numbv ) const {

int epdm = numbv[0]; // 1=east, 2=west
int epss = numbv[1]; // 1 for PP1, 2 for PP2, PP-postion 1'o,2'o clock etc
int epdt = numbv[2]; // 1:T1 trap, 2:T1 Triangular, 3:T2 Thin, 4:T3 Thick

/*

" EPD volume_id "
" 100,000 : east or west "
" 1,000 : Position clock wise, 1 to 12 "
" 10 : Tile number 1 to 31, refer EPD Drupal page"
" 1 : 1 T1 trap or T2 thin; 0 T1 triangular or T2 thick

*/

int _id = 0;
_id += 100000 * epdm;
_id += 1000 * epss;
_id += 10 * ( epdt%2 + epdt/2 );
_id += 1 * ( epdt%2 );

return _id;

};
};


#endif
28 changes: 28 additions & 0 deletions StRoot/StGeant4Maker/AgMLFstVolumeId.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#ifndef __AgMLFstVolumeId_h__
#define __AgMLFstVolumeId_h__

#include <StarVMC/StarAgmlLib/AgMLExtension.h>
#include <StMessMgr.h>

class AgMLFstVolumeId : public AgMLVolumeId {
public:

AgMLFstVolumeId(){}

virtual int id( int* numbv ) const {

static const int mapping[] = { 2, 3, 1 };

int disk = numbv[0];
int wedge = numbv[1];
assert( numbv[2]>0 && numbv[2]<=3 );
int sensor = mapping[ numbv[2]-1 ];


return 1000*disk + 10*wedge + sensor;

};
};


#endif
23 changes: 23 additions & 0 deletions StRoot/StGeant4Maker/AgMLHcaVolumeId.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#ifndef __AgMLHcaVolumeId_h__
#define __AgMLHcaVolumeId_h__

#include <StarVMC/StarAgmlLib/AgMLExtension.h>
#include <StMessMgr.h>

class AgMLHcaVolumeId : public AgMLVolumeId {
public:

AgMLHcaVolumeId(){}

virtual int id( int* numbv ) const {

int mod = numbv[0]; // module
int tow = numbv[1]; // tower

return 1000*mod + tow;

};
};


#endif
Loading