Commits · geantinomapping · faser / calypso

May 11, 2020
- Merge branch 'master-flake-workaround-revert' into 'master' · 32d91e88
  Dave Casper authored 4 years ago
  
  Revert the Flake workaround See merge request faser/calypso!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
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 faser/calypso!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 branch 'master-magthread' into 'master' · b3e366fc
  Dave Casper authored 4 years ago
  
  Conform to ATLAS changes, move databases to CVMFS See merge request faser/calypso!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 branch 'spacepoint-protect' into 'master' · 171640e5
  Dave Casper authored 4 years ago
  
  Protect against spacepoints beyond the ends of strips See merge request faser/calypso!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' 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
Apr 05, 2020
- 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 branch 'master_McDump' into 'master' · c46a4680
  Dave Casper authored 4 years ago
  
  Correct Athena compatibility problems See merge request !56
  c46a4680
- Revert "Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso " · 0cde3351
  Dave Casper authored 4 years ago
  
  This reverts commit 4c9e84aa
  0cde3351
Mar 24, 2020
- Merge branch 'rricesmi/calypso-master' into 'master' · e40d8000
  Dave Casper authored 4 years ago
  
  Example job to read Tracker RDO data and associate with Truth See merge request !54
  e40d8000
- Revert "Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso " · d99d2902
  Dave Casper authored 4 years ago
  
  This reverts commit 4c9e84aa
  d99d2902
Mar 23, 2020
- Merge branch 'master-simupdate' into 'master' · fb8682ce
  Dave Casper authored 4 years ago
  
  Fix issues with truth information and reorganize some channel IDs See merge request !52
  fb8682ce
- Fix issues with truth information and reorganize some channel IDs · dc440d64
  Dave Casper authored 4 years ago
  
  dc440d64
Feb 21, 2020
- Merge branch 'master-readme-geoExample' into 'master' · 59310857
  Dave Casper authored 5 years ago
  
  Fix typo in README See merge request !51
  59310857
- Fix typo in README · f701881f
  Dave Casper authored 5 years ago
  
  f701881f
Feb 13, 2020
- Merge branch 'master-digi-readme' into 'master' · 1a8df6d0
  Dave Casper authored 5 years ago
  
  Fix typo in README for digitization See merge request !48
  1a8df6d0
- Fix typo in README for digitization · 6501e876
  Dave Casper authored 5 years ago
  
  6501e876
Feb 12, 2020
- Merge branch 'master-bfield-condfix' into 'master' · 464c270c
  Dave Casper authored 5 years ago
  
  Remove references to DCS field conditions See merge request !47
  464c270c
- Remove references to DCS field conditions · 8aa42111
  Dave Casper authored 5 years ago
  
  8aa42111
- Merge branch 'master-tracker-iddict' into 'master' · e3e3ee65
  Dave Casper authored 5 years ago
  
  Correct inaccurate comment See merge request !46
  e3e3ee65
- Correct inaccurate comment · 71590da0
  Dave Casper authored 5 years ago
  
  71590da0
Feb 10, 2020
- Merge branch 'master-scint' into 'master' · 0f79a1fb
  Dave Casper authored 5 years ago
  
  Add trigger and preshower scintillators to geometry See merge request !45
  0f79a1fb
- Add trigger and preshower scintillators to geometry · c0567b59
  Dave Casper authored 5 years ago
  
  c0567b59
Feb 05, 2020
- Merge branch 'master' into 'master' · 4795d24e
  Dave Casper authored 5 years ago
  
  Replaced FaserGeoEditor files with latest working version See merge request !44
  4795d24e
- Replace FaserGeoEditorApp.h · 94d91bcf
  Ryan Alexander Rice-Smith authored 5 years ago
  
  94d91bcf
- Replace FaserGeoEditorApp.cxx · 972cb3f9
  Ryan Alexander Rice-Smith authored 5 years ago
  
  972cb3f9
- Replace FaserDbMainWindow.cxx · c3e29e28
  Ryan Alexander Rice-Smith authored 5 years ago
  
  c3e29e28
- Replace main.cxx · 227247e6
  Ryan Alexander Rice-Smith authored 5 years ago
  
  227247e6
- Replace FaserGeoEditorApp.h · 33e857bf
  Ryan Alexander Rice-Smith authored 5 years ago
  
  33e857bf
- Replace FaserGeoEditorApp.cxx · f545de6d
  Ryan Alexander Rice-Smith authored 5 years ago
  
  f545de6d
- Replace FaserDbMainWindow.h · cd8ae7c5
  Ryan Alexander Rice-Smith authored 5 years ago
  
  cd8ae7c5
- Replace FaserDbMainWindow.cxx · 1fb5b30e
  Ryan Alexander Rice-Smith authored 5 years ago
  
  1fb5b30e
- Updated Readme to better describe functionality and features of program · a7d1df3f
  Ryan Alexander Rice-Smith authored 5 years ago
  
  a7d1df3f
Jan 26, 2020
- Update README.md · 101c2c73
  Dave Casper authored 5 years ago
  
  101c2c73
- Update README.md · 01aed4d7
  Dave Casper authored 5 years ago
  
  01aed4d7

Admin message