Commits · 0c5e8f4bb8f6f78529a1fb9da46273ee9833307a · Markus Tobias Prim / calypso

Sep 12, 2020
- Merge branch 'master' into 'master' · 0c5e8f4b
  Dave Casper authored 4 years ago
  
  Scintillator Waveform POOL See merge request !87
  0c5e8f4b
- Scintillator Waveform POOL · 672ea512
  Eric Torrence authored 4 years ago and Dave Casper committed 4 years ago
  
  672ea512
Sep 11, 2020
- Merge branch 'master' into 'master' · 44d10c3f
  Dave Casper authored 4 years ago
  
  Update faser-common submodule version See merge request !86
  44d10c3f
Sep 10, 2020
- bump faser-common · fe1821cd
  Dave Casper authored 4 years ago
  
  fe1821cd
- Switch TrackerDataFragment to use logger · 90a2a75e
  Dave Casper authored 4 years ago
  
  90a2a75e
- Merge branch 'master' into 'master' · 64fb5246
  Dave Casper authored 4 years ago
  
  Fix duplicated property name See merge request !85
  64fb5246
- Fix duplicated property name · 94fdd54e
  Dave Casper authored 4 years ago
  
  94fdd54e
Sep 09, 2020
- Merge branch 'cosmic-display-fixes' into 'master' · c1407235
  Dave Casper authored 4 years ago
  
  Clean-up, add event display instructions for cosmic data See merge request faser/calypso!84
  c1407235
- Clean-up, add event display instructions for cosmic data · 0881214c
  Dave Casper authored 4 years ago
  
  0881214c
- Merge branch 'master-tracker-hitmodes' into 'master' · 5920fa96
  Dave Casper authored 4 years ago
  
  Allow emulation of different tracker hit modes See merge request faser/calypso!83
  5920fa96
- Allow emulation of different tracker hit modes · 753e67bc
  Dave Casper authored 4 years ago
  
  753e67bc
- Merge branch 'master-readme' into 'master' · dd4eff57
  Dave Casper authored 4 years ago
  
  Updates to README See merge request !81
  dd4eff57
- Updates to README · 35b4a59d
  Dave Casper authored 4 years ago
  
  35b4a59d
Sep 04, 2020
- Merge branch 'master' into 'master' · b1448303
  Dave Casper authored 4 years ago
  
  Update version number See merge request faser/calypso!82
  b1448303
- Update version number · ffd61b49
  Dave Casper authored 4 years ago
  
  ffd61b49
Aug 31, 2020
- Merge branch 'cosmic' into 'master' · a73662df
  Dave Casper authored 4 years ago
  
  Athena 22.0.18 compatibility and Cosmics-related development See merge request faser/calypso!80
  a73662df
- Athena 22.0.18 compatibility and Cosmics-related development · 58bf4a5b
  Dave Casper authored 4 years ago
  
  58bf4a5b
Jul 03, 2020
- Merge branch 'master-frame-tweak' into 'master' · b2e8dacd
  Dave Casper authored 4 years ago
  
  Change vertical stagger progression to 0,-5,+5 See merge request !77
  22.0.15
  
  b2e8dacd
- Change vertical stagger progression to 0,-5,+5 · 3daeb09b
  Dave Casper authored 4 years ago
  
  3daeb09b
Jun 19, 2020
- Merge branch 'master-frame-tweak' into 'master' · e6f1fb3b
  Dave Casper authored 4 years ago
  
  Fix minor issue in frame See merge request faser/calypso!76
  e6f1fb3b
- Fix minor issue in frame · 75cb59bd
  Dave Casper authored 4 years ago
  
  75cb59bd
Jun 17, 2020
- Merge branch 'master-frame-overlap' into 'master' · eb9e1165
  Dave Casper authored 4 years ago
  
  Fix volume overlaps in tracker frame See merge request faser/calypso!74
  eb9e1165
- Fix volume overlaps in tracker frame · 1617367e
  Dave Casper authored 4 years ago
  
  1617367e
Jun 14, 2020
- Merge branch 'master-py3' into 'master' · 7fef34e7
  Dave Casper authored 4 years ago
  
  Minor edits for (future) Python 3 compatibility See merge request faser/calypso!73
  7fef34e7
Jun 13, 2020
- Minor edits for (future) Python 3 compatibility · 35c5f4a8
  Dave Casper authored 4 years ago
  
  35c5f4a8
- Merge branch 'master-tracker-frame' into 'master' · df1edc3f
  Dave Casper authored 4 years ago
  
  Add tracker frame to detector geometry See merge request faser/calypso!72
  df1edc3f
- Add tracker frame to detector geometry · 641c1ea9
  Dave Casper authored 4 years ago
  
  641c1ea9
May 31, 2020
- Merge branch 'master_scint_geo_may20' into 'master' · b7b43a65
  Dave Casper authored 4 years ago
  
  Scintillator positions from CAD See merge request faser/calypso!71
  b7b43a65
May 30, 2020
- Scintillator positions from CAD · d26bcbfb
  Dave Casper authored 4 years ago
  
  d26bcbfb
- Merge branch 'master_tracker_plane_geo' into 'master' · 5e89c848
  Dave Casper authored 4 years ago
  
  Update tracker geometry from May 2020 CAD model See merge request faser/calypso!70
  5e89c848
- Update tracker geometry from May 2020 CAD model · f42e9860
  Dave Casper authored 4 years ago
  
  f42e9860
- Merge branch 'master_version_txt_22_0_14' into 'master' · f270f3c9
  Dave Casper authored 4 years ago
  
  Update release version number See merge request faser/calypso!69
  22.0.14
  
  f270f3c9
- Prepare to tag 22.0.14 · 4b185320
  Dave Casper authored 4 years ago
  
  4b185320
- Merge remote-tracking branch 'upstream/master' · 94d8831c
  Dave Casper authored 4 years ago
  
  94d8831c
- Merge branch 'master_tracker_plane_geo' into 'master' · e4516bef
  Dave Casper authored 4 years ago
  
  Database changes for staggered tracker planes See merge request faser/calypso!68
  e4516bef
- Revert "Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso " · 8e8773a7
  Dave Casper authored 4 years ago
  
  This reverts commit 4c9e84aa
  8e8773a7
- Merge branch 'master_main_services' into 'master' · 34ff1271
  Dave Casper authored 4 years ago
  
  Fix configuration issue caused by ATLAS change See merge request faser/calypso!67
  34ff1271
- Revert "Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso " · a6edb102
  Dave Casper authored 4 years ago
  
  This reverts commit 4c9e84aa
  a6edb102
May 21, 2020
- Merge remote-tracking branch 'upstream/master' · ee30da5e
  Dave Casper authored 4 years ago
  
  ee30da5e
- Merge branch 'master' into 'master' · 2e1b7c0e
  Dave Casper authored 4 years ago
  
  Repair problems caused by changes to ATLAS SCT conditions code See merge request faser/calypso!66
  2e1b7c0e