[12gevmoller_sim] [JeffersonLab/remoll] 985103: I have tried to add several branches to the remoll...
GitHub
noreply at github.com
Wed Jan 31 15:49:40 EST 2018
Branch: refs/heads/cameron_dose_branch
Home: https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=7iq8CaGnTf3tz9_VxB6U6MGD-5njpmCYQsSiI-QxFZA&e=
Commit: 98510328feb383edfa18385f3cc74881d23a333e
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_98510328feb383edfa18385f3cc74881d23a333e&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=w-bIRMwFl7ejA1P0LcjZbJCg82RQ-5F6JBARLb4jblk&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)
Changed paths:
M include/remollEvent.hh
M include/remollIO.hh
M remoll.cc
M src/remollEvent.cc
M src/remollIO.cc
M src/remollSteppingAction.cc
M variables.txt
Log Message:
-----------
I have tried to add several branches to the remollIO that will be filled by values stored in remollEvent which are filled based on an algorithm executed in remollSteppingAction. I don't know if I understood the scope of these variables correctly, so there may be problems with the heirarchy and some of the includes I have added.
Commit: b8fa8eca1a1c6d395eb2b5c6509753f6ece4a72b
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_b8fa8eca1a1c6d395eb2b5c6509753f6ece4a72b&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=Hfb1v9FqPEcHZtg6j2n7SX7LbQH4lCvXt5Zlb1MqhpY&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)
Changed paths:
M CMakeLists.txt
M include/remollEvent.hh
M include/remollIO.hh
M src/remollEvent.cc
M src/remollIO.cc
M src/remollSteppingAction.cc
Log Message:
-----------
Updated typos and errors. I have made a mistake by calling eventAction variables from within SteppingAction...
Commit: 7d12e2cbca5f0298b7ee4268b9747e8d515bde1a
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_7d12e2cbca5f0298b7ee4268b9747e8d515bde1a&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=vqf9Sge-Lq3bqKtHFd6AH47ufzzBZ0QeF3ISaTa1AxQ&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-03-22 (Wed, 22 Mar 2017)
Changed paths:
M include/remollEvent.hh
M include/remollIO.hh
M include/remollSteppingAction.hh
M remoll.cc
M src/remollEvent.cc
M src/remollEventAction.cc
M src/remollIO.cc
M src/remollPrimaryGeneratorAction.cc
M src/remollSteppingAction.cc
Log Message:
-----------
I have added functionality to the remollIO and remollEvent and remollSteppingAction to keep track of the current event in the IO and pass it to the stepping action. Then the stepping action will update the new variables defined in variables.txt based on criteria (that should be added into the remollMessenger class for macro-editability).
So far it compiles, but I haven't looked at the output to see if it works yet.
Commit: 2d3e8d09f2cb71780ab096ab9ac01a96ec88748a
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_2d3e8d09f2cb71780ab096ab9ac01a96ec88748a&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=-S1bgTyOR8geBkadEtlPmuyaDt4y_wCQ6pfGNrbzqvI&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-04-05 (Wed, 05 Apr 2017)
Changed paths:
M include/remollEvent.hh
M include/remollGenericDetector.hh
M include/remollGenericDetectorHit.hh
M include/remollIO.hh
M include/remollSteppingAction.hh
M macros/runexample.mac
M src/remollEvent.cc
M src/remollEventAction.cc
M src/remollGenericDetector.cc
M src/remollGenericDetectorHit.cc
M src/remollIO.cc
M src/remollSteppingAction.cc
Log Message:
-----------
I have reworked the entire way the last hit variables are obtained, passed around, tested, and
finally stored. I changed them to be hit variables, and I changed them to get passed around as an unordered_map before going to the remollGenericDetector class for passage to the IO.
Commit: 7a55d78fd88f123cabee8a386c586b72fa069a79
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_7a55d78fd88f123cabee8a386c586b72fa069a79&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=hEbECuYzaE_mIGCSwLEJB1CSjfuFjhfs9CuNleAsOic&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-04-07 (Fri, 07 Apr 2017)
Changed paths:
M src/remollEvent.cc
M src/remollEventAction.cc
M src/remollGenericDetector.cc
M src/remollIO.cc
Log Message:
-----------
I am part of the way done with undoing all my bad gSingletonEvent based nonsense. Though
looking at remollRun.cc they do it well there.... also, I can use remollRun.cc to store
and retrieve (G4)events, so this may be worthwhile.
Commit: 91a3b25ad0580a9f5c196fefefc841e6e3fc6f74
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_91a3b25ad0580a9f5c196fefefc841e6e3fc6f74&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=yPkH6DbJ3ugoss4tnrjemLXLoTbYAVotDvihfCSIYvM&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-04-08 (Sat, 08 Apr 2017)
Changed paths:
M include/remollEvent.hh
M include/remollGenericDetectorHit.hh
M include/remollIO.hh
M include/remollSteppingAction.hh
A include/remollVTrackingAction.hh
A include/remollVUserTrackInformation.hh
M remoll.cc
M src/remollEventAction.cc
M src/remollGenericDetector.cc
M src/remollGenericDetectorHit.cc
M src/remollIO.cc
M src/remollSteppingAction.cc
A src/remollVTrackingAction.cc
A src/remollVUserTrackInformation.cc
Log Message:
-----------
I have added the remollVTrackingAcion and remollVUserTrackInformation classes,
inheriting from the G4VUserTrackInformation that the G4Track objects know about.
I am using this TrackInformation to store the last-vertex info and I am getting
segfaults the first time that any such variables are accessed.
Commit: 225e4ab85eb8c630d8ad466b7d84997d72ea98cf
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_225e4ab85eb8c630d8ad466b7d84997d72ea98cf&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=4onTkrmuL_bb5hcDjQB4hm6V7pdSs2c72YS-eIssx6g&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-04-10 (Mon, 10 Apr 2017)
Changed paths:
M remoll.cc
M src/remollGenericDetector.cc
M src/remollSteppingAction.cc
M src/remollVTrackingAction.cc
M src/remollVUserTrackInformation.cc
Log Message:
-----------
Updated and fixed the remollVUserTrackInfo and TrackingManager in remoll.cc and fixed the TrackingAction
adequately initialize everything.
Commit: 337280f8ac20b0adea72f1c2b4f2ea741e721399
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_337280f8ac20b0adea72f1c2b4f2ea741e721399&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=MOeWXTS1u4VbdOWDM86oTlPvnXZi6pHajqeb-Z2W4-I&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-04-12 (Wed, 12 Apr 2017)
Changed paths:
M macros/runexample.mac
M src/remollGenericDetector.cc
M src/remollIO.cc
M src/remollSteppingAction.cc
Log Message:
-----------
I have now fixed everything and removed the print statements. This is ready to be merged back into the
does branch I think. I will analyze the data first though, to make sure everything makes sense.
I still need to consider adding more memory for prior significant vertices, letting the remoll
messenger allow the user to update and change the deltaTheta and deltaAngle criteria that mandate vertex
data storage, being careful about this data only being stored on sensitive detector hits, which is fine
for my radiation analysis, but isn't general or scalable, so maybe there should be an off switch for
doing all of these computationally heavy tracking actions, and I should probably change the
initialization of the last vertex position from starting at (0, 0, 0) to being somewhere outside
of the relevant volumes for the experiment (or even not recorded?).
Commit: 58f65f25a9669fe287a43e5c81a1cc3bcc96c893
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_58f65f25a9669fe287a43e5c81a1cc3bcc96c893&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=njfXGfLUy4fGN9hSNJYVt9XsL5UVPGhMCHHE2m_Jvgc&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-04-17 (Mon, 17 Apr 2017)
Changed paths:
M src/remollSteppingAction.cc
M src/remollVTrackingAction.cc
M variables.txt
Log Message:
-----------
I updated variables.txt and removed the material check from stepping action, since only very rarely does a delta E step occur in vacuum and there doesn't appear to be any air implemented anywhere (though it probably should be)
Commit: 68dd860782ef09d8682d6a9cdfad1772f743b2e6
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_68dd860782ef09d8682d6a9cdfad1772f743b2e6&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=K4kn9QrETt2rLqpTaLawKOxlbY5w2XtapXvKcb9nLYE&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-04-20 (Thu, 20 Apr 2017)
Changed paths:
M CMakeLists.txt
A macros/handler.sh
A macros/runscript.sh
Log Message:
-----------
I have included my mocha-specific batch mode runscripts
Commit: 880a5bf1317298667791d823f6610c7d269968da
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_880a5bf1317298667791d823f6610c7d269968da&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=Yd1jNmBDVuaeA9uisLvacq7vwTDz0JkEt-YeH6E8WXQ&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-04-26 (Wed, 26 Apr 2017)
Changed paths:
A scripts/Makefile_Cameron
A scripts/rad_dose_Cameron.cc
Log Message:
-----------
I have added the example rad_dose.cc and Makefile methods for actually doing the analysis. Should be performed in gitdir/dose_remoll/output directory.
Commit: 9df47c2b613870b4bca15af11cd4b499efb6b393
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_9df47c2b613870b4bca15af11cd4b499efb6b393&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=pnnJdtYlvl3kw03uiHZVjrhVL5Lq8AVfw1QQKSG8MPY&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-07-19 (Wed, 19 Jul 2017)
Changed paths:
M geometry_sculpt_less_hybshld/hallDaughter.gdml
M geometry_sculpt_less_hybshld/hybridDaughter_less_hybshld_roof_smaller_2.gdml
M geometry_sculpt_less_hybshld/targetDaughter.gdml
M geometry_sculpt_less_hybshld/upstreamDaughter_merged_design1_check3.gdml
A rad_analysis/Makefile
A rad_analysis/README.txt
A rad_analysis/old_rad_dose.cc
A rad_analysis/rad_dose
A rad_analysis/rad_dose.cc
M scripts/README
M src/remollIO.cc
M variables.txt
Log Message:
-----------
I have added a series of new sensitive detectors in the various shielding blocks for further analysis of radiation sources and sinks that just looking at the outer wall wasn't accomplishing. I have made a new subfolder for the radiation analysis as well (/rad_analysis)
Commit: acaf1064c8922b792c1aeb82a85e30de906e3f0e
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_acaf1064c8922b792c1aeb82a85e30de906e3f0e&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=-rD3oYdYf_SQxpOHbHiEZZSlQWohiUwXhk7cJagS92c&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-07-19 (Wed, 19 Jul 2017)
Changed paths:
A Geometry_Status_README.txt
Log Message:
-----------
I've added a README that tells which geometry files are relevant to use.
Commit: 7ed838e89dfa4a5a3440cc046eeacd94519ebf0b
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_7ed838e89dfa4a5a3440cc046eeacd94519ebf0b&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=gcW3t4zSCklwSfoyE2qc3uJ9RU70lGu5mk-WpVinR1M&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-07-26 (Wed, 26 Jul 2017)
Changed paths:
M geometry_sculpt_less_hybshld/hybridDaughter_less_hybshld_roof_smaller_2.gdml
M geometry_sculpt_less_hybshld/mollerMother.gdml
M macros/vis.mac
M rad_analysis/rad_dose.cc
M src/remollDetectorConstruction.cc
Log Message:
-----------
Made more modular versions of the analysis script and edited the geometry files
Commit: d20c10e1abe3c7ada46510f45ef3b859c04f8bc2
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_d20c10e1abe3c7ada46510f45ef3b859c04f8bc2&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=qOt8ldJb2OfwkdSX3BRXI9CS4XXwmY5ZQkD3oGha8G4&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-08-01 (Tue, 01 Aug 2017)
Changed paths:
A macros/merger.sh
R rad_analysis/rad_dose
M rad_analysis/rad_dose.cc
Log Message:
-----------
Added a set of plotting routines to check the radiation into a specific shielding region coming from everywhere else in the hall.
Commit: c4bef0e5561efc9318d8d074c588650800364e9f
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_c4bef0e5561efc9318d8d074c588650800364e9f&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=2bs-aL_Y2SHruWKJaqRx08uYmCx6sU1cKk0-NROAWAw&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-08-12 (Sat, 12 Aug 2017)
Changed paths:
A geometry_tests/detectorDaughter.gdml
A geometry_tests/hallDaughter.gdml
A geometry_tests/hybridDaughter_roof.gdml
A geometry_tests/hybridDaughter_roof_AlCan.gdml
A geometry_tests/hybridDaughter_roof_moved_col4.gdml
A geometry_tests/materials.xml
A geometry_tests/mollerMother.gdml
A geometry_tests/mollerMother_AlCan.gdml
A geometry_tests/mollerMother_moreshldsDS.gdml
A geometry_tests/mollerMother_moreshldsUS.gdml
A geometry_tests/mollerMother_moved_col4.gdml
A geometry_tests/schema/gdml.xsd
A geometry_tests/schema/gdml_core.xsd
A geometry_tests/schema/gdml_define.xsd
A geometry_tests/schema/gdml_extensions.xsd
A geometry_tests/schema/gdml_materials.xsd
A geometry_tests/schema/gdml_parameterised.xsd
A geometry_tests/schema/gdml_replicas.xsd
A geometry_tests/schema/gdml_solids.xsd
A geometry_tests/targetDaughter.gdml
A geometry_tests/upstreamDaughter_merged.gdml
A geometry_tests/upstreamDaughter_merged_moreshldsDS.gdml
A geometry_tests/upstreamDaughter_merged_moreshldsUS.gdml
M macros/handler.sh
M macros/runexample.mac
M rad_analysis/rad_dose.cc
Log Message:
-----------
Added a new set of geometry test cases for changing the shieldings - updated the macros to match.
Commit: 0b9f70c160668f3f039dc731627c3290d9e014fa
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_0b9f70c160668f3f039dc731627c3290d9e014fa&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=PA-KXOLqzCa5ZGBVorF6JLO3LCbo_aeE5t-Zcmc3XLY&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-08-14 (Mon, 14 Aug 2017)
Changed paths:
M geometry_tests/hybridDaughter_roof_moved_col4.gdml
M geometry_tests/materials.xml
M geometry_tests/upstreamDaughter_merged_moreshldsDS.gdml
M geometry_tests/upstreamDaughter_merged_moreshldsUS.gdml
Log Message:
-----------
Fixed the moved shielding block's offsets and substantially moved the coll4 test upstream (1500 mm instead of 50 mm) and fixed the Aluminium=/=Aluminum issue.
Commit: cee6b5085f304ba6361f0a5747d4a32b85b825eb
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_cee6b5085f304ba6361f0a5747d4a32b85b825eb&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=JMKRsxCOwcpr84alc7hmXtqYeeQAOX_6UScDdO2aJVI&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-08-18 (Fri, 18 Aug 2017)
Changed paths:
M geometry_tests/hybridDaughter_roof_AlCan.gdml
M geometry_tests/hybridDaughter_roof_moved_col4.gdml
M geometry_tests/upstreamDaughter_merged_moreshldsDS.gdml
M geometry_tests/upstreamDaughter_merged_moreshldsUS.gdml
A macros/user_merger.sh
M rad_analysis/rad_dose.cc
Log Message:
-----------
Added a user input asking merger script and fixed up the geometry_tests files again.
Commit: 2398e0fd4367d5893c25da84b6cbf5cdb6813fd8
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_2398e0fd4367d5893c25da84b6cbf5cdb6813fd8&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=KQrVhVxSV9AqCgxW94c9LbEtD3YUxjdOm7QU5ON56cs&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)
Changed paths:
M macros/merger.sh
Log Message:
-----------
tiny update
Commit: 1332561b8a7a83c1c365ad6f934a050a909776cb
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_1332561b8a7a83c1c365ad6f934a050a909776cb&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=GN-fEP8wNhAiuadgQvTF93O-QiWljM_-jX2m2OcSV0I&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-08-24 (Thu, 24 Aug 2017)
Changed paths:
M rad_analysis/rad_dose.cc
Log Message:
-----------
Small changes to rad_dose.cc
Commit: e53d3d92a39b14d49fcfaa11672ba311774da13a
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_e53d3d92a39b14d49fcfaa11672ba311774da13a&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=MTlui-C37mzbghOjx32pcqSljRXEbrJqJRjgSmdSqcw&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-08-29 (Tue, 29 Aug 2017)
Changed paths:
A geometry_tests/mollerdet.gdml
Log Message:
-----------
Forgot about mollerdet.gdml though I am not sure if it is in use or not.
Commit: 81ef6982d626cbfcefdb9d85f4707e122c8faae3
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_81ef6982d626cbfcefdb9d85f4707e122c8faae3&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=9BOJv9JCCPMqf-xwZ75kTo7jT38ly19ISqE1_Mn5V6M&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-09-01 (Fri, 01 Sep 2017)
Changed paths:
M geometry_tests/upstreamDaughter_merged_moreshldsUS.gdml
Log Message:
-----------
Modified upstream toroid shielding block mother volumes. I am not sure why these volumes are defined this way, but I have modified it to include the extended shielding block.
Commit: d5a9c0ea193f9f65f12c1cda15cc0e7b7c97be9e
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_d5a9c0ea193f9f65f12c1cda15cc0e7b7c97be9e&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=-T5Z4mHVKUHrMj4sMHFG1SToo_doY3PlPuHbeHAabM0&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)
Changed paths:
M geometry_tests/hybridDaughter_roof_moved_col4.gdml
M rad_analysis/rad_dose.cc
Log Message:
-----------
Fixing the collimator 4 position. Still not sure about the lead ring for photon collimation. Also collimator 4 appear to lack the copper piece.
Commit: 817364ec6e567165c6cb092d181899077e670515
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_817364ec6e567165c6cb092d181899077e670515&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=CYSkKJaIcAH5u9g5k3hEUuAc-ksGrtbA--nu1wd1PaQ&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-09-20 (Wed, 20 Sep 2017)
Changed paths:
M geometry_tests/hybridDaughter_roof_moved_col4.gdml
Log Message:
-----------
Modified the placement of the collimator 4 and removed the outdated beampipe logical volume that killed it when it was moved.
Commit: a9a8b0340937a383c7e4948543ce4c17543425a4
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_a9a8b0340937a383c7e4948543ce4c17543425a4&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=txIaxjQqx1klrCvya0E55MJUtu2k4wWFIqmK73jFldo&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-09-20 (Wed, 20 Sep 2017)
Changed paths:
M geometry_tests/upstreamDaughter_merged.gdml
Log Message:
-----------
Removed the upstream area's definition of the logical volume for the midrange beampipe that was outdated -> so the collimator 4 movement can be registered.
Commit: ac832f559aa1590524e329f2cb96d0d1afb6ff04
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_ac832f559aa1590524e329f2cb96d0d1afb6ff04&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=T5Vh7xU_3sck9wU8T7kOjIPFJMnn3lXcbnDt0B4SvIk&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-09-26 (Tue, 26 Sep 2017)
Changed paths:
M geometry_tests/hybridDaughter_roof_moved_col4.gdml
Log Message:
-----------
Modified the sculpt inner radius for collimator 4 to match the MOLLER CAD
Commit: 6e8e6c1d9014d9feab97eee13c1bec1d7f670b6a
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_6e8e6c1d9014d9feab97eee13c1bec1d7f670b6a&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=Ke-tGR6oPOZnSVJPGnPD9wmutHwbFqqfGjyoZIfQawo&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-09-28 (Thu, 28 Sep 2017)
Changed paths:
M geometry_tests/hybridDaughter_roof_moved_col4.gdml
Log Message:
-----------
Fixed the internal sculpt for moved coll4. The Lead photon collimator neare coll4 is still messed up. I think it is getting subtracted out. What is it for anyway?
Commit: d59610be2a00307bddebb89688cb9a3a90941e45
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_d59610be2a00307bddebb89688cb9a3a90941e45&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=rND1ubV2diEiqpMZBpvDMlq9ORpQhftR8EXCtJxIVX4&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-10-11 (Wed, 11 Oct 2017)
Changed paths:
A geometry_tests/hybridDaughter_combined.gdml
M geometry_tests/hybridDaughter_roof_AlCan.gdml
M geometry_tests/hybridDaughter_roof_moved_col4.gdml
A geometry_tests/mollerMother_combined.gdml
A geometry_tests/upstreamDaughter_merged_moreshlds.gdml
M geometry_tests/upstreamDaughter_merged_moreshldsDS.gdml
M geometry_tests/upstreamDaughter_merged_moreshldsUS.gdml
M src/remollDetectorConstruction.cc
Log Message:
-----------
Started a new simulation where all the four changes from before are merged together.
Still needs help: fixing the logical volume inbetween US magnet and collimator 4, all this and coll 4's shielding will need to be rebuilt from scratch.
Commit: 106f750f2cfe7167ade6bcb86b50e5e882650944
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_106f750f2cfe7167ade6bcb86b50e5e882650944&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=TCQWQ82F9dlctgfCQvm7NC4cyUTWlqJoi4dSRirV48g&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-10-13 (Fri, 13 Oct 2017)
Changed paths:
M geometry_tests/hybridDaughter_combined.gdml
M macros/handler.sh
A macros/mover_user.sh
M macros/runexample.mac
M macros/runscript.sh
M macros/user_merger.sh
M rad_analysis/rad_dose.cc
Log Message:
-----------
Updated macros and improved workflow. Also changed the shielding again for the hybrid area, significantly reduced shielding and moved it a bit forward to meet up with the US shielding block. This may increase the radiation a lot. I have not yet checked the results of any of the merged/combined shielding orientations, but it looks like the aluminum can + reduced coll4 shielding is making a bit of a mess. Hopefully it is not too bad.
Commit: 8001ca14462306d725fb996fd67d122aafd6f45a
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_8001ca14462306d725fb996fd67d122aafd6f45a&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=m7QSzZQEiDB9VuaofHSOEnmHbOQurGKPMz_Y2saOhFY&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-10-18 (Wed, 18 Oct 2017)
Changed paths:
M geometry_tests/mollerMother_combined.gdml
M macros/mover_user.sh
M rad_analysis/rad_dose.cc
Log Message:
-----------
Updated mover script to go ahead and analyze the data too. Changed up some shielding designs.
Commit: 50512c53e6217b8ccfbe7089b1fa843d546fefc3
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_50512c53e6217b8ccfbe7089b1fa843d546fefc3&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=jhvNCxkDAbEzZaAnBoL_GQXbcVWCj097gKCzmVX1o1o&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-10-18 (Wed, 18 Oct 2017)
Changed paths:
A geometry_tests/hybridDaughter_combined_polyroof.gdml
A macros/runexample_combined.mac
A macros/runscript_combined.sh
Log Message:
-----------
Added a polyroof layer to the hybrid shielding.
Commit: bf96b015d5453037217ab8c6af5bba86b3aadbd2
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_bf96b015d5453037217ab8c6af5bba86b3aadbd2&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=Y0PSfEc2wvxzygdiggH4LE5NGb8_TgokAnwBCTjcaPA&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2017-10-20 (Fri, 20 Oct 2017)
Changed paths:
M geometry_sculpt/mollerMother.gdml
A macros/mover_user_10M.sh
A macros/mover_user_1M.sh
M macros/vis.mac
M rad_analysis/rad_dose.cc
Log Message:
-----------
Updated rad_dose.cc to allow for proper user name changes. Updated some macros, and did a check of collimators for reduced radii (not included)
Commit: 4b2c642df80227196600794cfad1634e8bcf5424
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_4b2c642df80227196600794cfad1634e8bcf5424&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=6lUY9S4WAMjhchDCA5c-ilcSnygcDPSSv3VC9PtOyzc&e=
Author: Cameron Clarke <cameronc137 at gmail.com>
Date: 2018-01-31 (Wed, 31 Jan 2018)
Changed paths:
A geometry_old_tests/detectorDaughter.gdml
A geometry_old_tests/hallDaughter.gdml
A geometry_old_tests/hybridDaughter_roof.gdml
A geometry_old_tests/hybridDaughter_roof_AlCan.gdml
A geometry_old_tests/hybridDaughter_roof_moved_col4.gdml
A geometry_old_tests/materials.xml
A geometry_old_tests/mollerMother.gdml
A geometry_old_tests/mollerMother_AlCan.gdml
A geometry_old_tests/mollerMother_moreshldsDS.gdml
A geometry_old_tests/mollerMother_moreshldsUS.gdml
A geometry_old_tests/mollerMother_moved_col4.gdml
A geometry_old_tests/mollerdet.gdml
A geometry_old_tests/schema/gdml.xsd
A geometry_old_tests/schema/gdml_core.xsd
A geometry_old_tests/schema/gdml_define.xsd
A geometry_old_tests/schema/gdml_extensions.xsd
A geometry_old_tests/schema/gdml_materials.xsd
A geometry_old_tests/schema/gdml_parameterised.xsd
A geometry_old_tests/schema/gdml_replicas.xsd
A geometry_old_tests/schema/gdml_solids.xsd
A geometry_old_tests/targetDaughter.gdml
A geometry_old_tests/upstreamDaughter_merged.gdml
A geometry_old_tests/upstreamDaughter_merged_moreshldsDS.gdml
A geometry_old_tests/upstreamDaughter_merged_moreshldsUS.gdml
A geometry_sculpt/hybridDaughter_lessColl4.gdml
A geometry_sculpt/mollerMother_lessColls.gdml
A geometry_sculpt/upstreamDaughter_merged_design1_check3_lessColl2.gdml
A geometry_sculpt_less_hybshld_old/detectorDaughter.gdml
A geometry_sculpt_less_hybshld_old/hallDaughter.gdml
A geometry_sculpt_less_hybshld_old/hybridDaughter.gdml
A geometry_sculpt_less_hybshld_old/hybridDaughter_less_hybshld.gdml
A geometry_sculpt_less_hybshld_old/hybridDaughter_less_hybshld_roof.gdml
A geometry_sculpt_less_hybshld_old/hybridDaughter_less_hybshld_roof_smaller_1.gdml
A geometry_sculpt_less_hybshld_old/hybridDaughter_less_hybshld_roof_smaller_2.gdml
A geometry_sculpt_less_hybshld_old/materials.xml
A geometry_sculpt_less_hybshld_old/mollerMother.gdml
A geometry_sculpt_less_hybshld_old/mollerdet.gdml
A geometry_sculpt_less_hybshld_old/schema/gdml.xsd
A geometry_sculpt_less_hybshld_old/schema/gdml_core.xsd
A geometry_sculpt_less_hybshld_old/schema/gdml_define.xsd
A geometry_sculpt_less_hybshld_old/schema/gdml_extensions.xsd
A geometry_sculpt_less_hybshld_old/schema/gdml_materials.xsd
A geometry_sculpt_less_hybshld_old/schema/gdml_parameterised.xsd
A geometry_sculpt_less_hybshld_old/schema/gdml_replicas.xsd
A geometry_sculpt_less_hybshld_old/schema/gdml_solids.xsd
A geometry_sculpt_less_hybshld_old/targetDaughter.gdml
A geometry_sculpt_less_hybshld_old/upstreamDaughter.gdml
A geometry_sculpt_less_hybshld_old/upstreamDaughter_merged_design1.gdml
A geometry_sculpt_less_hybshld_old/upstreamDaughter_merged_design1_check3.gdml
A geometry_sculpt_less_hybshld_old/upstreamDaughter_merged_design1_krypto.gdml
A geometry_tests/hybridDaughter_combined_empty.gdml
A geometry_tests/hybridDaughter_combined_local.gdml
A geometry_tests/hybridDaughter_combined_local2.gdml
A geometry_tests/mollerMother_combined_empty.gdml
A geometry_tests/mollerMother_combined_local.gdml
A geometry_tests/mollerMother_combined_local2.gdml
M macros/handler.sh
A macros/runexample_AlCan.mac
A macros/runexample_combined_empty.mac
A macros/runexample_combined_local.mac
A macros/runexample_combined_local2.mac
A macros/runexample_moreshldsDS.mac
A macros/runexample_moreshldsUS.mac
A macros/runexample_moved_col4.mac
A macros/runexample_original.mac
A macros/runexample_original_lessColls.mac
A macros/runscript_AlCan.sh
A macros/runscript_combined_empty.sh
A macros/runscript_combined_local.sh
A macros/runscript_combined_local2.sh
A macros/runscript_moreshldsDS.sh
A macros/runscript_moreshldsUS.sh
A macros/runscript_moved_col4.sh
A macros/runscript_original.sh
A macros/runscript_original_lessColls.sh
A moller_field_maps/blockyHybrid_rm_3.0.txt
A moller_field_maps/blockyUpstream_rm_1.1.txt
A moller_field_maps/blockyUpstream_rm_1.1_noscale.txt
A rad_analysis/rad_dose
A rad_analysis/rad_dose_10M
A rad_analysis/rad_dose_1M
A rad_analysis/rad_dose_1M_test
A rad_analysis/rad_dose_AlCan
A rad_analysis/rad_dose_August7.cc
A rad_analysis/rad_dose_August9.cc
A rad_analysis/rad_dose_combined
A rad_analysis/rad_dose_corrected
A rad_analysis/rad_dose_moreshldsDS
A rad_analysis/rad_dose_moreshldsUS
A rad_analysis/rad_dose_movedcol4
A rad_analysis/rad_dose_movedcol4_NEW
A rad_analysis/rad_dose_new.cc
A rad_analysis/rad_dose_no
A rad_analysis/rad_dose_original
M remoll.cc
M src/remollTextFile.cc
Log Message:
-----------
Adding recent geometry updates (from October onwards, see elog updates) and the macros and scripts that go with them.
Compare: https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_compare_98510328feb3&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=oHJHMfLc3EabkpqfzFM9MzsMlo-eLmH5_eUcZn-zZyI&s=o2qpmxJnBLm9cG4JkJ2U8dpXDVjBB2-HQZa9vUNhq4A&e= ^...4b2c642df802
More information about the 12gevmoller_sim
mailing list