Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rotated pion detector system #538

Open
wants to merge 621 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
621 commits
Select commit Hold shift + click to select a range
7544f85
Uncommented a line
Yug34 Feb 4, 2021
5a7a242
[hotfix] avoid boost::iostreams
wdconinc Feb 4, 2021
fb360e3
Merge branch 'develop' into develop
Yug34 Feb 5, 2021
00ee2fa
Merge branch 'develop' of https://github.com/Yug34/remoll into develop
Yug34 Feb 6, 2021
5909ee4
Correctly set map directory as source
Yug34 Feb 17, 2021
76d5b27
[donut] Allow for unequal outer concrete/lead radii
wdconinc Feb 19, 2021
a5a6881
[donut] Allow for unequal outer concrete/lead radii
wdconinc Feb 19, 2021
24b555a
modified collimator 5 to avoid interception with moller particles
Feb 22, 2021
f20afd3
[donut] allow for shifting concrete and lead independently
wdconinc Feb 22, 2021
97bf5da
[searchPath] Fix map directory
Yug34 Feb 23, 2021
fcfaaaf
Merge pull request #439 from Yug34/develop
wdconinc Feb 23, 2021
6eddc38
Merge pull request #442 from JeffersonLab/feature-coll5-update
chandabindu Feb 25, 2021
1054764
[docker] tini `-s` first instead of after `--`
wdconinc Feb 25, 2021
517f677
[target] solid target ladder
wdconinc Feb 24, 2021
1de500f
[pion] shield DS and IN into pionDetectorLuciteSector
wdconinc Mar 4, 2021
ff91c2d
[donut] center support flange at concrete/lead interface
wdconinc Mar 9, 2021
02e7236
Merge pull request #441 from JeffersonLab/bugfix-donut-unequal-lead-c…
wdconinc Mar 9, 2021
c9122f7
[run_data] fprintf->G4cerr; std::string fRunPath, fHostName
wdconinc Mar 12, 2021
e922956
[run_data] store gGitInfo in fGitInfo; ClassDef version ++
wdconinc Mar 12, 2021
5b6bf26
[run_data] remove fGenName (is in macro)
wdconinc Mar 12, 2021
c97cb3e
[run_data] std::string fHostName needs no null termination
wdconinc Mar 12, 2021
a2901c2
[run_data] no TGeoManager needed
wdconinc Mar 12, 2021
9202b98
[run_data] ctor/dtor simplification
wdconinc Mar 12, 2021
2613931
[run_data] remove fBeamE
wdconinc Mar 12, 2021
da04a3b
[run_data] init fSeed to 0
wdconinc Mar 12, 2021
0dc20aa
[run_data] reorg of header; added some getters; private member fields
wdconinc Mar 12, 2021
a9d0e44
[searchPath] Changed the order of dirs in which remoll looks for files
Yug34 Mar 12, 2021
904e195
Fixed syntax error
Yug34 Mar 12, 2021
a56b535
[workflows] push if github.event_name != 'pull_request'
wdconinc Mar 12, 2021
f354da6
Merge pull request #449 from JeffersonLab/develop
rahmans1 Mar 12, 2021
18d876d
Bringing in Chandan's downstream cylinders from feature-envelope branch
Mar 12, 2021
d331121
Revert "Bringing in Chandan's downstream cylinders from feature-envel…
Mar 12, 2021
d467c45
Merge pull request #448 from JeffersonLab/wdconinc-patch-1
wdconinc Mar 12, 2021
e992d59
Bringing in Chandan's downstream cylinders from feature-envelope branch
Mar 12, 2021
6d3fc75
Bringing in Naz's upstream shield optimizations
Mar 12, 2021
2d3d537
Adding the inner and outer nose-shield designed by Naz
Mar 13, 2021
c6c3420
[searchPath] Fixed errors
Yug34 Mar 13, 2021
6e1126f
Merge pull request #447 from Yug34/develop
wdconinc Mar 13, 2021
7ded5c9
Merge remote-tracking branch 'upstream/develop' into bugfix-git-info-…
wdconinc Mar 15, 2021
cd43f29
[workflows] push to user/repo; allow failed login
wdconinc Mar 15, 2021
bacad21
Merge pull request #450 from wdconinc/bugfix-github-workflow-docker-p…
wdconinc Mar 15, 2021
72c631b
Merge remote-tracking branch 'upstream/develop' into bugfix-git-info-…
wdconinc Mar 15, 2021
702ab88
Merge pull request #445 from wdconinc/bugfix-git-info-string
wdconinc Mar 15, 2021
0eb9dcd
Merge remote-tracking branch 'upstream/develop' into feature-target-l…
wdconinc Mar 17, 2021
a60ff31
[filter] ShowOnlyCharged added in GUI
wdconinc Mar 22, 2021
ba65f03
[magneticfield] field at maximum extent value must fail
wdconinc Mar 24, 2021
29997d2
Merge pull request #456 from wdconinc/hotfix-magnetic-field-map-edge-…
wdconinc Mar 24, 2021
1a36b85
[cmake] filter out -O? optimizations from root-config --cflags
wdconinc Mar 24, 2021
c3be196
[CMakeLists] download new larger fieldmaps and make default
wdconinc Mar 25, 2021
3f499e2
[macros] use new larger fieldmaps in load_magnetic_fieldmaps.mac
wdconinc Mar 25, 2021
d706a37
Merge pull request #459 from wdconinc/feature-larger-fieldmaps
wdconinc Mar 25, 2021
bfd322a
Removed old downstream twobounce pipe and add new two-bounce shield
Mar 26, 2021
e2a65a8
Removed Septapus and implemented new epoxy shieldings; Collimator 5 h…
Mar 26, 2021
f076618
Changed names of some elements for better understanding of the code
Mar 26, 2021
978c887
Merge pull request #460 from chandabindu/feature-UpdateDownstreamRegion
chandabindu Mar 26, 2021
bcd013d
[showermax] updated geometry from remoll-showermax-generator
wdconinc Mar 29, 2021
072f3fc
[detector construction] enable overlap check; print warning only when…
wdconinc Mar 29, 2021
abf1d4f
Merge pull request #461 from wdconinc/feature-new-showermax
wdconinc Mar 29, 2021
e4ddee5
Merge pull request #457 from wdconinc/bugfix-issue-455
wdconinc Mar 29, 2021
d7e1abd
Merge remote-tracking branch 'upstream/develop' into newgeometry-pion…
wdconinc Mar 30, 2021
96e2212
Merge pull request #462 from JeffersonLab/newgeometry-pion-dump-shield
wdconinc Mar 30, 2021
3e5526c
[io] option -o <filename> set the default output filename on CLI
wdconinc Mar 30, 2021
dc78fc7
Merge remote-tracking branch 'upstream/develop' into feature-target-l…
wdconinc Apr 1, 2021
10f7521
[target] put target ladder in the scattering chamber
wdconinc Apr 5, 2021
5f185c3
[multiple scattering] flexiblity in number of materials
wdconinc Apr 5, 2021
229d164
[target] support for multiple target assemblies; box shaped targets
wdconinc Apr 5, 2021
98a9a6b
[construction] load target volumes correctly
wdconinc Apr 5, 2021
fe68b0f
[target] Additional target ladder macros
wdconinc Apr 5, 2021
db551cd
[macros] examples to run on AlDummy1US and Optics1
wdconinc Apr 5, 2021
1476a58
[target] use short target tags instead of volume names
wdconinc Apr 6, 2021
afc02bf
/remoll/target/print instead of printtargetinfo
wdconinc Apr 6, 2021
db19aa4
[io] remoll runs, but does not produce output for illegal/bad file name
Yug34 Apr 6, 2021
f3d21fa
[target] rename AlDummyHoleDS.mac to AlHoleDS.mac
wdconinc Apr 7, 2021
8374ee1
Resolving conflict with develop
Apr 8, 2021
ad2388b
Merge pull request #466 from JeffersonLab/develop
rahmans1 Apr 8, 2021
489afc3
[fields] Cubic magnetic field interpolation routine
wdconinc Apr 10, 2021
1e2d87c
[fields] deal with edge cases more gracefully, fall back to linear
wdconinc Apr 10, 2021
57cd0ce
[fields] phi wraparound, remove debugging info
wdconinc Apr 12, 2021
2597bcf
Hotfix: set parallel world overlap check to true to avoid segfault
wdconinc Apr 13, 2021
e5272d0
Merge pull request #469 from wdconinc/hotfix-g4cout-failbit
wdconinc Apr 13, 2021
08b66d1
Merge pull request #465 from wdconinc/feature-show-only-charged
wdconinc Apr 13, 2021
c3f63da
Merge remote-tracking branch 'upstream/develop' into feature-field-cu…
wdconinc Apr 13, 2021
97f0622
[fields] change back to linear by default
wdconinc Apr 13, 2021
9e29d1b
[fields] test script to compare linear/cubic interpolation
wdconinc Apr 14, 2021
871537c
[io] cleanup
Yug34 Apr 14, 2021
ba6f05b
Merge pull request #464 from Yug34/develop
wdconinc Apr 15, 2021
8065e77
Merge pull request #470 from JeffersonLab/develop
rahmans1 Apr 15, 2021
6ad67ee
[fields] New magnetic field maps per @rahmans
wdconinc Apr 19, 2021
64237f1
Merge pull request #471 from wdconinc/new-fieldmaps-parallel
wdconinc Apr 19, 2021
8f22d8c
[remoll] Print 'main' seed for remoll at startup
wdconinc Apr 19, 2021
2478ff1
Merge remote-tracking branch 'upstream/develop' into feature-field-cu…
wdconinc Apr 20, 2021
f93fb3e
[fields] general cleanup of magnetic field class
wdconinc Apr 20, 2021
23d480c
Merge pull request #475 from JeffersonLab/feature-modified-upstream-s…
rahmans1 Apr 20, 2021
382fe4b
[fields] improve performance for field lookups, focus on addition
wdconinc Apr 20, 2021
916dba9
Merge pull request #472 from wdconinc/issue-458
wdconinc Apr 20, 2021
d9190b6
Merge pull request #467 from wdconinc/feature-field-cubic-interpolation
wdconinc Apr 20, 2021
eb6c0de
Merge remote-tracking branch 'upstream/develop' into cadmesh
wdconinc Apr 21, 2021
27a5489
[CMakeLists.txt] forgotten conflict resolution
wdconinc Apr 21, 2021
ef48259
[CMakeLists] better cadmesh detection
wdconinc Apr 22, 2021
54cc0b6
[DetectorConstruction] /remoll/geometry/addmesh support
wdconinc Apr 22, 2021
8140a3d
[DetectorConstruction] multiple mesh solid support
wdconinc Apr 23, 2021
6573630
[mesh] load meshes from cad (needs separate downloads)
wdconinc Apr 23, 2021
49093fb
[targets] complete target macros for all targets
wdconinc Apr 23, 2021
bc4d7a8
Example macros to prune remoll output trees based on selected events …
rahmans1 Apr 24, 2021
308cb2a
Typo correction
rahmans1 Apr 24, 2021
7313f4a
Merge pull request #478 from JeffersonLab/feature-addCopytreeAnalysis…
rahmans1 Apr 24, 2021
b6bf4f2
[genExternal] Make ROOT interface static and guard with mutexes
wdconinc Apr 24, 2021
0ef8128
[vis] added horizontal XZ plane section view to gui
wdconinc Apr 24, 2021
27f41a7
[genExternal] enable event branch reading
wdconinc Apr 25, 2021
9cac023
[fields] GetFieldValue needs to initialize field when not debug
wdconinc Apr 25, 2021
0e57187
Merge pull request #481 from wdconinc/hotfix-initialize-magnetic-field
wdconinc Apr 25, 2021
4977e2a
Merge remote-tracking branch 'upstream/develop' into bugfix-gen-exter…
wdconinc Apr 25, 2021
83aa46c
[meshes] Ignore stl (so no one uploads one to github, ever)
wdconinc Apr 28, 2021
2ed6bd5
[vis] XZ and YZ section view macros and menu entries
wdconinc Apr 28, 2021
1395a0e
[vis] XZ section view macro
wdconinc Apr 28, 2021
09e33d5
[meshes] macro to compare with cad, creates svg images
wdconinc Apr 28, 2021
022e1ff
Merge remote-tracking branch 'upstream/develop' into cadmesh
wdconinc Apr 28, 2021
c474060
[detectorConstruction] delete mesh solids and logical volumes
wdconinc Apr 28, 2021
637509f
Merge remote-tracking branch 'upstream/develop' into feature-target-l…
wdconinc Apr 28, 2021
0030a6f
Merge pull request #83 from JeffersonLab/cadmesh
wdconinc Apr 29, 2021
43d571d
Merge pull request #483 from wdconinc/bugfix-gen-external-threading
wdconinc Apr 29, 2021
ac8367b
Merge branch 'develop' into feature-vis-section-fixes
wdconinc Apr 29, 2021
a41ffbf
Merge pull request #479 from wdconinc/feature-vis-section-fixes
wdconinc Apr 29, 2021
c9da785
Merge remote-tracking branch 'upstream/develop' into feature-target-l…
wdconinc Apr 29, 2021
1992ff0
Adding option to add zoffset to input distribution
rahmans1 Apr 30, 2021
334667f
Fix typo in variable name
rahmans1 Apr 30, 2021
b8a3e55
Merge pull request #486 from JeffersonLab/feature-add-zoffset-option-…
rahmans1 Apr 30, 2021
f3d332c
[CMakeLists] find_package(cadmesh QUIET) to avoid complaints
wdconinc May 6, 2021
7add5d4
Merge pull request #487 from JeffersonLab/bugfix-find-cadmesh-quiet
wdconinc May 6, 2021
84b45e2
Removing overlaps between pion detector system and donut sysytem.
May 7, 2021
728ed7f
Merge branch 'develop' of https://github.com/jeffersonlab/remoll into…
May 7, 2021
e131fa4
New collimator 2 design to avoid edge scattering
May 7, 2021
cef2bc0
Removed some unused stuff
May 7, 2021
76ab93e
Changing the length of the upstream outer nose shield from 100 mm to …
May 8, 2021
8dde0ae
Merge pull request #490 from JeffersonLab/bugfix-reduce-outer-nose-sh…
wdconinc May 8, 2021
df81cff
[CMakeLists] find boost QUIET also OPTIONAL_COMPONENTS
wdconinc May 8, 2021
1515fe7
Merge pull request #489 from chandabindu/feature-collimator2-update
wdconinc May 8, 2021
23e09fd
Merge pull request #491 from JeffersonLab/wdconinc-cmakelists-boost-o…
wdconinc May 9, 2021
9de9ccf
New dockerfile base image
wdconinc May 11, 2021
8ac33f0
[docker] source /etc/profile first
wdconinc May 11, 2021
c4f2578
[tests] /remoll/printtargetinfo -> /remoll/target/print
wdconinc May 12, 2021
26e432b
Merge remote-tracking branch 'upstream/develop' into feature-target-l…
wdconinc May 12, 2021
a200d75
[targets] define LH2 target with tag LH2, not DSAl; and other way round
wdconinc May 13, 2021
dff2706
[BeamTarget] unused fActiveTargetRelativePosition removed
wdconinc May 13, 2021
40b4420
[BeamTarget] unused fActiveTargetRelativePosition removed
wdconinc May 13, 2021
58a6c11
[BeamTarget] clean logic in effective active/total target lengths
wdconinc May 13, 2021
1823d2c
[target] Move LH2 between USAl and DSAl (ordering important)
wdconinc May 14, 2021
2a7bf43
Merge pull request #477 from JeffersonLab/feature-target-ladder
wdconinc May 18, 2021
588160c
Merge pull request #493 from wdconinc/docker-new-base-image
wdconinc May 20, 2021
5c92147
Modified Collimator 2 geometry to have better simulation efficiencies
chandabindu May 20, 2021
b003a9e
added new Collimator 4 and hybrid wall dimension and locations. Imple…
chandabindu May 20, 2021
693e3bb
There were overlap issues with the concrete and Pbwall. Since Cip and…
chandabindu May 20, 2021
0bc60c6
Merge pull request #494 from chandabindu/feature-geometry-update
wdconinc May 21, 2021
af35770
[runexample] /remoll/target/print is new syntax
wdconinc May 21, 2021
d85ef2b
Merge pull request #495 from wdconinc/hotfix-runexample-target-print
wdconinc May 21, 2021
61a2a32
[workflows] disable docker buildx cache
wdconinc May 25, 2021
476198a
Merge pull request #496 from JeffersonLab/bugfix-workflow-docker
wdconinc May 25, 2021
516f7bd
Changed delete to delete[] for catpath
Yug34 May 25, 2021
ccda46f
Merge pull request #497 from Yug34/patch-2
wdconinc May 25, 2021
a0c6e2a
new carbon generator
hanjie1 May 25, 2021
13da96a
add new c12 generator to macros
hanjie1 May 25, 2021
fe3209d
Merge pull request #498 from hanjie1/develop
wdconinc May 25, 2021
479ae6f
[remoll] warn and exit if old geant4 or root version
wdconinc May 27, 2021
0d4fd37
Merge pull request #501 from wdconinc/feature-warn-old-geant4
wdconinc May 28, 2021
ddfd126
[searchPath] Fixed remoll not finding files
Yug34 May 29, 2021
793d727
[searchPath] remollSearchPath.cc cleanup
Yug34 May 29, 2021
d0156de
[searchPath] Removed hardcoded path, file cleanup
Yug34 May 30, 2021
f3c2f3c
[searchPath] Reverted fallback path to relative, cleanup
Yug34 Jun 1, 2021
7bd48f6
Merge pull request #502 from Yug34/develop
wdconinc Jun 1, 2021
8cfc5fa
Replace travis badge with github badge
wdconinc Jun 6, 2021
904a3ef
Delay updating info until necessary
wdconinc Jun 23, 2021
6f353fe
Flipping the sign to rotate about the proper vertical axis
Jun 23, 2021
5c5762b
Use the real momentum after multiple scattering and other coordinate …
Jun 23, 2021
f5d8ac7
Merge pull request #506 from wdconinc/bugfix-default-target-LH2
wdconinc Jun 24, 2021
00688e5
No need to use fBeamTarg in moller generator
wdconinc Jul 9, 2021
bbbb333
No need for remollBeamTarget in ep elastic generator
wdconinc Jul 9, 2021
b186f29
Delay update to target info until needed
wdconinc Jul 9, 2021
e6f1705
Merge pull request #507 from JeffersonLab/bugfix-beam-target-initiali…
wdconinc Jul 9, 2021
277e444
Define hit fBeta
wdconinc Jul 15, 2021
e8dc5ca
hit.beta field in struct
wdconinc Jul 15, 2021
e5d6201
Set fBeta to -1.0 by default, and copy constructor
wdconinc Jul 15, 2021
c6c4d4e
Set fBeta to GetVelocity / c_light
wdconinc Jul 15, 2021
ee739e6
Added XrootD and StashCP
Yug34 Jul 20, 2021
c3aa1fd
Merge pull request #511 from Yug34/develop
wdconinc Jul 20, 2021
f3bd3d4
Only warn once on kNoTargetVolume
wdconinc Jul 27, 2021
d8210be
Merge pull request #513 from wdconinc/bugfix-beam-target-warn-once
wdconinc Jul 27, 2021
aab7612
Merge pull request #517 from JeffersonLab/develop
rahmans1 Aug 20, 2021
bbb7599
Update load_magnetic_fieldmaps.mac
wdconinc Sep 8, 2021
82620b3
Updated showermax position, gdml files and macros
sudipbhattarai Sep 13, 2021
1992e6e
removed rootfile location dir in macros
sudipbhattarai Sep 14, 2021
c4364d4
Include "." at top of macro search path
wdconinc Sep 17, 2021
c9ab381
Merge pull request #519 from wdconinc/bugfix-macro-search-path-curren…
wdconinc Sep 17, 2021
58d71c9
Workflow: build against LCG on CVMFS
wdconinc Sep 17, 2021
8e95217
remove LCG_100/x86_64-centos7-gcc8-opt
wdconinc Sep 17, 2021
7a4d663
Workflows: build against LCG and test
wdconinc Sep 17, 2021
ebc8c8a
Include unistd in remollParallelConstruction
wdconinc Sep 17, 2021
75eaa50
Include unistd in remollDetectorConstruction
wdconinc Sep 17, 2021
88ef6e1
Include unistd in remollIO
wdconinc Sep 17, 2021
afc4a8b
Merge pull request #522 from JeffersonLab/macos-fixes-unistd
wdconinc Sep 17, 2021
bf2a92f
Merge pull request #523 from JeffersonLab/develop
wdconinc Sep 17, 2021
70d9e11
Remove LCG 100
wdconinc Sep 17, 2021
5ca062c
Enable tests again
wdconinc Sep 18, 2021
1a18dab
Fix for mac: include vector
wdconinc Sep 18, 2021
dbd55da
Artifacts without /
wdconinc Sep 18, 2021
bf702c9
Missing semicolon
wdconinc Sep 18, 2021
1a14c1b
Avoid get_current_dir_name outside of GNU systems
wdconinc Sep 18, 2021
1a483ab
Checkout in test jobs
wdconinc Sep 18, 2021
bf09aef
Merge pull request #520 from JeffersonLab/workflows-build-lcg-cvmfs
wdconinc Sep 18, 2021
1538225
source install/bin/remoll.sh
wdconinc Sep 18, 2021
f7a58aa
Preserve permissions with tar workaround
wdconinc Sep 18, 2021
a95f306
path is directory
wdconinc Sep 18, 2021
a119bd4
Merge pull request #521 from JeffersonLab/workflows-build-lcg-and-test
wdconinc Sep 18, 2021
cd96478
Typo
wdconinc Sep 18, 2021
bc4c2f9
Merge pull request #510 from JeffersonLab/hit-beta
wdconinc Sep 18, 2021
56cd994
Typo
wdconinc Sep 18, 2021
0a716d6
return default vertex when no target volume specified
wdconinc Oct 14, 2021
3596745
Load material G4_Galactic only when needed
wdconinc Oct 14, 2021
b87a541
Merge remote-tracking branch 'upstream/wdconinc-patch-1' into develop
wdconinc Oct 14, 2021
79127a9
Include fMS in remollBeamTarget as member, not pointer
wdconinc Oct 14, 2021
1b9c102
BeamTarget as object in PrimaryGenerator, fewer pointers
wdconinc Oct 14, 2021
25a9b68
Turn most messenger pointers into objects
wdconinc Oct 14, 2021
920d1eb
Re-enabling overlap macro for workflows
wdconinc Oct 15, 2021
2744745
workflows: ubuntu-20.04 and macos-10.15
wdconinc Oct 15, 2021
8666133
workflows: build and test on ubuntu 20.04
wdconinc Oct 15, 2021
caae830
workflows: test runs-on ubuntu-20.04
wdconinc Oct 15, 2021
dbcf1a0
Bugfix: #include <iomanip> for std::setw
wdconinc Oct 15, 2021
04b42a8
Merge pull request #532 from wdconinc/enhancement-getting-rid-of-poin…
wdconinc Oct 15, 2021
4beace8
Merge pull request #528 from wdconinc/bugfix-remoll-beam-target-when-…
wdconinc Oct 15, 2021
5112f41
Merge pull request #529 from JeffersonLab/wdconinc-patch-1
wdconinc Oct 15, 2021
c7655b9
Merge branch 'develop' into bugfix-beam-target-mult-scatt
wdconinc Oct 15, 2021
7d30cb5
Merge branch 'develop' into bugfix-beam-target-as-object-in-primary-g…
wdconinc Oct 15, 2021
ee1b090
Merge pull request #533 from JeffersonLab/build-lcg-cvmfs-macos-10.15…
wdconinc Oct 15, 2021
b106bae
Merge pull request #530 from wdconinc/bugfix-beam-target-mult-scatt
wdconinc Oct 15, 2021
ec94615
Merge pull request #531 from wdconinc/bugfix-beam-target-as-object-in…
wdconinc Oct 15, 2021
51cf996
Merge pull request #505 from JeffersonLab/bugfix-useRealMomentumForPh…
wdconinc Oct 15, 2021
c6d89f6
clang-tidy static analysis with cmake -DENABLE_CLANG_TIDY=ON
wdconinc Oct 15, 2021
7125418
clang-tidy readability-implicit-bool-conversion fixes
wdconinc Oct 15, 2021
fe20ad3
clang-tidy readability-delete-null-pointer fixes
wdconinc Oct 15, 2021
6376ce1
clang-tidy readability-make-member-function-const fixes
wdconinc Oct 15, 2021
9b18a73
Merge pull request #518 from sudipbhattarai/update-showermax
wdconinc Oct 15, 2021
8c3f254
Merge pull request #534 from wdconinc/clang-tidy
wdconinc Oct 15, 2021
7a6d540
This will update the sieve position in the z axis so that it is 10cm …
Oct 26, 2021
00b67bf
Merge pull request #536 from ktevans/develop
wdconinc Oct 27, 2021
e8f68fe
This will add scripts that I have made for the Punch Through Studies.…
Oct 27, 2021
ed481f4
This will add scripts for punch through studies. I've made sure that …
Oct 27, 2021
e9d9669
I removed some instances of "#" inside of the scripts.
Oct 27, 2021
b291808
I added a comment about how to change the script to track the sieve/b…
Oct 27, 2021
bc4b359
I edited the scripts so that they contain no instances of "#". Instea…
Oct 29, 2021
4466e4b
Merge pull request #537 from ktevans/develop
wdconinc Oct 30, 2021
570bfab
Rotating pion detector system to suppress background from low energy …
Nov 9, 2021
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
1 change: 1 addition & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BasedOnStyle: LLVM
14 changes: 14 additions & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
HeaderFilterRegex: ''
Checks: '
bugprone-*,
concurrency-*,
cppcoreguidelines-*,
modernize-*,
portability-*,
readability-*,
-modernize-use-trailing-return-type,
-modernize-avoid-c-arrays,
-modernize-use-nodiscard,
-readability-magic-numbers
'
FormatStyle: file
96 changes: 96 additions & 0 deletions .github/workflows/build-lcg-and-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
name: Build LCG and Test

