Commits · 7fef34e7d17c6c671456e08d788f7f5eeed6ad38 · faser / calypso

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 !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 !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 !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 !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 !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 !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 !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 !66
  2e1b7c0e
- Revert "Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso " · 6456d54a
  Dave Casper authored 4 years ago
  
  This reverts commit 4c9e84aa
  6456d54a
- Adapt to breaking changes in ATLAS conditions code · c624e7ea
  Dave Casper authored 4 years ago
  
  c624e7ea
May 11, 2020
- Merge remote-tracking branch 'upstream/master' · 5915b9c1
  Dave Casper authored 4 years ago
  
  5915b9c1
- Merge branch 'master-flake-workaround-revert' into 'master' · 32d91e88
  Dave Casper authored 4 years ago
  
  Revert the Flake workaround See merge request !64
  32d91e88
- Revert "Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso " · a7b96d24
  Dave Casper authored 4 years ago
  
  This reverts commit 4c9e84aa
  a7b96d24
- Merge remote-tracking branch 'upstream/master' · bc6846cd
  Dave Casper authored 4 years ago
  
  bc6846cd
May 10, 2020
- Merge branch 'master-AtlasHepMC-ISF_Interface' into 'master' · 373c248f
  Dave Casper authored 4 years ago
  
  Conform to ATLAS MC changes; workaround Flake issue See merge request !63
  373c248f
- Revert "Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso " · 6ac3be2f
  Dave Casper authored 4 years ago
  
  This reverts commit 4c9e84aa
  6ac3be2f
Apr 29, 2020
- Merge remote-tracking branch 'upstream/master' · 16459e31
  Dave Casper authored 4 years ago
  
  16459e31
- Merge branch 'master-magthread' into 'master' · b3e366fc
  Dave Casper authored 4 years ago
  
  Conform to ATLAS changes, move databases to CVMFS See merge request !62
  b3e366fc
- Revert "Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso " · d2b879b3
  Dave Casper authored 4 years ago
  
  This reverts commit 4c9e84aa
  d2b879b3
Apr 06, 2020
- Merge remote-tracking branch 'upstream/master' · be2e1199
  Dave Casper authored 4 years ago
  
  be2e1199
- Merge branch 'spacepoint-protect' into 'master' · 171640e5
  Dave Casper authored 4 years ago
  
  Protect against spacepoints beyond the ends of strips See merge request !59
  171640e5
- Revert "Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso " · 4fbb7075
  Dave Casper authored 4 years ago
  
  This reverts commit 4c9e84aa
  4fbb7075
- Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso · 26b24367
  Dave Casper authored 4 years ago
  
  26b24367
- Merge branch 'master' into 'master' · d89ba2c7
  Dave Casper authored 4 years ago
  
  Fix spacepoint and geometry bugs See merge request !58
  d89ba2c7
- Revert "Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso " · 15a3af68
  Dave Casper authored 4 years ago
  
  This reverts commit 4c9e84aa
  15a3af68
- Reduce event count to avoid timeout on test · e8641a12
  Dave Casper authored 4 years ago
  
  e8641a12
- Fix bug in spacepoint calculation and geometry overlap · 21106ec3
  Dave Casper authored 4 years ago
  
  21106ec3
Apr 05, 2020
- Merge remote-tracking branch 'upstream/master' · d55e6910
  Dave Casper authored 4 years ago
  
  d55e6910
- Merge branch 'cluster-edm' into 'master' · a757a6e6
  Dave Casper authored 4 years ago
  
  Refactor and integrate clustering and spacepoint work See merge request !57
  a757a6e6
- Revert "Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso " · 068c93ea
  Dave Casper authored 4 years ago
  
  This reverts commit 4c9e84aa
  068c93ea
Apr 03, 2020
- Merge remote-tracking branch 'upstream/master' · 91e72fd4
  Dave Casper authored 4 years ago
  
  91e72fd4