diff --git a/.gitignore b/.gitignore
index c347b86104ffe490a049be365637f07c41c44a21..938ca1d33a27e23ed2b5ed0e47b19d5f9ccb1c74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ tmp.*
.idea/**
cmake-debug-build/**
.vscode/**
+.vscode
diff --git "a/:\033q" "b/:\033q"
new file mode 100644
index 0000000000000000000000000000000000000000..a5311735ada1e7ca62a8433cc7904a0c68eef995
--- /dev/null
+++ "b/:\033q"
@@ -0,0 +1,2369 @@
+commit 42f2fe7dd1f840c15d7353aef7b1f114ea048b3b
+Author: sshively <savannah.rose.shively@cern.ch>
+Date: Mon Apr 12 21:47:31 2021 +0200
+
+ changes to readexample_entries and py files. namespace changes
+
+commit 19a5defd4660e99d31c7801775985078117634dd
+Author: sshively <savannah.rose.shively@cern.ch>
+Date: Mon Apr 12 19:33:34 2021 +0200
+
+ various updates
+
+commit 77f937fb62095af69205287dcbb3942c7557807e
+Author: sshively <savannah.rose.shively@cern.ch>
+Date: Wed Apr 7 10:56:51 2021 +0200
+
+ Baseline functional update. Pre-RDO functions
+
+commit 2f33c895c1a07decdba532a4b40b56e4941c20ba
+Author: sshively <savannah.rose.shively@cern.ch>
+Date: Tue Apr 6 16:18:25 2021 +0200
+
+ closer maybe
+
+commit 0a6dc3e0cc0395ecb9876de2a76bbf17d6943bf7
+Author: sshively <savannah.rose.shively@cern.ch>
+Date: Tue Apr 6 15:46:39 2021 +0200
+
+ still busted
+
+commit 6ac9e15db62a7a8a80043a7043117e77ee591e38
+Author: sshively <savannah.rose.shively@cern.ch>
+Date: Tue Apr 6 09:53:52 2021 +0200
+
+ it doesnt work
+
+commit f5fd66c0608dff74491a628a1d586213fe1a9aa9
+Merge: a743a07 5b9edec
+Author: sshively <savannah.rose.shively@cern.ch>
+Date: Wed Mar 31 15:36:14 2021 +0200
+
+ Merge remote-tracking branch 'upstream/master'
+
+ Conflicts:
+ faser-common
+
+commit 5b9edec4d1af819dd289d0f7969d156951415f08
+Merge: 5a389ea f04a15d
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat Mar 27 13:25:10 2021 +0000
+
+ Merge branch 'master' into 'master'
+
+ Fix entry logic error
+
+ See merge request faser/calypso!113
+
+commit f04a15d08bd87695840531af11c697e2dede9297
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat Mar 27 05:28:43 2021 -0700
+
+ Fix entry logic error
+
+commit 5a389ead346f0c511bdd45ad9a4cacf0afe21709
+Merge: 0a97b21 a72ac14
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat Mar 27 05:12:37 2021 +0000
+
+ Merge branch 'master-cosmic-box' into 'master'
+
+ Generate on box surface rather than sphere
+
+ See merge request faser/calypso!112
+
+commit a72ac14efd29f1630d57c6fa309ad774148eaf6a
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat Mar 27 05:12:36 2021 +0000
+
+ Generate on box surface rather than sphere
+
+commit 0a97b21641a3e81e335e395cd81391d7bf2a1aa8
+Merge: 162f00b 59bb453
+Author: Dave Casper <dcasper@uci.edu>
+Date: Fri Mar 26 18:34:31 2021 +0000
+
+ Merge branch 'sshively-Cosmics' into 'master'
+
+ Add cosmic generator
+
+ See merge request faser/calypso!111
+
+commit 59bb453a69264d9b2dd69f146c3f2ad9d1065e25
+Author: Dave Casper <dcasper@uci.edu>
+Date: Fri Mar 26 18:34:30 2021 +0000
+
+ fix mc_valid - default false, check while generating instead and dont return until valid event is created
+
+commit 162f00b1bcdd9915db85dbd936b33c034ef41fc9
+Merge: 53a9fde 48d5c35
+Author: Dave Casper <dcasper@uci.edu>
+Date: Thu Mar 18 15:57:50 2021 +0000
+
+ Merge branch 'master' into 'master'
+
+ Incorporate faser-common change
+
+ See merge request faser/calypso!109
+
+commit 48d5c3589b204d3e7fa301096c4d7775496475d5
+Author: Dave Casper <dcasper@uci.edu>
+Date: Thu Mar 18 07:59:22 2021 -0700
+
+ Incorporate faser-common change
+
+commit 53a9fde4f21f3b0c5f1dc3a377968c64347a635c
+Merge: 6f4d450 a418ebe
+Author: Dave Casper <dcasper@uci.edu>
+Date: Thu Mar 18 03:14:10 2021 +0000
+
+ Merge branch 'master-stripFit' into 'master'
+
+ Strip fitter and various fixes for handling real data
+
+ See merge request faser/calypso!108
+
+commit a418ebe773c32a96abf9392abedda2cfe28c1c3a
+Author: Dave Casper <dcasper@uci.edu>
+Date: Thu Mar 18 03:14:08 2021 +0000
+
+ Strip fitter and various fixes for handling real data
+
+commit 6f4d450817cd17a80f0341481d83bdd3519dfccf
+Merge: bb9a31d 1bd0751
+Author: Dave Casper <dcasper@uci.edu>
+Date: Wed Mar 17 21:08:48 2021 +0000
+
+ Merge branch 'xrootd' into 'master'
+
+ Xrootd support
+
+ See merge request faser/calypso!107
+
+commit 1bd07511f8486a3fb52a6560825113c8d03e8069
+Author: Eric Torrence <eric.torrence@cern.ch>
+Date: Wed Mar 17 21:08:47 2021 +0000
+
+ First commit of scintillator reconstruction code.
+
+ Code doesn't actually do anything, but this compiles and give the basic framework
+ for adding real algorithims.
+
+commit bb9a31d637c50842b48ac0cb57c66fa77855f634
+Merge: ca9d140 1c6d0fe
+Author: Dave Casper <dcasper@uci.edu>
+Date: Wed Mar 17 21:07:43 2021 +0000
+
+ Merge branch 'master' into 'master'
+
+ TP converter for space points
+
+ See merge request faser/calypso!106
+
+commit 1c6d0fef86c3824fd781d5495acb5f9f1566b351
+Author: Tobias Bockh <tobias.boeckh@cern.ch>
+Date: Wed Mar 17 21:07:43 2021 +0000
+
+ TP converter for space points
+
+commit ca9d1400e7b5da6534cbb9f3411bbe648d68a1bd
+Merge: 648431b 625d56a
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat Mar 13 05:35:15 2021 +0000
+
+ Merge branch 'wavereco' into 'master'
+
+ Wavereco bugfix
+
+ See merge request faser/calypso!105
+
+commit 625d56a0b16976e1dd4651dd1f5fc09acaf17df3
+Author: Eric Torrence <eric.torrence@cern.ch>
+Date: Sat Mar 13 05:35:15 2021 +0000
+
+ First commit of scintillator reconstruction code.
+
+ Code doesn't actually do anything, but this compiles and give the basic framework
+ for adding real algorithims.
+
+commit 648431b53ed5ed46c96c1ca8c6805cc4c7dd775e
+Merge: cca2710 4152471
+Author: Dave Casper <dcasper@uci.edu>
+Date: Fri Mar 12 04:07:42 2021 +0000
+
+ Merge branch 'wavereco' into 'master'
+
+ Waveform reconstruction
+
+ See merge request faser/calypso!103
+
+commit 4152471fca7f75e7ec6c9373ee1c32b0310d58ec
+Author: Eric Torrence <eric.torrence@cern.ch>
+Date: Fri Mar 12 04:07:41 2021 +0000
+
+ First commit of scintillator reconstruction code.
+
+ Code doesn't actually do anything, but this compiles and give the basic framework
+ for adding real algorithims.
+
+commit cca2710d8a90fdf100eff1c2688d3b533df7134e
+Merge: 6c76e71 94ef289
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat Feb 27 21:13:07 2021 +0000
+
+ Merge branch 'master-vp1-station-index' into 'master'
+
+ Fix obsolete indexing, add IFD forward compatibility
+
+ See merge request faser/calypso!102
+
+commit 94ef28986fe9a323414d42ba5d2075b14bb747f6
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat Feb 27 12:16:23 2021 -0800
+
+ Fix obsolete indexing, add IFD forward compatibility
+
+commit 6c76e714def2e87ea26d3e7dd9de11a7f3cd1086
+Merge: efe8197 d420432
+Author: Dave Casper <dcasper@uci.edu>
+Date: Thu Feb 25 15:43:06 2021 +0000
+
+ Merge branch 'master-gen' into 'master'
+
+ Skeleton for cosmic generator module
+
+ See merge request faser/calypso!101
+
+commit d42043237ba2170d068ef267cbf783e2175c4b42
+Author: Dave Casper <dcasper@uci.edu>
+Date: Thu Feb 25 07:39:52 2021 -0800
+
+ Skeleton for cosmic generator module
+
+commit efe8197e618b47ddd833dace76509f6232472317
+Merge: be777c1 ab6eaf3
+Author: Dave Casper <dcasper@uci.edu>
+Date: Tue Feb 9 00:13:26 2021 +0000
+
+ Merge branch 'material_mapping_athena_22.0.19' into 'master'
+
+ implement materialmapping in calypso
+
+ See merge request faser/calypso!100
+
+commit ab6eaf38670b30b26254439659fa0377b44d0620
+Author: John William Spencer <john.william.spencer@cern.ch>
+Date: Tue Feb 9 00:13:25 2021 +0000
+
+ implement materialmapping in calypso
+
+commit be777c13115df0620cf8b058f1dba2316cc11da1
+Merge: 185cabf feea778
+Author: Dave Casper <dcasper@uci.edu>
+Date: Fri Feb 5 13:23:57 2021 +0000
+
+ Merge branch 'master_22.0.19' into 'master'
+
+ Master 22.0.19
+
+ See merge request faser/calypso!97
+
+commit feea778c9d19b3271260d467d16b76f9cc59d451
+Author: Tobias Boeckh <tobias.boeckh@cern.ch>
+Date: Wed Jan 20 01:07:17 2021 +0100
+
+ cosmics
+
+commit 4524392db6db0388cca1dd9c50f448e5d8b1692b
+Author: Tobias Boeckh <tobias.boeckh@cern.ch>
+Date: Wed Jan 20 00:39:47 2021 +0100
+
+ update faser-common
+
+commit bd16bda675d6c1456301265ede08ebe8a7465760
+Author: Tobias Boeckh <tobias.boeckh@cern.ch>
+Date: Tue Jan 19 23:43:28 2021 +0100
+
+ use Athena 22.0.19
+
+commit a743a078a9024e509f86120b55e4049381814717
+Author: sshively <savannah.rose.shively@cern.ch>
+Date: Wed Dec 9 15:27:48 2020 +0100
+
+ test L100 icc
+
+commit 5c23cca514c3dd0f6b2aa0c5ccbb4c942fd1371c
+Author: sshively <savannah.rose.shively@cern.ch>
+Date: Wed Dec 9 15:09:12 2020 +0100
+
+ fix gitmodules to be relative
+
+commit 30dee572a018b14cee0e3c31739794e572f631a1
+Author: sshively <savannah.rose.shively@cern.ch>
+Date: Wed Dec 9 14:55:39 2020 +0100
+
+ git ignore for vs
+
+commit aa3b54863f13ea11ea5b0eda9c1ba39454df5247
+Author: sshively <savannah.rose.shively@cern.ch>
+Date: Tue Dec 8 14:12:46 2020 +0100
+
+ chipIsValid added
+
+commit d03d99d4e3e942a0ee80298f864ba132b6261996
+Author: sshively <savannah.rose.shively@cern.ch>
+Date: Mon Dec 7 21:32:39 2020 +0100
+
+ chipIDValid added
+
+commit 185cabf4862a3af1f92c53f9cd2c19b6f78dc032
+Author: Dave Casper <dcasper@uci.edu>
+Date: Fri Oct 9 21:56:56 2020 +0000
+
+ Delete c_cpp_properties.json
+
+commit 33d81a59fde0de994b604eb5e705fe28d9935b1b
+Merge: a67bc80 6faf6f8
+Author: Dave Casper <dcasper@uci.edu>
+Date: Fri Oct 9 21:55:35 2020 +0000
+
+ Merge branch 'master' into 'master'
+
+ SimHitAlg
+
+ See merge request faser/calypso!94
+
+commit 6faf6f8c51a750c8b80382480a87ffc7c8c52dfe
+Author: Savannah Rose Shively <savannah.rose.shively@cern.ch>
+Date: Fri Oct 9 21:42:02 2020 +0200
+
+ gitignore update
+
+commit 505f8d8bfeed6429b654ce666436dfb7ce289c75
+Author: Savannah Rose Shively <savannah.rose.shively@cern.ch>
+Date: Fri Oct 9 20:00:31 2020 +0200
+
+ simhit updates and gitlab athena version fixed
+
+commit e32c86adfa38f37e6d3fddec0484e40b1166ff69
+Merge: c8c4c51 a67bc80
+Author: Savannah Rose Shively <savannah.rose.shively@cern.ch>
+Date: Fri Oct 9 19:56:49 2020 +0200
+
+ Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso
+
+commit c8c4c519a90f1020f0b3c448af4e4b0012f7dd0b
+Author: Savannah Rose Shively <savannah.rose.shively@cern.ch>
+Date: Fri Oct 9 18:49:25 2020 +0200
+
+ add veto and trigger
+
+commit 8c10d27b75b19bbad93335e38e956d1d94445796
+Author: Savannah Rose Shively <savannah.rose.shively@cern.ch>
+Date: Fri Oct 9 16:44:14 2020 +0200
+
+ fill histo
+
+commit a67bc80d5294959b4c32777233988764ee9a7cf7
+Merge: 62207ba 1d8fbc3
+Author: Dave Casper <dcasper@uci.edu>
+Date: Tue Oct 6 02:50:26 2020 +0000
+
+ Merge branch 'master-mainservicesconfig-fix' into 'master'
+
+ Create and use Faser MainServicesConfig.py
+
+ See merge request faser/calypso!93
+
+commit 1d8fbc34c472dc1d8d0d5d346ae569f74349e7f9
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Oct 5 16:20:08 2020 -0700
+
+ Create and use Faser MainServicesConfig.py
+
+commit 35503c927e973662a55f07eb55d5f59985ad3ba3
+Author: Savannah Rose Shively <savannah.rose.shively@cern.ch>
+Date: Fri Oct 2 19:06:31 2020 +0200
+
+ sg fix
+
+commit 5629f0b78a6d8b95b5b8b48fab4b702c36546de2
+Merge: 7c868f6 62207ba
+Author: Savannah Rose Shively <savannah.rose.shively@cern.ch>
+Date: Thu Oct 1 18:01:40 2020 +0200
+
+ Merge remote-tracking branch 'upstream/master'
+ SimHitAlg modifications
+
+commit 7c868f652fb77c5bb1e986b8587c8c7cb708331c
+Author: Savannah Rose Shively <savannah.rose.shively@cern.ch>
+Date: Thu Oct 1 15:17:04 2020 +0200
+
+ SimHitAlg practice
+
+commit 62207ba4e3bf767d0494cfba44e7a88ed144de99
+Merge: 5a53d5d e691177
+Author: Dave Casper <dcasper@uci.edu>
+Date: Wed Sep 23 20:08:01 2020 +0000
+
+ Merge branch 'gang/calypso-master-merged' into 'master'
+
+ Gang/calypso master merged
+
+ See merge request faser/calypso!91
+
+commit e6911771d2e4d2fe644778c0eabe700529050410
+Author: Dave Casper <dcasper@uci.edu>
+Date: Wed Sep 23 20:08:00 2020 +0000
+
+ Move from AthReetrantAlgorithm to AthAlgorithm for FaserActsKalmanFilterAlg to be able to make a TTree
+
+commit 5a53d5dfc13848d29956837aac3b1efafe37f9c9
+Merge: 6e4d003 3311706
+Author: Dave Casper <dcasper@uci.edu>
+Date: Tue Sep 15 15:53:16 2020 +0000
+
+ Merge branch 'master-libdl-fix' into 'master'
+
+ Add missing system library dependency
+
+ See merge request faser/calypso!89
+
+commit 33117060ab33bbc4fa280a79a80d9fcf0bcdc5e6
+Author: Dave Casper <dcasper@uci.edu>
+Date: Tue Sep 15 08:14:10 2020 -0700
+
+ Add missing system library dependency
+
+commit 6e4d003da2dc3f4f71055a5c9e4109a1cdf8ba17
+Merge: 0c5e8f4 22dfcde
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sun Sep 13 00:00:40 2020 +0000
+
+ Merge branch 'master-cppyy-fix' into 'master'
+
+ Fix python issue caused by ROOT 6.22
+
+ See merge request faser/calypso!88
+
+commit 22dfcdeb5c2fab932e641288bf68834ce4f2a8c7
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat Sep 12 16:23:54 2020 -0700
+
+ Fix python issue caused by ROOT 6.22
+
+commit 0c5e8f4bb8f6f78529a1fb9da46273ee9833307a
+Merge: 44d10c3 672ea51
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat Sep 12 22:38:39 2020 +0000
+
+ Merge branch 'master' into 'master'
+
+ Scintillator Waveform POOL
+
+ See merge request faser/calypso!87
+
+commit 672ea512401c330d2709e1e0950cfccc449c5a63
+Author: Eric Torrence <eric.torrence@cern.ch>
+Date: Sat Sep 12 22:38:38 2020 +0000
+
+ Scintillator Waveform POOL
+
+commit 44d10c3f0f1d01dcb9847f1e288d222d2fc26902
+Merge: 64fb524 fe1821c
+Author: Dave Casper <dcasper@uci.edu>
+Date: Fri Sep 11 01:42:36 2020 +0000
+
+ Merge branch 'master' into 'master'
+
+ Update faser-common submodule version
+
+ See merge request faser/calypso!86
+
+commit fe1821cd2671bf3a75f82b183baaefe678780cb2
+Author: Dave Casper <dcasper@uci.edu>
+Date: Thu Sep 10 05:14:15 2020 -0700
+
+ bump faser-common
+
+commit 90a2a75e97e263a1ccf0cf389ea717b427422f9d
+Author: Dave Casper <dcasper@uci.edu>
+Date: Thu Sep 10 05:12:12 2020 -0700
+
+ Switch TrackerDataFragment to use logger
+
+commit 64fb5246e96582d1f7a0c316eaed4103f79bb465
+Merge: c140723 94fdd54
+Author: Dave Casper <dcasper@uci.edu>
+Date: Thu Sep 10 04:48:24 2020 +0000
+
+ Merge branch 'master' into 'master'
+
+ Fix duplicated property name
+
+ See merge request faser/calypso!85
+
+commit 94fdd54ef62be964cf63456798d22d2059d5c4c3
+Author: Dave Casper <dcasper@uci.edu>
+Date: Wed Sep 9 21:15:24 2020 -0700
+
+ Fix duplicated property name
+
+commit c140723549076196d24a68faba0c3c499589da35
+Merge: 5920fa9 0881214
+Author: Dave Casper <dcasper@uci.edu>
+Date: Wed Sep 9 21:41:29 2020 +0000
+
+ Merge branch 'cosmic-display-fixes' into 'master'
+
+ Clean-up, add event display instructions for cosmic data
+
+ See merge request faser/calypso!84
+
+commit 0881214c509fdc22fb8500b72f6a35332e04a698
+Author: Dave Casper <dcasper@uci.edu>
+Date: Wed Sep 9 14:01:50 2020 -0700
+
+ Clean-up, add event display instructions for cosmic data
+
+commit 5920fa9647c4514f37454f9f3ad96784d5ab114f
+Merge: dd4eff5 753e67b
+Author: Dave Casper <dcasper@uci.edu>
+Date: Wed Sep 9 19:53:29 2020 +0000
+
+ Merge branch 'master-tracker-hitmodes' into 'master'
+
+ Allow emulation of different tracker hit modes
+
+ See merge request faser/calypso!83
+
+commit 753e67bc532ed871cf7613c4fcd2a3085d08df26
+Author: Dave Casper <dcasper@uci.edu>
+Date: Wed Sep 9 19:53:29 2020 +0000
+
+ Allow emulation of different tracker hit modes
+
+commit dd4eff5745de6e3de3d92fb514459788066d8e91
+Merge: b144830 35b4a59
+Author: Dave Casper <dcasper@uci.edu>
+Date: Wed Sep 9 17:03:57 2020 +0000
+
+ Merge branch 'master-readme' into 'master'
+
+ Updates to README
+
+ See merge request faser/calypso!81
+
+commit 35b4a59d4fe7a3d58d70ad49807d857738a288fd
+Author: Dave Casper <dcasper@uci.edu>
+Date: Wed Sep 9 17:03:57 2020 +0000
+
+ Updates to README
+
+commit b14483036720193b3b8242c6a979e730fffec21e
+Merge: a73662d ffd61b4
+Author: Dave Casper <dcasper@uci.edu>
+Date: Fri Sep 4 16:48:26 2020 +0000
+
+ Merge branch 'master' into 'master'
+
+ Update version number
+
+ See merge request faser/calypso!82
+
+commit ffd61b49f34e2d43685dca27c1724e3f4c4136d8
+Author: Dave Casper <dcasper@uci.edu>
+Date: Fri Sep 4 09:18:17 2020 -0700
+
+ Update version number
+
+commit a73662df87e77a60502fc957db4b32d8c6060518
+Merge: b2e8dac 58bf4a5
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Aug 31 19:42:02 2020 +0000
+
+ Merge branch 'cosmic' into 'master'
+
+ Athena 22.0.18 compatibility and Cosmics-related development
+
+ See merge request faser/calypso!80
+
+commit 58bf4a5b5bea66d178ea7f28411a32a4356eba81
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Aug 31 19:41:57 2020 +0000
+
+ Athena 22.0.18 compatibility and Cosmics-related development
+
+commit b2e8dacd54a7db72c533137b4c66d35828bc2246
+Merge: e6f1fb3 3daeb09
+Author: Dave Casper <dcasper@uci.edu>
+Date: Fri Jul 3 09:12:16 2020 +0000
+
+ Merge branch 'master-frame-tweak' into 'master'
+
+ Change vertical stagger progression to 0,-5,+5
+
+ See merge request faser/calypso!77
+
+commit 3daeb09b666aff19c519d268c99dfb75010b4cab
+Author: Dave Casper <dcasper@uci.edu>
+Date: Fri Jul 3 01:30:31 2020 -0700
+
+ Change vertical stagger progression to 0,-5,+5
+
+commit e6f1fb3b9b462f34cfa749440d7dc9326b895603
+Merge: eb9e116 75cb59b
+Author: Dave Casper <dcasper@uci.edu>
+Date: Fri Jun 19 21:40:56 2020 +0000
+
+ Merge branch 'master-frame-tweak' into 'master'
+
+ Fix minor issue in frame
+
+ See merge request faser/calypso!76
+
+commit 75cb59bdd142ea306e53b5b9f386db523aec90bf
+Author: Dave Casper <dcasper@uci.edu>
+Date: Fri Jun 19 12:14:50 2020 -0700
+
+ Fix minor issue in frame
+
+commit eb9e11650a41b0d97cfe37749059d3a5d48b2201
+Merge: 7fef34e 1617367
+Author: Dave Casper <dcasper@uci.edu>
+Date: Wed Jun 17 02:35:06 2020 +0000
+
+ Merge branch 'master-frame-overlap' into 'master'
+
+ Fix volume overlaps in tracker frame
+
+ See merge request faser/calypso!74
+
+commit 1617367edeb8165fefe150495aabcd6769c1cc27
+Author: Dave Casper <dcasper@uci.edu>
+Date: Wed Jun 17 02:35:05 2020 +0000
+
+ Fix volume overlaps in tracker frame
+
+commit 7fef34e7d17c6c671456e08d788f7f5eeed6ad38
+Merge: df1edc3 35c5f4a
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sun Jun 14 01:28:03 2020 +0000
+
+ Merge branch 'master-py3' into 'master'
+
+ Minor edits for (future) Python 3 compatibility
+
+ See merge request faser/calypso!73
+
+commit 35c5f4a87162645384dde595c32e302d7f41f92b
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat Jun 13 16:34:53 2020 -0700
+
+ Minor edits for (future) Python 3 compatibility
+
+commit df1edc3f8e7562e0538bd37f21603fd16d6e6fbe
+Merge: b7b43a6 641c1ea
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat Jun 13 01:37:55 2020 +0000
+
+ Merge branch 'master-tracker-frame' into 'master'
+
+ Add tracker frame to detector geometry
+
+ See merge request faser/calypso!72
+
+commit 641c1ea940b508291f8a42e398f6618802861087
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat Jun 13 01:37:54 2020 +0000
+
+ Add tracker frame to detector geometry
+
+commit b7b43a65d708232c97f9b7f4dc3a2e97200deb69
+Merge: 5e89c84 d26bcbf
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sun May 31 01:08:55 2020 +0000
+
+ Merge branch 'master_scint_geo_may20' into 'master'
+
+ Scintillator positions from CAD
+
+ See merge request faser/calypso!71
+
+commit d26bcbfb6edf5e2717dc8a2f9c234c9eef10abb0
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat May 30 16:53:44 2020 -0700
+
+ Scintillator positions from CAD
+
+commit 5e89c848948908422c128df6aa180bf9bce016ad
+Merge: f270f3c f42e986
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat May 30 19:14:49 2020 +0000
+
+ Merge branch 'master_tracker_plane_geo' into 'master'
+
+ Update tracker geometry from May 2020 CAD model
+
+ See merge request faser/calypso!70
+
+commit f42e986051409d585734f829f500bf13087adb9f
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat May 30 19:14:49 2020 +0000
+
+ Update tracker geometry from May 2020 CAD model
+
+commit f270f3c9d316d9a9110cb31c1f4bf02543550c39
+Merge: e4516be 4b18532
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat May 30 18:29:10 2020 +0000
+
+ Merge branch 'master_version_txt_22_0_14' into 'master'
+
+ Update release version number
+
+ See merge request faser/calypso!69
+
+commit 4b185320717432f81c91d8da012996f29cc39238
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat May 30 10:45:27 2020 -0700
+
+ Prepare to tag 22.0.14
+
+commit 94d8831c284dd260924de70dbd769599092fb37f
+Merge: ee30da5 e4516be
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Fri May 29 23:12:23 2020 -0700
+
+ Merge remote-tracking branch 'upstream/master'
+
+commit e4516bef533c543f8692830ca3ecdfe668a4e41b
+Merge: 34ff127 8e8773a
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat May 30 06:11:26 2020 +0000
+
+ Merge branch 'master_tracker_plane_geo' into 'master'
+
+ Database changes for staggered tracker planes
+
+ See merge request faser/calypso!68
+
+commit 8e8773a7f2a62a2549451dfb402ad5e90243f911
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat May 30 06:11:24 2020 +0000
+
+ Revert "Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso"
+
+ This reverts commit 4c9e84aa6660762727103731dfdac6e1161b962c
+
+commit 34ff12716ceb535ed519d44a0f5ecb2a0aa06537
+Merge: 2e1b7c0 a6edb10
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat May 30 06:00:45 2020 +0000
+
+ Merge branch 'master_main_services' into 'master'
+
+ Fix configuration issue caused by ATLAS change
+
+ See merge request faser/calypso!67
+
+commit a6edb1026c77bd1c3ce42d9dfd6a8884daa86d91
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat May 30 06:00:43 2020 +0000
+
+ Revert "Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso"
+
+ This reverts commit 4c9e84aa6660762727103731dfdac6e1161b962c
+
+commit ee30da5e0e4f9c60bdb09fe04c2cc6df2f2c7908
+Merge: c624e7e 2e1b7c0
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Wed May 20 23:59:13 2020 -0700
+
+ Merge remote-tracking branch 'upstream/master'
+
+commit 2e1b7c0e18b9d427021ca0c04fb534300eaa585f
+Merge: 32d91e8 6456d54
+Author: Dave Casper <dcasper@uci.edu>
+Date: Thu May 21 06:54:53 2020 +0000
+
+ Merge branch 'master' into 'master'
+
+ Repair problems caused by changes to ATLAS SCT conditions code
+
+ See merge request faser/calypso!66
+
+commit 6456d54a6c1893dd8a3080a2c990ad5e2aaac9d6
+Author: Dave Casper <dcasper@uci.edu>
+Date: Thu May 21 06:54:53 2020 +0000
+
+ Revert "Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso"
+
+ This reverts commit 4c9e84aa6660762727103731dfdac6e1161b962c
+
+commit c624e7eae8ebc292b1a74e077faadd5506d88215
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Wed May 20 23:13:54 2020 -0700
+
+ Adapt to breaking changes in ATLAS conditions code
+
+commit 5915b9c1107a2c84f608ff14b164991d9d9e80b6
+Merge: bc6846c 32d91e8
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Mon May 11 02:01:03 2020 -0700
+
+ Merge remote-tracking branch 'upstream/master'
+
+commit 32d91e88964a72c8efb467aa5bd142cead19d3f7
+Merge: 373c248 a7b96d2
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon May 11 09:00:21 2020 +0000
+
+ Merge branch 'master-flake-workaround-revert' into 'master'
+
+ Revert the Flake workaround
+
+ See merge request faser/calypso!64
+
+commit a7b96d242e2f4c882e42cf7622cb65de967bf05d
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon May 11 09:00:21 2020 +0000
+
+ Revert "Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso"
+
+ This reverts commit 4c9e84aa6660762727103731dfdac6e1161b962c
+
+commit bc6846cdda307cf084f6e45793950ae10065fc6a
+Merge: 16459e3 373c248
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Mon May 11 00:41:45 2020 -0700
+
+ Merge remote-tracking branch 'upstream/master'
+
+commit 373c248f853539db579ac44a895a0396e9807203
+Merge: b3e366f 6ac3be2
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sun May 10 18:39:45 2020 +0000
+
+ Merge branch 'master-AtlasHepMC-ISF_Interface' into 'master'
+
+ Conform to ATLAS MC changes; workaround Flake issue
+
+ See merge request faser/calypso!63
+
+commit 6ac3be2f176c19fe246f5d4b5526d10e25dcfc83
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sun May 10 18:39:44 2020 +0000
+
+ Revert "Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso"
+
+ This reverts commit 4c9e84aa6660762727103731dfdac6e1161b962c
+
+commit 16459e316c6f81449fbd019a7b6b622ac8387cda
+Merge: be2e119 b3e366f
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Tue Apr 28 20:25:28 2020 -0700
+
+ Merge remote-tracking branch 'upstream/master'
+
+commit b3e366fc4a5c5a430d15469691e5343ed61c5d65
+Merge: 171640e d2b879b
+Author: Dave Casper <dcasper@uci.edu>
+Date: Wed Apr 29 03:20:34 2020 +0000
+
+ Merge branch 'master-magthread' into 'master'
+
+ Conform to ATLAS changes, move databases to CVMFS
+
+ See merge request faser/calypso!62
+
+commit d2b879b35fe2cf13db7b51f35276a09adc746d07
+Author: Dave Casper <dcasper@uci.edu>
+Date: Wed Apr 29 03:20:33 2020 +0000
+
+ Revert "Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso"
+
+ This reverts commit 4c9e84aa6660762727103731dfdac6e1161b962c
+
+commit be2e1199e11d7acd2a8b6178cc9d072b8bbf2cf5
+Merge: 26b2436 171640e
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Mon Apr 6 15:47:57 2020 -0700
+
+ Merge remote-tracking branch 'upstream/master'
+
+commit 171640e50ae5335fadeb3f19debcc9b49b3466d8
+Merge: d89ba2c 4fbb707
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Apr 6 10:12:59 2020 +0000
+
+ Merge branch 'spacepoint-protect' into 'master'
+
+ Protect against spacepoints beyond the ends of strips
+
+ See merge request faser/calypso!59
+
+commit 4fbb7075bd9c54463f3bfef88c5d06290940bc1e
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Apr 6 10:12:59 2020 +0000
+
+ Revert "Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso"
+
+ This reverts commit 4c9e84aa6660762727103731dfdac6e1161b962c
+
+commit 26b2436782a57c72fb9a519f8bdd0bf0e8981bbd
+Merge: e8641a1 d89ba2c
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Mon Apr 6 00:04:58 2020 -0700
+
+ Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso
+
+commit d89ba2c7d6e537ea2d976c39734d6bce2b7fb411
+Merge: a757a6e 15a3af6
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Apr 6 06:54:04 2020 +0000
+
+ Merge branch 'master' into 'master'
+
+ Fix spacepoint and geometry bugs
+
+ See merge request faser/calypso!58
+
+commit 15a3af687464301ff4e8ccbafd414344d697028f
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Apr 6 06:54:03 2020 +0000
+
+ Revert "Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso"
+
+ This reverts commit 4c9e84aa6660762727103731dfdac6e1161b962c
+
+commit e8641a123c3220a4a8e8e7ba73548f4c35d17141
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Sun Apr 5 23:21:36 2020 -0700
+
+ Reduce event count to avoid timeout on test
+
+commit 21106ec3f2a36a60e30a422823fe31ea1655c186
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Sun Apr 5 17:28:51 2020 -0700
+
+ Fix bug in spacepoint calculation and geometry overlap
+
+commit d55e69107cdf49f1655452119f71a7d5f83c2040
+Merge: 91e72fd a757a6e
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Sun Apr 5 00:19:42 2020 -0700
+
+ Merge remote-tracking branch 'upstream/master'
+
+commit a757a6e624c797be1611f3c424eff13695bed942
+Merge: c46a468 068c93e
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sun Apr 5 07:11:15 2020 +0000
+
+ Merge branch 'cluster-edm' into 'master'
+
+ Refactor and integrate clustering and spacepoint work
+
+ See merge request faser/calypso!57
+
+commit 068c93ea53722732d0bb00640a6656069ff14111
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sun Apr 5 07:11:14 2020 +0000
+
+ Revert "Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso"
+
+ This reverts commit 4c9e84aa6660762727103731dfdac6e1161b962c
+
+commit 91e72fd48e84d7e1a4c3d5ff5af0b696cd042cc3
+Merge: b16b559 c46a468
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Fri Apr 3 03:10:21 2020 -0700
+
+ Merge remote-tracking branch 'upstream/master'
+
+commit c46a4680f9e5fb40c8eb113a6ae502fbd4b5567e
+Merge: e40d800 0cde335
+Author: Dave Casper <dcasper@uci.edu>
+Date: Fri Apr 3 10:09:21 2020 +0000
+
+ Merge branch 'master_McDump' into 'master'
+
+ Correct Athena compatibility problems
+
+ See merge request faser/calypso!56
+
+commit 0cde33519057152e751f5105d1fd37e05c1f07a9
+Author: Dave Casper <dcasper@uci.edu>
+Date: Fri Apr 3 10:09:21 2020 +0000
+
+ Revert "Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso"
+
+ This reverts commit 4c9e84aa6660762727103731dfdac6e1161b962c
+
+commit b16b55984def5d262e2e203335a0fb194728fae3
+Merge: f248e0d e40d800
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Tue Mar 24 00:41:50 2020 -0700
+
+ Merge remote-tracking branch 'upstream/master'
+
+commit e40d80004e0b618f514e2547d23c8cdcbfd6f10d
+Merge: fb8682c d99d290
+Author: Dave Casper <dcasper@uci.edu>
+Date: Tue Mar 24 07:38:48 2020 +0000
+
+ Merge branch 'rricesmi/calypso-master' into 'master'
+
+ Example job to read Tracker RDO data and associate with Truth
+
+ See merge request faser/calypso!54
+
+commit d99d2902d0ad9351b31dac7fe829b4f2602fc84c
+Author: Dave Casper <dcasper@uci.edu>
+Date: Tue Mar 24 07:38:37 2020 +0000
+
+ Revert "Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso"
+
+ This reverts commit 4c9e84aa6660762727103731dfdac6e1161b962c
+
+commit f248e0d5d1ba882a347cf5714c3a98290e47b08a
+Merge: 2c358a2 fb8682c
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Mon Mar 23 21:56:19 2020 -0700
+
+ Merge remote-tracking branch 'upstream/master'
+
+commit fb8682ce7f1ad535587a28826a30313772d75c4b
+Merge: 5931085 dc440d6
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Mar 23 13:58:08 2020 +0000
+
+ Merge branch 'master-simupdate' into 'master'
+
+ Fix issues with truth information and reorganize some channel IDs
+
+ See merge request faser/calypso!52
+
+commit dc440d64b58e0439738a8fe518f914e428c0bba4
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Mar 23 13:58:07 2020 +0000
+
+ Fix issues with truth information and reorganize some channel IDs
+
+commit 2c358a2b48b46eb583e1644f2df1459390931a0a
+Merge: 5931085 80b4f53
+Author: Dave Casper <dcasper@uci.edu>
+Date: Fri Feb 21 16:34:49 2020 -0800
+
+ Merge branch 'master' of https://gitlab.cern.ch:8443/dcasper/calypso
+
+commit 59310857a94b5cd6901f2715cd5a40ddb6b9bd1f
+Merge: 1a8df6d f701881
+Author: Dave Casper <dcasper@uci.edu>
+Date: Fri Feb 21 22:15:17 2020 +0000
+
+ Merge branch 'master-readme-geoExample' into 'master'
+
+ Fix typo in README
+
+ See merge request faser/calypso!51
+
+commit f701881f1559ac5686a3e8eac16b47b575a54e6a
+Author: Dave Casper <dcasper@uci.edu>
+Date: Fri Feb 21 22:15:17 2020 +0000
+
+ Fix typo in README
+
+commit 80b4f53ac99a8a929e9a85593caaf4f4098d13a7
+Merge: 1a8df6d 48d7023
+Author: Dave Casper <dcasper@uci.edu>
+Date: Thu Feb 13 15:55:55 2020 -0800
+
+ Merge branch 'master' of https://gitlab.cern.ch:8443/dcasper/calypso
+
+commit 1a8df6d03f3c1ca98ab2b6276ea5fb588f4af5bb
+Merge: 464c270 6501e87
+Author: Dave Casper <dcasper@uci.edu>
+Date: Thu Feb 13 23:50:17 2020 +0000
+
+ Merge branch 'master-digi-readme' into 'master'
+
+ Fix typo in README for digitization
+
+ See merge request faser/calypso!48
+
+commit 6501e876db3fd46bfc1818d1dc62fd523d63ceee
+Author: Dave Casper <dcasper@uci.edu>
+Date: Thu Feb 13 23:50:17 2020 +0000
+
+ Fix typo in README for digitization
+
+commit 48d70237ca51e88f5eff9bb99bbc0137e1e3ea6b
+Merge: 6cf7c97 464c270
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Wed Feb 12 14:26:30 2020 -0800
+
+ Merge remote-tracking branch 'upstream/master'
+
+commit 464c270cf3cec788902905eb361d02c72a068470
+Merge: e3e3ee6 8aa4211
+Author: Dave Casper <dcasper@uci.edu>
+Date: Wed Feb 12 22:25:58 2020 +0000
+
+ Merge branch 'master-bfield-condfix' into 'master'
+
+ Remove references to DCS field conditions
+
+ See merge request faser/calypso!47
+
+commit 8aa4211149beca7c22888b422330e295961dc19a
+Author: Dave Casper <dcasper@uci.edu>
+Date: Wed Feb 12 22:25:58 2020 +0000
+
+ Remove references to DCS field conditions
+
+commit 6cf7c97f0f544ea6e646777e55314f9928234983
+Merge: 5378862 e3e3ee6
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Wed Feb 12 10:25:18 2020 -0800
+
+ Merge remote-tracking branch 'upstream/master'
+
+commit e3e3ee65e608b442c91bf643a0d90eef318e60fc
+Merge: 0f79a1f 71590da
+Author: Dave Casper <dcasper@uci.edu>
+Date: Wed Feb 12 11:16:39 2020 +0000
+
+ Merge branch 'master-tracker-iddict' into 'master'
+
+ Correct inaccurate comment
+
+ See merge request faser/calypso!46
+
+commit 71590da0a949025361adb1edf74d4f7f1b77f86c
+Author: Dave Casper <dcasper@uci.edu>
+Date: Wed Feb 12 11:16:39 2020 +0000
+
+ Correct inaccurate comment
+
+commit 537886235107ced87b480ee9ae5db2998d173d35
+Merge: d02f7aa 0f79a1f
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Mon Feb 10 15:49:41 2020 -0800
+
+ Merge remote-tracking branch 'upstream/master'
+
+commit 0f79a1fb8f2b79f5cc9c12d1d9050441ef99909d
+Merge: 4795d24 c0567b5
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Feb 10 23:48:51 2020 +0000
+
+ Merge branch 'master-scint' into 'master'
+
+ Add trigger and preshower scintillators to geometry
+
+ See merge request faser/calypso!45
+
+commit c0567b591cd7cc531fdc6beeee49b978178628e8
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Feb 10 23:48:50 2020 +0000
+
+ Add trigger and preshower scintillators to geometry
+
+commit d02f7aa95460a22ec45224884b907fdd78a97226
+Merge: 56451d9 4795d24
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Wed Feb 5 12:29:42 2020 -0800
+
+ Merge remote-tracking branch 'upstream/master'
+
+commit 4795d24e9a8cfa6e3ef8a896874914c472744167
+Merge: 101c2c7 94d91bc
+Author: Dave Casper <dcasper@uci.edu>
+Date: Wed Feb 5 20:23:30 2020 +0000
+
+ Merge branch 'master' into 'master'
+
+ Replaced FaserGeoEditor files with latest working version
+
+ See merge request faser/calypso!44
+
+commit 94d91bcfec7b20abecee2ec64d6e0d3bb82ea6e7
+Author: Ryan Alexander Rice-Smith <rricesmi@uci.edu>
+Date: Wed Feb 5 19:56:09 2020 +0000
+
+ Replace FaserGeoEditorApp.h
+
+commit 972cb3f98dab0505d2a8352e08d34b6e26f3b9e7
+Author: Ryan Alexander Rice-Smith <rricesmi@uci.edu>
+Date: Wed Feb 5 19:55:52 2020 +0000
+
+ Replace FaserGeoEditorApp.cxx
+
+commit c3e29e282cc4c8512d4b1f5765af733e458dbb21
+Author: Ryan Alexander Rice-Smith <rricesmi@uci.edu>
+Date: Wed Feb 5 19:55:12 2020 +0000
+
+ Replace FaserDbMainWindow.cxx
+
+commit 227247e6ef218e57127db9f08079e8c7ac2fe7d2
+Author: Ryan Alexander Rice-Smith <rricesmi@uci.edu>
+Date: Wed Feb 5 06:02:41 2020 +0000
+
+ Replace main.cxx
+
+commit 33e857bfae873e7ac03f33ae5ddeebd56e3ee96f
+Author: Ryan Alexander Rice-Smith <rricesmi@uci.edu>
+Date: Wed Feb 5 06:02:28 2020 +0000
+
+ Replace FaserGeoEditorApp.h
+
+commit f545de6d42c4837ecc5b529453ab46569ad960b2
+Author: Ryan Alexander Rice-Smith <rricesmi@uci.edu>
+Date: Wed Feb 5 06:02:13 2020 +0000
+
+ Replace FaserGeoEditorApp.cxx
+
+commit cd8ae7c5e3e51b4101fc8db03a9d05af55e2359b
+Author: Ryan Alexander Rice-Smith <rricesmi@uci.edu>
+Date: Wed Feb 5 06:01:54 2020 +0000
+
+ Replace FaserDbMainWindow.h
+
+commit 1fb5b30e665f520b46df49caceb28d3c9422a8ff
+Author: Ryan Alexander Rice-Smith <rricesmi@uci.edu>
+Date: Wed Feb 5 06:01:34 2020 +0000
+
+ Replace FaserDbMainWindow.cxx
+
+commit a7d1df3f31595980ac9a83fce6430355fca544f2
+Author: Ryan Alexander Rice-Smith <rricesmi@uci.edu>
+Date: Wed Feb 5 05:59:41 2020 +0000
+
+ Updated Readme to better describe functionality and features of program
+
+commit 56451d9a9a113935aef5b61b324624ac45974e3f
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Sun Jan 26 03:42:54 2020 -0800
+
+ Fix conflicts
+
+commit 47218e98a1ca7eebe3c6b1ace7a4451b3e6807d8
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Sun Jan 26 03:40:25 2020 -0800
+
+ Fix conflicts
+
+commit 3a07fd31a417c5ce7b99f768edae199d77fa06ee
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Sun Jan 26 03:39:40 2020 -0800
+
+ Fix conflicts
+
+commit 34f0f3db78bdc758cc980c3b7bbc903b4121acca
+Merge: 85b4177 4d4a87f
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Sun Jan 26 03:38:09 2020 -0800
+
+ Fix conflicts
+
+commit 85b41776e7f295736a43eb1f60e50e05573857bf
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Sun Jan 26 03:36:40 2020 -0800
+
+ Fix conflicts
+
+commit 4d4a87f71d1ebf1609abb8731d73fafa8f65e709
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Sun Jan 26 03:08:20 2020 -0800
+
+ Revert "Merge branch 'revert-4c9e84aa' into 'master'"
+
+ This reverts commit 09506d347fd3493b05f1529e888a4805943e61ad, reversing
+ changes made to 4c9e84aa6660762727103731dfdac6e1161b962c.
+
+commit 09506d347fd3493b05f1529e888a4805943e61ad
+Merge: 4c9e84a 07b63b2
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sun Jan 26 10:13:24 2020 +0000
+
+ Merge branch 'revert-4c9e84aa' into 'master'
+
+ Revert "Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso"
+
+ See merge request dcasper/calypso!1
+
+commit 07b63b2fe0e7b7adb63ab515acf6f52ba6c5be63
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sun Jan 26 10:12:35 2020 +0000
+
+ Revert "Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso"
+
+ This reverts commit 4c9e84aa6660762727103731dfdac6e1161b962c
+
+commit 4c9e84aa6660762727103731dfdac6e1161b962c
+Merge: 8ea43dc 101c2c7
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Sun Jan 26 01:43:56 2020 -0800
+
+ Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso
+
+commit 101c2c7308dc4189ca54fa71c97222e7670a54a7
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sun Jan 26 06:34:14 2020 +0000
+
+ Update README.md
+
+commit 01aed4d7c1027de48ff8332d0a9679e221b91455
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sun Jan 26 06:32:36 2020 +0000
+
+ Update README.md
+
+commit 4f010fb225d29f8e10b83ab49ea44e595a78221b
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sun Jan 26 06:27:51 2020 +0000
+
+ Update README.md
+
+commit bc2f82e3e63112836ae536690d039ddf116088e8
+Merge: 7eaf54a bc50d40
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sun Jan 26 00:56:43 2020 +0000
+
+ Merge branch 'master' into 'master'
+
+ Realistic alignment database for Tracker
+
+ See merge request faser/calypso!42
+
+commit bc50d408fec589454e0f4e8a692980c592012931
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sun Jan 26 00:56:41 2020 +0000
+
+ Realistic alignment database for Tracker
+
+commit 8ea43dc0f90348d1694b325127959dfb0b033e82
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Sat Jan 25 16:29:19 2020 -0800
+
+ Document and clean-up
+
+commit 5d6b82473338b92255b4cc7fdf2b396d295f08e7
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Sat Jan 25 13:15:18 2020 -0800
+
+ Commission realistic FASER alignment DB
+
+commit 80d14ecb6a32ac9761d6af392f0314f18eafaa50
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Sat Jan 25 02:30:19 2020 -0800
+
+ Generate neutral alignment files
+
+commit 7eaf54a70ce163fb09aff4c2125ccc39fd0f5df6
+Merge: 7eb931f 3696a78
+Author: Dave Casper <dcasper@uci.edu>
+Date: Fri Jan 24 09:47:44 2020 +0000
+
+ Merge branch 'master-sct-digi' into 'master'
+
+ Visualization of RDOs
+
+ See merge request faser/calypso!41
+
+commit 3696a780e1cb6f61329914b69f54d15f1d61933c
+Author: Dave Casper <dcasper@uci.edu>
+Date: Fri Jan 24 09:47:44 2020 +0000
+
+ Visualization of RDOs
+
+commit 7eb931fcbad7196888820f74bf9dd1011a49b3ec
+Merge: b2f7c07 e640b8a
+Author: Dave Casper <dcasper@uci.edu>
+Date: Thu Jan 23 20:49:13 2020 +0000
+
+ Merge branch 'master-sct-digi' into 'master'
+
+ First running version of digitization
+
+ See merge request faser/calypso!40
+
+commit e640b8a1a417630e1972bd8a58d619fe88b02aac
+Author: Dave Casper <dcasper@uci.edu>
+Date: Thu Jan 23 20:49:11 2020 +0000
+
+ First running version of digitization
+
+commit b2f7c075fad209514e2ea27779582495dc525194
+Merge: a6bd35c 1f83fd7
+Author: Dave Casper <dcasper@uci.edu>
+Date: Thu Jan 16 17:03:57 2020 +0000
+
+ Merge branch 'master-sct-digi' into 'master'
+
+ Work in progress on SCT digitization
+
+ See merge request faser/calypso!39
+
+commit 1f83fd7290d90e504a727080f87f39230bb91ed1
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Thu Jan 16 02:10:10 2020 -0800
+
+ Start making configuration work
+
+commit 97a4066e30248ae3be854a34ac7ba207c319a923
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Thu Jan 16 00:26:23 2020 -0800
+
+ Tack on configuration scripts (untested)
+
+commit 622e95bd747dba67b5f453748fb66468d72aa730
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Wed Jan 15 23:59:15 2020 -0800
+
+ First version of SCT_Digitization
+
+commit 2b33e2825eb4555e3c27d4ebed50ca746e476d49
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Wed Jan 15 22:11:34 2020 -0800
+
+ Begin FASERization of SCT_Digitization
+
+commit 40ee3a8cdc189c1ceb8f41561264fb818ff3b695
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Wed Jan 15 20:36:52 2020 -0800
+
+ FASER-ize SiDigitization
+
+commit e20300197c46b8bec243e9f9acf581fb1b3bd398
+Merge: 5b2ec6a a6bd35c
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Wed Jan 15 19:29:04 2020 -0800
+
+ Merge remote-tracking branch 'upstream/master'
+
+commit a6bd35c2f40be3535eecf736cd95024b8f2ab30c
+Merge: b020803 127d3a3
+Author: Dave Casper <dcasper@uci.edu>
+Date: Thu Jan 16 03:24:16 2020 +0000
+
+ Merge branch 'master-calypso-example' into 'master'
+
+ Add/reorganize Calypso examples
+
+ See merge request faser/calypso!38
+
+commit 127d3a34d29ed4885939ea40c52d19bfbd3a1dc9
+Author: Dave Casper <dcasper@uci.edu>
+Date: Thu Jan 16 03:24:16 2020 +0000
+
+ Add/reorganize Calypso examples
+
+commit b0208036bb652c62c21f18b4f20104a2cc522e01
+Merge: 980a4fd 6cd5277
+Author: Dave Casper <dcasper@uci.edu>
+Date: Thu Jan 16 00:43:42 2020 +0000
+
+ Merge branch 'master' into 'master'
+
+ Conform to ATLAS renaming GeoModel to GeoModelCore
+
+ See merge request faser/calypso!37
+
+commit 6cd52771162c30884faec25de9ebbfe309361d98
+Author: Dave Casper <dcasper@uci.edu>
+Date: Thu Jan 16 00:43:40 2020 +0000
+
+ Conform to ATLAS renaming GeoModel to GeoModelCore
+
+commit 5b2ec6a8ffce8791f2dd75b61bbb1a51163715fe
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Wed Jan 15 15:09:07 2020 -0800
+
+ Conform to ATLAS renaming GeoModel to GeoModelCore
+
+commit 980a4fd7950db02f2d57041e4299b44339a4f52c
+Merge: 9f4ac68 5a7fdc0
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Nov 18 17:43:31 2019 +0000
+
+ Merge branch 'master' into 'master'
+
+ Conform with ATLAS changes
+
+ See merge request faser/calypso!36
+
+commit 5a7fdc02720672587ba716f30b992cd04be7f304
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Nov 18 09:25:05 2019 -0800
+
+ Conform with ATLAS changes
+
+commit 9f4ac684f51d9748749016c93c4635e590b4e0b2
+Merge: fe8aeda 0d8d048
+Author: Dave Casper <dcasper@uci.edu>
+Date: Fri Sep 20 05:54:29 2019 +0000
+
+ Merge branch 'master-field-service' into 'master'
+
+ Commission field map and field service; add field service to simulation and GeoModelTest
+
+ See merge request faser/calypso!35
+
+commit 0d8d048df639d4b6d02f0b6fc1949c4b7d19fbb0
+Author: Dave Casper <dcasper@uci.edu>
+Date: Fri Sep 20 05:54:25 2019 +0000
+
+ Commission field map and field service; add field service to simulation and GeoModelTest
+
+commit fe8aedac26cedf3180a614a5544cf2ecc77b801b
+Merge: 852f26f 152a6f4
+Author: Dave Casper <dcasper@uci.edu>
+Date: Tue Sep 17 10:24:56 2019 +0000
+
+ Merge branch 'master-geo-field' into 'master'
+
+ Add dipoles to geometry, simulation and display
+
+ See merge request faser/calypso!34
+
+commit 152a6f45c19952b86fe01137e7c0b527d29f5828
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Tue Sep 17 02:57:46 2019 -0700
+
+ Correct test failures
+
+commit 19aa262041e4a1c7e75cc305920b0572999da01a
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Tue Sep 17 02:20:10 2019 -0700
+
+ Add dipole volumes (not yet magnetic...)
+
+commit 852f26ffe2bc946cc942fc8b46c0aad479c0b700
+Merge: 2d5f50a ca164fe
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sun Sep 15 19:36:55 2019 +0000
+
+ Merge branch 'master-tracker-plane' into 'master'
+
+ Simulation, persistence and display of SCT hits
+
+ See merge request faser/calypso!33
+
+commit ca164fee0b673f02cf0e7e5eccf36464b468f703
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Sun Sep 15 11:57:47 2019 -0700
+
+ Fix typo in test
+
+commit 0d0a479857d2a818e12254bc8af79dc76bf7e5fa
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Sun Sep 15 11:24:53 2019 -0700
+
+ Simulation, persistence and display of Tracker hits
+
+commit 738b77045affc38ae43cf896e8fe86b885ac9cfa
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Sun Sep 15 01:12:51 2019 -0700
+
+ Hit classes/converters for Faser SCT hits (untested)
+
+commit e7c28a8bbef8b5b0d66d45e8a81aa0e81a00867a
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Sat Sep 14 23:34:19 2019 -0700
+
+ SCT in simulation (without sensitive detector yet)
+
+commit 9933633d52817a14dee65d20ae02358f6db93682
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Sat Sep 14 22:28:00 2019 -0700
+
+ Correct sign error in rotation
+
+commit 931d802fadc8f0a07b36b4a1738620ec1bf26fbc
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Sat Sep 14 20:33:25 2019 -0700
+
+ Attempt to implement something like the real plane geometry
+
+commit 2d5f50a16c8d3f49893001aaa1934576212fcd8f
+Merge: b9df78d acd9b8a
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat Sep 14 12:34:40 2019 +0000
+
+ Merge branch 'master-tracker-hits' into 'master'
+
+ Add SCT geometry to test/example algorithm
+
+ See merge request faser/calypso!32
+
+commit acd9b8ad2e814cffdc09091fcc39a048ccc1fcd2
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat Sep 14 12:34:39 2019 +0000
+
+ Revert "Check that the CI test fails when it should"
+
+ This reverts commit 2d94dbebb3d92c1f3c65855f9bab70744a706fad.
+
+commit b9df78dab1ab7aaf24251deb8b67354f8ff8a7a0
+Merge: 91930bc dee043a
+Author: Dave Casper <dcasper@uci.edu>
+Date: Fri Sep 13 22:19:04 2019 +0000
+
+ Merge branch 'master-tracker-hits' into 'master'
+
+ Clean-up tests, make them handle Calypso runtime errors and work properly with database
+
+ See merge request faser/calypso!30
+
+commit dee043abc8cd954deec5f1af3cb24e88f0ccee06
+Author: Dave Casper <dcasper@uci.edu>
+Date: Fri Sep 13 22:19:03 2019 +0000
+
+ Revert "Check that the CI test fails when it should"
+
+ This reverts commit 2d94dbebb3d92c1f3c65855f9bab70744a706fad.
+
+commit 91930bc9a243d929c947d01d110899a3cdfcdca6
+Merge: e37d641 d29527d
+Author: Dave Casper <dcasper@uci.edu>
+Date: Tue Sep 10 02:30:58 2019 +0000
+
+ Merge branch 'master-geo-tracker' into 'master'
+
+ Remove material distortion hooks
+
+ See merge request faser/calypso!29
+
+commit d29527d089b2885014d5870f439ff3247361d674
+Author: Dave Casper <dcasper@uci.edu>
+Date: Tue Sep 10 02:30:58 2019 +0000
+
+ Remove material distortion hooks
+
+commit e37d6416bb2038328590639bab1619482ffd3902
+Merge: f0eeeab 4404e44
+Author: Dave Casper <dcasper@uci.edu>
+Date: Tue Sep 10 01:59:29 2019 +0000
+
+ Merge branch 'master-geo-tracker' into 'master'
+
+ Construction and display (but not yet simulation) of SCT
+
+ See merge request faser/calypso!28
+
+commit 4404e4472d71ff5fcd1656a7d1cd72679acbf504
+Author: Dave Casper <dcasper@uci.edu>
+Date: Tue Sep 10 01:59:27 2019 +0000
+
+ Construction and display (but not yet simulation) of SCT
+
+commit f0eeeab5ad29847f0624cc28a68625bae8d23a3b
+Merge: 12e3891 ceec66c
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sun Sep 8 03:23:52 2019 +0000
+
+ Merge branch 'master-vti12' into 'master'
+
+ Detector description, simulation and display for veto detector
+
+ See merge request faser/calypso!27
+
+commit ceec66cd6e82aa8c6a977d9173a1ab6c55fb25e0
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sun Sep 8 03:23:50 2019 +0000
+
+ Detector description, simulation and display for veto detector
+
+commit 12e3891cd6ddec99174ef5dde7d72702a54060a0
+Merge: d84cf42 0fcf9e8
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Sep 2 06:22:11 2019 +0000
+
+ Merge branch 'dbEditor-dev' into 'master'
+
+ Development of DB editor (Ryan Rice-Smith)
+
+ See merge request faser/calypso!26
+
+commit 0fcf9e8f61cf607fdad76a6fb764b347d62c88f6
+Merge: 9379ad2 d84cf42
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Sep 2 06:11:48 2019 +0000
+
+ Merge branch 'master' into 'dbEditor-dev'
+
+ # Conflicts:
+ # .gitlab-ci.yml
+
+commit 9379ad2ab3dfeea858a740c1df029add67c5eeac
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Sun Sep 1 23:07:18 2019 -0700
+
+ Attempt to add missing GL headers to CI
+
+commit d84cf42180be3cfefa73217d6969cf47e2821f33
+Merge: 60373b7 a8bf938
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Sep 2 06:01:08 2019 +0000
+
+ Merge branch 'ci-libmesa' into 'master'
+
+ Add openGL to CI image
+
+ See merge request faser/calypso!25
+
+commit a8bf93851a14cb0c2f0d46cfb4b0e4161e31a6ab
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Sun Sep 1 22:30:39 2019 -0700
+
+ Add openGL to CI image
+
+commit d699e9dae4f9111366e5479ad65b389aacdc68c2
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Sun Sep 1 21:02:15 2019 -0700
+
+ Development of GeoEditor (Ryan Rice-Smith)
+
+commit 60373b7712fa171c5c3d101fd3269fa1b7a3dd47
+Merge: ba4b1ba a3d7d0a
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Sep 2 03:24:27 2019 +0000
+
+ Merge branch 'master-veto-neighbors' into 'master'
+
+ Implement neighbors for VetoID and add test of them
+
+ See merge request faser/calypso!23
+
+commit a3d7d0a21261916a2876a3e887ae1d7691aa3ccb
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Sun Sep 1 20:15:08 2019 -0700
+
+ Implement neighbors for VetoID and add test of them
+
+commit ba4b1ba1776c32cd385df9473dd736517d15a27f
+Merge: aae9ad1 1f0165f
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sun Sep 1 21:45:48 2019 +0000
+
+ Merge branch 'master-plate-factory' into 'master'
+
+ Creation and placement of scintillator planes in Veto
+
+ See merge request faser/calypso!22
+
+commit 1f0165f7e9e203f70f601be82b7b0773e4d43e67
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sun Sep 1 21:45:47 2019 +0000
+
+ Creation and placement of scintillator planes in Veto
+
+commit aae9ad1a4a73dcb1ee786a86668265845fea367d
+Merge: 56c56f5 990aebf
+Author: Dave Casper <dcasper@uci.edu>
+Date: Fri Aug 30 12:02:35 2019 +0000
+
+ Merge branch 'master-veto-factory' into 'master'
+
+ GeoModel with two veto station volumes
+
+ See merge request faser/calypso!21
+
+commit 990aebf7cbfa7939aaecb3836762749a38075036
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Fri Aug 30 04:53:47 2019 -0700
+
+ Two veto station volumes, with geometry dump for display
+
+commit aea2df6d86912b7ae610a591ed6064f1d36944aa
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Fri Aug 30 03:42:38 2019 -0700
+
+ Add a second station
+
+commit 656ddafd118e5d11e3b5405bbe5746239ed5b477
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Fri Aug 30 03:18:53 2019 -0700
+
+ Add constants to database
+
+commit e9b3d76c380711743da7b1eb4f4858b76d9422b2
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Fri Aug 30 00:53:19 2019 -0700
+
+ Fix DB key problems; db is still missing data
+
+commit 21ba75d21c31921c7648f627cb97d2c764435717
+Author: Dave Casper <dcasper@localhost.localdomain>
+Date: Thu Aug 29 23:12:19 2019 -0700
+
+ Work in progress: veto detector with geometry
+
+commit 56c56f586166aa87b24db242c3d9db3dd1487867
+Merge: b8d3939 4188787
+Author: Eric Torrence <eric.torrence@cern.ch>
+Date: Tue Aug 27 02:22:07 2019 +0000
+
+ Merge branch 'master' into 'master'
+
+ Fix problem with space points
+
+ See merge request faser/calypso!20
+
+commit 4188787ccca378c30a988eb48fd8894cd9a613a8
+Author: Eric Torrence <eric.torrence@cern.ch>
+Date: Mon Aug 26 18:02:05 2019 -0700
+
+ Fix problem with space points
+
+commit cb5b7130369fbe53295756d96efa4bd848443558
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Aug 26 15:46:28 2019 -0700
+
+ Work in progress on VetoFactory
+
+commit b8d393904bb44c65c8094cba798719eaf1254402
+Merge: 781b502 3f4be6f
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Aug 26 18:46:04 2019 +0000
+
+ Merge branch 'master-vtxVirtualDestructor' into 'master'
+
+ Add virtual destructor to FaserTruthVertex
+
+ See merge request faser/calypso!19
+
+commit 3f4be6f8cfa841296c9fcb9b86909b2c314e93cf
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Aug 26 18:46:03 2019 +0000
+
+ Add virtual destructor to FaserTruthVertex
+
+commit 781b50264c70332351236e39ea91dac17b522e2c
+Merge: 38938b0 9d2699a
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Aug 26 18:04:21 2019 +0000
+
+ Merge branch 'master' into 'master'
+
+ Fix initializations left out of initial commit
+
+ See merge request faser/calypso!18
+
+commit 9d2699addec9e0d6cb125d28ca420721ed781ea0
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Aug 26 10:46:58 2019 -0700
+
+ Fix omitted initializations
+
+commit 81b11f75cd85df7fcfb4398d53f9b9c2a63f308a
+Merge: 77db759 38938b0
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Aug 26 10:25:27 2019 -0700
+
+ Merge remote-tracking branch 'upstream/master'
+
+commit 38938b0a97df7c25738b734a1345dca6c52486b9
+Merge: 6ec929c 49a48b4
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Aug 26 17:18:38 2019 +0000
+
+ Merge branch 'FaserDetectorIdRewrite' into 'master'
+
+ Prototype readout geometry for Veto
+
+ See merge request faser/calypso!17
+
+commit 49a48b4941f982dcfd99f80a3d5bc357c067d859
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Aug 26 17:18:37 2019 +0000
+
+ Prototype readout geometry for Veto
+
+commit 6ec929c548e3027f7c486ed8227423838c2c33d3
+Merge: 9ce3a7d acea670
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Wed Aug 21 10:02:24 2019 +0000
+
+ Merge branch 'master' into 'master'
+
+ also adding root files
+
+ See merge request faser/calypso!16
+
+commit 9ce3a7d6c231e9b3acc618816d40e077e2bdc4c4
+Merge: d37e25e f11c97a
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Wed Aug 21 10:00:50 2019 +0000
+
+ Merge branch 'master' into 'master'
+
+ adding magnetic field data
+
+ See merge request faser/calypso!15
+
+commit acea67085103d36a0ee9966ea394dedfdb77dad8
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Wed Aug 21 12:00:46 2019 +0200
+
+ also adding root files
+
+commit f11c97a5c6764ac748743e7d34eea76c9d13caa7
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Wed Aug 21 11:40:26 2019 +0200
+
+ adding magnetic field data
+
+commit d37e25edc404f88ce9b3725a7ea78a8427f03e81
+Merge: 1d6ebde 5234dae
+Author: Eric Torrence <eric.torrence@cern.ch>
+Date: Mon Aug 19 19:11:21 2019 +0000
+
+ Merge branch 'master' into 'master'
+
+ Legacy ntuple code
+
+ See merge request faser/calypso!14
+
+commit 5234dae224712609865e98936907c85ae03b75d3
+Author: Eric Torrence <eric.torrence@cern.ch>
+Date: Fri Aug 16 15:20:40 2019 -0700
+
+ Remove SpacePoint class causing trouble
+
+commit 7d6d5afc2f71d4ba670d91d958fe51f3ca0b158d
+Author: Eric Torrence <eric.torrence@cern.ch>
+Date: Fri Aug 16 15:00:49 2019 -0700
+
+ First commit of objects to read TDR ntuples
+
+commit 1d6ebde573a660cb28556d2b149c18de86d19864
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Mon Jul 29 06:33:51 2019 +0000
+
+ Update JO_standalone.py for correct package name
+
+commit 77db759035c142d829a6ef305521926063560306
+Author: Dave Casper <dcasper@uci.edu>
+Date: Thu Jul 25 14:15:00 2019 -0700
+
+ Prototyping of tcl/tk geometry db editor
+
+commit e75884f28d62b1f702cd4f7a1ec07d9a1ee019a1
+Merge: bab349a 6e60c67
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Thu Jul 25 13:53:50 2019 +0000
+
+ Merge branch 'master' into 'master'
+
+ Update to work around cleanup of Control/SGTools
+
+ See merge request faser/calypso!13
+
+commit 6e60c67484c6532e09d76cb83852c9470e1ef9f2
+Author: Dave Casper <dcasper@uci.edu>
+Date: Tue Jul 23 15:01:21 2019 -0700
+
+ Update to work around cleanup of Control/SGTools
+
+commit bab349afd7b3765aa57c9aa882ff99174b50f663
+Merge: a69cfe1 d2643fa
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Thu May 23 13:44:43 2019 +0000
+
+ Merge branch 'master-Import' into 'master'
+
+ adding TP converters for StripClusters. adding tool to import stripcluster information from simple ntuples. changing identifiers of some collections.
+
+ See merge request faser/calypso!12
+
+commit d2643facbcb12c8a369524d483eb511bfdcf289a
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Thu May 23 13:44:43 2019 +0000
+
+ adding TP converters for StripClusters. adding tool to import stripcluster information from simple ntuples. changing identifiers of some collections.
+
+commit a69cfe11d00f70d8e0c8d2ad0e5f1b66de01b229
+Merge: a535ddb aad06ab
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Fri May 3 11:19:42 2019 +0000
+
+ Merge branch 'master-CI' into 'master'
+
+ Adding CI
+
+ See merge request faser/calypso!9
+
+commit aad06abff10c7286409e53d5e93669661a13e344
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Fri May 3 11:19:42 2019 +0000
+
+ Adding CI
+
+commit a535ddb5c99830cba466f2cf6515d7bc51c3a5b9
+Merge: a034a41 0861d49
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Fri May 3 11:19:08 2019 +0000
+
+ Merge branch 'revert-5b4d74b1' into 'master'
+
+ Revert "Revert "trying to add first CI and docker image building""
+
+ See merge request faser/calypso!10
+
+commit 0861d497caf0b8885e4cb4b39c07391d396db39d
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Fri May 3 11:18:35 2019 +0000
+
+ Revert "Revert "trying to add first CI and docker image building""
+
+ This reverts commit 5b4d74b16cae284c2bac9600c3cf94e7c14922a8
+
+commit a034a41202bafd99e431a3e2e027feb4144d6492
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Mon Apr 29 15:06:58 2019 +0000
+
+ some fixes to the README.
+
+commit cb0a8016daa66f4268fa3bfde5679a906174a9d5
+Merge: 0531efc 5b4d74b
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Mon Apr 29 14:53:10 2019 +0000
+
+ Merge branch 'master-EDM' into 'master'
+
+ Migrating EDM to atlas/athena master and to build directly against it.
+
+ See merge request faser/calypso!8
+
+commit 5b4d74b16cae284c2bac9600c3cf94e7c14922a8
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Fri Apr 26 14:12:15 2019 +0000
+
+ Revert "trying to add first CI and docker image building"
+
+ This reverts commit 4f87fd0b196264ef061a0e372d36e14af816869d
+
+commit 4f87fd0b196264ef061a0e372d36e14af816869d
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Fri Apr 26 15:47:50 2019 +0200
+
+ trying to add first CI and docker image building
+
+commit c0e7c718fe73857b4544a97204592ff99b080798
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Fri Apr 26 13:46:46 2019 +0200
+
+ also adapting Truth EDM to build with atlas/master. also fixing incompatibility in FaserDetDescr
+
+commit 7d8598b329d1af67f9a04c99f8f5a7f35440fd40
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Fri Apr 26 10:40:29 2019 +0200
+
+ migrating xAODTracking to xAODFaserTracking
+
+commit e27cdec4123d38dbd8d8ff4cf2fdc4e293d70a59
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Wed Apr 10 15:24:19 2019 +0200
+
+ fixing merge errors
+
+commit 167581cb3ec6e752fed87d43164057ec58eb450e
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Wed Apr 10 15:09:40 2019 +0200
+
+ removing duplicate truth files
+
+commit 03d551c770e199f4acfb6d655d121a82f34d7846
+Merge: f86fe1d fbfa9a4
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Wed Apr 10 15:05:39 2019 +0200
+
+ merger of truth and other stuff?
+
+commit f86fe1de31e6aef4ade81c7247cf85a5d470a642
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Wed Apr 10 14:57:03 2019 +0200
+
+ adding truth
+
+commit fbfa9a4181233045f89cb94c800d3ea1cb76088a
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Mon Apr 8 17:04:53 2019 +0200
+
+ starting to add xAOD truth
+
+commit 22185c7be9ac2a2a960389e89041a059d21bdc5f
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Mon Apr 8 16:29:21 2019 +0200
+
+ all stuff for xAOD::Track
+
+commit 486a6ff70162b05aa59c49a1f682c1d9575faaa8
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Mon Apr 8 10:15:24 2019 +0200
+
+ track EDM
+
+commit 0531efceba235b70c95c1c3196a4b4c66fc9e9d5
+Merge: d77b252 9d0a4ba
+Author: Dave Casper <dcasper@uci.edu>
+Date: Tue Apr 2 00:14:25 2019 -0700
+
+ Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso into master-VetoIdDev
+
+commit 9d0a4ba0f3b3233b5be064d0c747e6f5869a19f6
+Merge: 84e49ff f882e50
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Fri Mar 29 08:55:37 2019 +0000
+
+ Merge branch 'master' into 'master'
+
+ also moving StripRawData stuff to root
+
+ See merge request faser/calypso!6
+
+commit f882e5051bc9abeafbb46d0737a6ff66425ebbf6
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Fri Mar 29 09:54:46 2019 +0100
+
+ also moving StripRawData stuff to root
+
+commit 84e49ff9b80f685e98452c13c6a8c3fa041a0d5d
+Merge: dcb1f1c 98a1398
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Fri Mar 29 08:52:08 2019 +0000
+
+ Merge branch 'master' into 'master'
+
+ Moving all developments to same root
+
+ See merge request faser/calypso!5
+
+commit 98a13982fbfd2c084c805c0fa5e011ec0741c5a2
+Merge: 46a6753 22e4a4d
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Fri Mar 29 09:49:26 2019 +0100
+
+ Merge branch 'master' of https://gitlab.cern.ch:8443/rjansky/calypso
+
+commit 46a67531e1ee2da2eb772f8033f8ff0b1f2a0a65
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Fri Mar 29 09:47:36 2019 +0100
+
+ moving EDM developments to root
+
+commit dcb1f1cb4d53ab0bf6e6bcadc09608b819c73023
+Merge: a745ed0 22e4a4d
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Fri Mar 29 08:41:40 2019 +0000
+
+ Merge branch 'master' into 'master'
+
+ first commit of a working calypso to start EDM
+
+ See merge request faser/calypso!4
+
+commit 22e4a4de01b42de225b1077455cf89bf9f06eba3
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Thu Mar 28 11:21:15 2019 +0100
+
+ adding in unittest reference fr StripRawData
+
+commit ada5b3923c7a7452b5de17d7cc7676fb285b6120
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Thu Mar 28 11:18:18 2019 +0100
+
+ adding StripRawData to the EDM
+
+commit d5a457e15e9d747713c903ae3570d0f3d60a0794
+Author: Roland Jansky <roland.jansky@cern.ch>
+Date: Mon Mar 25 15:38:27 2019 +0100
+
+ fixing unittest reference
+
+commit cee4b2d70bfeffbf41f2953d482d20ab885e4474
+Author: root <root@firestarter2.cern.ch>
+Date: Mon Mar 25 14:53:54 2019 +0100
+
+ renaming from athena->calypso
+
+commit 71e8ed81abb5196f99da9dcdcdab0d4fcb33d6b5
+Author: root <root@firestarter2.cern.ch>
+Date: Mon Mar 25 14:43:15 2019 +0100
+
+ first commit of calypso
+
+commit a745ed07b50f848d1f7b6c589c8dd1713883c6cf
+Merge: 4503200 d77ba7d
+Author: Andrea Coccaro <andrea.coccaro@cern.ch>
+Date: Wed Mar 20 20:26:50 2019 +0000
+
+ Merge branch 'master' into 'master'
+
+ first implementation of StripCluster EDM class
+
+ See merge request faser/calypso!3
+
+commit d77ba7d4d2897152bb2a93f8f63fc34c3bcc23af
+Author: AndreaCoccaro <andrea.coccaro@cern.ch>
+Date: Fri Mar 15 11:43:11 2019 +0100
+
+ first implementation of StripCluster EDM class
+
+commit d77b252f091fdcf933625d14cf6624fa7238697f
+Author: Dave Casper <dcasper@uci.edu>
+Date: Tue Feb 19 02:41:19 2019 -0800
+
+ Add realistic Id dictionaries for scint and tracker
+
+commit 4503200ba3dc1fc611da346607e7520d5ea59c39
+Merge: 3d77aef 482d447
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Feb 18 21:08:49 2019 +0000
+
+ Merge branch 'master-VetoGeoToolDev' into 'master'
+
+ Commission parsing of ID dictionaries
+
+ See merge request faser/calypso!2
+
+commit 482d44702fa0c51a642fa4d764404534aad0a32f
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Feb 18 21:08:48 2019 +0000
+
+ Commission parsing of ID dictionaries
+
+commit 3d77aefd1b5e9968a146b5ed48c08a0d67d15f2f
+Merge: 1fbca46 5bdfe61
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sun Feb 17 00:44:09 2019 +0000
+
+ Merge branch 'silence-FaserDetectorIDHelper' into 'master'
+
+ silence warning and test merge request
+
+ See merge request faser/calypso!1
+
+commit 5bdfe61c2541a4e4080baa0a41ce2aebecdfdfe5
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat Feb 16 16:37:23 2019 -0800
+
+ silence warning and test merge request
+
+commit 1fbca4659b007bb05ac93da76815df83230173f4
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat Feb 16 11:49:43 2019 -0800
+
+ Revert to a version that compiles and runs by disabling unfinished code
+
+commit 09afc33925a53d1cd67080b91d48d134f76cb402
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat Feb 16 10:34:15 2019 -0800
+
+ Work in progress on changes to detector ID helper
+
+commit e0399a920aa62901f7c59d22c5decb1b94bf314d
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat Feb 9 23:30:16 2019 -0800
+
+ Work in progress on simplified identifier
+
+commit 9c1fb2ecf6182da99a3edea7ee4093c26625a3d2
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat Feb 9 21:20:41 2019 -0800
+
+ Clean-up and start of some restructuring to reduce number of classes
+
+commit a6182edf86f7a925b096ef830fe0a3afa1a37842
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat Feb 9 01:11:49 2019 -0800
+
+ Simplify the identifier factory
+
+commit 4d68e2466ff01d549703bf04b9312b4f0488725d
+Author: Dave Casper <dcasper@uci.edu>
+Date: Thu Feb 7 00:18:34 2019 -0800
+
+ Work in progress on detector description and identifiers
+
+commit 38b6f1bfbee0e92660366cadb674071c0bccb2e6
+Author: Dave Casper <dcasper@uci.edu>
+Date: Wed Feb 6 18:59:13 2019 -0800
+
+ Emulate ATLAS geometry initialization scripts
+
+commit f39cbb39a36ec2d2ac55a5774c3fea5ca892924b
+Author: Dave Casper <dcasper@uci.edu>
+Date: Wed Feb 6 16:28:15 2019 -0800
+
+ Reimplement AtlasDetDescr package for FASER
+
+commit 4a518388ce7e668e01d77439de3ee07b7718763f
+Author: Dave Casper <dcasper@uci.edu>
+Date: Wed Feb 6 09:29:40 2019 -0800
+
+ Add missing service initialization
+
+commit 29b1345c943cb5f8084fd0a34c9460f88375af79
+Author: Dave Casper <dcasper@uci.edu>
+Date: Tue Feb 5 21:44:31 2019 -0800
+
+ Commission reading from Geometry database
+
+commit 2b51cebb7e13fa118edc325ea6d47b4d119b8e29
+Author: Dave Casper <dcasper@uci.edu>
+Date: Tue Feb 5 16:06:03 2019 -0800
+
+ Configure database lookup
+
+commit 53d45fc9315fe661511fccd2a8be8736a03e31d5
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Feb 4 22:59:12 2019 -0800
+
+ Adapt GeoModelSvc and related components to FASER
+
+commit df31e3baf50d4e2b3afea3dd4b265c429f9faa37
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Feb 4 20:30:49 2019 -0800
+
+ Complete first pass at materials and basic veto geometry
+
+commit 683026c6c2f75e4982a5d6cc5b9874d3eceeb150
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Feb 4 15:15:27 2019 -0800
+
+ Add ATLAS standard materials; use ATLAS convention for sqlite filename
+
+commit 353872d353656ae26fe271b91952485e77a15288
+Author: Dave Casper <dcasper@uci.edu>
+Date: Mon Feb 4 02:15:48 2019 -0800
+
+ Add minimal schema for scintillator geometry
+
+commit 7285b761f79384e2ed1657b7e1ae8a96707bf2cc
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sun Feb 3 22:33:11 2019 -0800
+
+ CMake scaffolding to create geometry database from sql file; faser area is configured like an Athena Workarea for now
+
+commit 89f9bb708a80dbab1828ab5b0ddda1eeb46b0971
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat Feb 2 14:08:18 2019 -0800
+
+ Add license identical to (open) Athena
+
+commit ae2e84dbaf4cd83d4a91699480438777fcc5db66
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat Feb 2 14:04:03 2019 -0800
+
+ Add ignore file
+
+commit d3ab23d70b16b29e893d1b9c1ea5d8d9235a6668
+Author: Dave Casper <dcasper@uci.edu>
+Date: Sat Feb 2 19:50:06 2019 +0000
+
+ Initial commit
diff --git a/Control/CalypsoExample/ClusterReadExample/python/ClusterReadExampleConfig.py b/Control/CalypsoExample/ClusterReadExample/python/ClusterReadExampleConfig.py
index 3ad490882dfd029eb61f8011b21fa7eccb177e22..6fa1cd1e1adebc237e902cb0055773714224579b 100644
--- a/Control/CalypsoExample/ClusterReadExample/python/ClusterReadExampleConfig.py
+++ b/Control/CalypsoExample/ClusterReadExample/python/ClusterReadExampleConfig.py
@@ -32,8 +32,8 @@ if __name__ == "__main__":
ConfigFlags.Input.isMC = True # Needed to bypass autoconfig
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-XXXX-XXX-XX" # Needed to bypass autoconfig, only the "OFLCOND" matters at the moment
ConfigFlags.GeoModel.FaserVersion = "FASER-01" # Default FASER geometry
- ConfigFlags.Detector.SimulateFaserSCT = True
- ConfigFlags.Input.Files = ["my.HITS.pool.root"]
+ #ConfigFlags.Detector.SimulateFaserSCT = True
+ ConfigFlags.Input.Files = ["my.COSMICHITS.pool.root"]
ConfigFlags.lock()
# Configure components