on: [push, pull_request]

env:
LCG: "LCG_101"
sys: "x86_64-ubuntu2004-gcc9-opt"

jobs:
build:
runs-on: ubuntu-20.04
strategy:
fail-fast: false
steps:
- uses: actions/checkout@v2
- uses: cvmfs-contrib/github-action-cvmfs@v2
with:
cvmfs_repositories: 'sft.cern.ch,geant4.cern.ch'
- uses: aidasoft/run-lcg-view@v1
with:
release-platform: ${{ env.LCG }}/${{ env.sys }}
run: |
cmake -Bbuild -S. -DCMAKE_INSTALL_PREFIX=install/
cmake --build build
cmake --build build --target install
- run: |
tar -cvf install.tar install/
- uses: actions/upload-artifact@v2
with:
name: ${{ env.LCG }}-${{ env.sys }}
path: install.tar
retention-days: 1

test_geometries:
runs-on: ubuntu-20.04
needs: build
strategy:
fail-fast: false
matrix:
suite: ["load", "validate", "overlap"]
steps:
- uses: actions/checkout@v2
- uses: cvmfs-contrib/github-action-cvmfs@v2
with:
cvmfs_repositories: 'sft.cern.ch,geant4.cern.ch'
- uses: actions/download-artifact@v2
with:
name: ${{ env.LCG }}-${{ env.sys }}
- run: |
tar -xvf install.tar
- uses: aidasoft/run-lcg-view@v1
with:
release-platform: ${{ env.LCG }}/${{ env.sys }}
run: |
mkdir -p logfiles rootfiles
source install/bin/remoll.sh
scripts/tests/test_geometries.sh ${{ matrix.suite }}
ls -al logfiles rootfiles
- uses: actions/upload-artifact@v2
with:
name: test_geometries_${{ matrix.suite }}_logfiles
path: |
logfiles/
retention-days: 3

