Merge branch 'revert-4c9e84aa' into 'master'

Revert "Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso"

See merge request dcasper/calypso!1

Control/CalypsoExample/GeoModelTest/README.md

-<<<<<<< HEAD
 This example package actually serves several purposes:
 
 *) It illustrates how to initialize and access the detector description and magnetic field.
@@ -16,32 +15,5 @@ The file GeoModelTestConfig.py can be edited to change some run options.
 After running the algorithm, to add the alignment data into your local conditions DB, do:
 
 run > CopyAlignFolder.sh
-=======
-This example package serves several purposes:
-
-
-*  It illustrates how to initialize and access the detector description and magnetic field.
-
-*  It checks that the expected number of detector elements are created.
-
-*  It generates a set of neutral alignment constants for the Tracker, which can be folded into the conditions database.
-
-*  It dumps a standalone GeoModel sqlite geometry database which could be used by external programs to display FASER without requiring any FASER software (only GeoModel)
-
-To run the algorithm, in a run directory where Calypso has been installed (displayed below as the command-line prompt `run >`), do
-
-```
-run > ./setup.sh
-run > python python/GeoModelTest/GeoModelTestConfig.py
-```
-
-The file `GeoModelTestConfig.py` can be edited to change some run options.
-
-After running the algorithm, to add the alignment data into your local conditions DB, do:
-
-```
-run > CopyAlignFolder.sh
-```
->>>>>>> 101c2c7308dc4189ca54fa71c97222e7670a54a7
 
 

Tracker/TrackerDigitization/FaserSCT_Digitization/README.md

 This package will translate Geant4 hits (HITS) into RawDataObject (RDO) data files.
 
-<<<<<<< HEAD
 Because input data and alignment is needed, there are a few steps to prepare. From a run directory where calypso is installed, do:
 
 *) run > ./setup.sh
@@ -26,41 +25,3 @@ Now you can run digitization on the HITS file you generated with the command:
 run > FaserSCT_DigitizationDbg.py >& digi.log
 
 This will read your g4.HITS.root generate an RDO data file with digitized raw data objects.
-=======
-Because input data and alignment is needed, there are a few steps to prepare. From a run directory where calypso is installed (displayed in the command-line prompt as `run >` below), do:
-
-```
-run > ./setup.sh
-```
-
-This sets up the runtime environment after building. The "." is mandatory.
-
-```
-run > runG4.py >& runG4.log
-```
-
-This will create a HITS file.
-
-```
-run > python python/GeoModelTest/GeoModelTestConfig.py
-```
-
-This will generate a set of neutral alignment data
-
-```
-run > CopyAlignFolder.sh
-```
-
-This will merge the alignment data into the conditions DB.
-
-All the above steps need only be done once after building calypso (but the last two steps must be repeated each time you do `make install`).
-
-Now you can run digitization on the HITS file you generated with the command:
-
-```
-run > FaserSCT_DigitizationDbg.py >& digi.log
-```
-
-This will read your `g4.HITS.root` and generate an RDO data file with digitized raw data objects.
-
->>>>>>> 101c2c7308dc4189ca54fa71c97222e7670a54a7