Commits · f248e0d5d1ba882a347cf5714c3a98290e47b08a · faser / calypso

Mar 24, 2020
- Merge remote-tracking branch 'upstream/master' · f248e0d5
  Dave Casper authored 5 years ago
  
  f248e0d5
Mar 23, 2020
- Merge branch 'master-simupdate' into 'master' · fb8682ce
  Dave Casper authored 5 years ago
  
  Fix issues with truth information and reorganize some channel IDs See merge request faser/calypso!52
  fb8682ce
- Fix issues with truth information and reorganize some channel IDs · dc440d64
  Dave Casper authored 5 years ago
  
  dc440d64
Feb 22, 2020
- Merge branch 'master' of https://gitlab.cern.ch:8443/dcasper/calypso · 2c358a2b
  Dave Casper authored 5 years ago
  
  2c358a2b
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' of https://gitlab.cern.ch:8443/dcasper/calypso · 80b4f53a
  Dave Casper authored 5 years ago
  
  80b4f53a
- 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 remote-tracking branch 'upstream/master' · 48d70237
  Dave Casper authored 5 years ago
  
  48d70237
- 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 remote-tracking branch 'upstream/master' · 6cf7c97f
  Dave Casper authored 5 years ago
  
  6cf7c97f
- 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 remote-tracking branch 'upstream/master' · 53788623
  Dave Casper authored 5 years ago
  
  53788623
- 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 remote-tracking branch 'upstream/master' · d02f7aa9
  Dave Casper authored 5 years ago
  
  d02f7aa9
- 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
- Fix conflicts · 56451d9a
  Dave Casper authored 5 years ago
  
  56451d9a
- Fix conflicts · 47218e98
  Dave Casper authored 5 years ago
  
  47218e98
- Fix conflicts · 3a07fd31
  Dave Casper authored 5 years ago
  
  3a07fd31
- Fix conflicts · 34f0f3db
  Dave Casper authored 5 years ago
  
  34f0f3db
- Fix conflicts · 85b41776
  Dave Casper authored 5 years ago
  
  85b41776
- Revert "Merge branch 'revert-4c9e84aa ' into 'master'" · 4d4a87f7
  Dave Casper authored 5 years ago
  
  This reverts commit 09506d34, reversing changes made to 4c9e84aa.
  4d4a87f7
- Merge branch 'revert-4c9e84aa ' into 'master' · 09506d34
  Dave Casper authored 5 years ago
  
  Revert "Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso" See merge request dcasper/calypso!1
  09506d34
- Revert "Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso " · 07b63b2f
  Dave Casper authored 5 years ago
  
  This reverts commit 4c9e84aa
  07b63b2f
- Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso · 4c9e84aa
  Dave Casper authored 5 years ago
  
  4c9e84aa
- Update README.md · 101c2c73
  Dave Casper authored 5 years ago
  
  101c2c73
- Update README.md · 01aed4d7
  Dave Casper authored 5 years ago
  
  01aed4d7