test_macros:
runs-on: ubuntu-20.04
needs: build
strategy:
fail-fast: false
matrix:
suite: ["unit", "commit", "release"]
steps:
- uses: actions/checkout@v2
- uses: cvmfs-contrib/github-action-cvmfs@v2
with:
cvmfs_repositories: 'sft.cern.ch,geant4.cern.ch'
- uses: actions/download-artifact@v2
with:
name: ${{ env.LCG }}-${{ env.sys }}
- run: |
tar -xvf install.tar
- uses: aidasoft/run-lcg-view@v1
with:
release-platform: ${{ env.LCG }}/${{ env.sys }}
run: |
mkdir -p logfiles rootfiles
source install/bin/remoll.sh
scripts/tests/test_macros.sh ${{ matrix.suite }}
ls -al logfiles rootfiles
- uses: actions/upload-artifact@v2
with:
name: test_macros_${{ matrix.suite }}_logfiles
path: |
logfiles/
retention-days: 3
41 changes: 41 additions & 0 deletions .github/workflows/build-lcg-cvmfs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Build LCG on CVMFS

on: [push, pull_request]

jobs:
linux:
runs-on: ubuntu-20.04
strategy:
fail-fast: false
matrix:
LCG: ["LCG_101/x86_64-ubuntu2004-gcc9-opt",
"LCG_99/x86_64-ubuntu2004-gcc9-opt"]
steps:
- uses: actions/checkout@v2
- uses: cvmfs-contrib/github-action-cvmfs@v2
with:
cvmfs_repositories: 'sft.cern.ch,geant4.cern.ch'
- uses: aidasoft/run-lcg-view@v1
with:
release-platform: ${{ matrix.LCG }}
run: |
cmake -Bbuild -S.
cmake --build build

macos:
runs-on: macos-10.15
strategy:
matrix:
LCG: ["LCG_101/x86_64-mac1015-clang120-opt",
"LCG_99/x86_64-mac1015-clang120-opt"]
steps:
- uses: actions/checkout@v2
- uses: cvmfs-contrib/github-action-cvmfs@v2
with:
cvmfs_repositories: 'sft.cern.ch,geant4.cern.ch'
- uses: aidasoft/run-lcg-view@v1
with:
release-platform: ${{ matrix.LCG }}
run: |
cmake -Bbuild -S.
cmake --build build
56 changes: 56 additions & 0 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: Build Docker Images

on:
push:
branches:
- '**'
tags:
- 'v*'
pull_request:

jobs:
push_to_registry:
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Docker meta
id: docker_meta
uses: crazy-max/ghaction-docker-meta@v1
with:
images: ${{ github.repository }}
tag-semver: |
{{version}}
{{major}}.{{minor}}
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
# - name: Cache Docker layers
# uses: actions/cache@v2
# with:
# path: /tmp/.buildx-cache
# key: ${{ runner.os }}-buildx-${{ github.sha }}
# restore-keys: |
# ${{ runner.os }}-buildx-
- name: Login to DockerHub
id: docker_login
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
continue-on-error: true
- name: Build and push
id: docker_build
uses: docker/build-push-action@v2
with:
context: .
file: Dockerfile
push: ${{ steps.docker_login.outcome == 'success' && github.event_name != 'pull_request' }}
tags: ${{ steps.docker_meta.outputs.tags }}
labels: ${{ steps.docker_meta.outputs.labels }}
# cache-from: type=local,src=/tmp/.buildx-cache
# cache-to: type=local,dest=/tmp/.buildx-cache
- name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ G4Worker?_run*evt*.rndm
run*evt*.rndm
currentEvent.rndm
currentRun.rndm
*.state
*.rndm

# output from createHTML
_remoll_*.html
Expand Down
9 changes: 9 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[submodule "geometry/generators/remoll-coil-generator"]
path = geometry/generators/remoll-coil-generator
url = https://github.com/jeffersonlab/remoll-coil-generator.git
[submodule "geometry/generators/remoll-detector-generator"]
path = geometry/generators/remoll-detector-generator
url = https://github.com/JeffersonLab/remoll-detector-generator.git
[submodule "geometry/generators/remoll-showermax-generator"]
path = geometry/generators/remoll-showermax-generator
url = https://github.com/jeffersonlab/remoll-showermax-generator.git
19 changes: 15 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,23 @@ jobs:
echo "=== scripts/tests/test_macros.sh ${suite} ===" ;
mkdir -p ${PWD}/logfiles ${PWD}/rootfiles ;
time docker run --rm -v ${PWD}/rootfiles:/jlab/remoll/rootfiles -v ${PWD}/logfiles:/jlab/remoll/logfiles -t jeffersonlab/remoll:$TRAVIS_BRANCH sh -c "
scripts/tests/test_macros.sh ${suite} &&
scripts/tests/targz_macros.sh ${suite} &&
scripts/tests/watermark.sh ${suite}
" ;
scripts/tests/test_macros.sh ${suite}
" ;
done ;
ls -al ${PWD}/logfiles ${PWD}/rootfiles
- script:
- if [ "$TRAVIS_BRANCH" == "master" ]; then
for suite in release ; do
echo "=== scripts/tests/test_macros.sh ${suite} ===" ;
mkdir -p ${PWD}/logfiles ${PWD}/rootfiles ;
time docker run --rm -v ${PWD}/rootfiles:/jlab/remoll/rootfiles -v ${PWD}/logfiles:/jlab/remoll/logfiles -t jeffersonlab/remoll:$TRAVIS_BRANCH sh -c "
scripts/tests/test_macros.sh ${suite} &&
scripts/tests/targz_macros.sh ${suite} &&
scripts/tests/watermark.sh ${suite}
" ;
done ;
ls -al ${PWD}/logfiles ${PWD}/rootfiles ;
fi

notifications:
slack:
Expand Down
Loading