Merge branch 'revert-3c06ca2e' into 'master'

Revert "Update to use test beam conditions tag"

See merge request !6

Control/CalypsoExample/GeoModelTest/python/TestBeamTestConfig.py

@@ -40,7 +40,7 @@ if __name__ == "__main__":
     
 # Flags for this job
     ConfigFlags.Input.isMC = True                                # Needed to bypass autoconfig
-    ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-TB00"             # Always needed; must match FaserVersion
+    ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-02"             # Always needed; must match FaserVersion
     ConfigFlags.GeoModel.FaserVersion     = "FASER-TB00"           # Default FASER geometry
     ConfigFlags.GeoModel.GeoExportFile    = "faserTestBeamGeo.db"        # Writes out a GeoModel file with the full geometry tree (optional, comment out to skip)
     # ConfigFlags.Detector.EnableVeto     = True

Control/CalypsoExample/Reconstruction/scripts/faser_reco.py

@@ -75,7 +75,7 @@ if runtype == "TI12Data":
 # Testbeam setup 
 elif runtype == "TestBeamData":
     ConfigFlags.GeoModel.FaserVersion = "FASER-TB00" 
-    ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-TB00"
+    ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-02"
 
 else:
     print("Invalid run type found:", runtype)

README.md

@@ -41,7 +41,7 @@ It can be convenient to alias the "asetup --input=calypso/asetup.faser" to somet
 
 ** `ConfigFlags.GeoModel.FaserVersion = "FASERNU-02"` and `ConfigFlags.IOVDb.GlobalTag = OFLCOND-FASER-02` enables the full FaserNu (IFT + emulsion) setup
 
-** `ConfigFlags.GeoModel.FaserVersion = "FASER-TB00"` and `ConfigFlags.IOVDb.GlobalTag = OFLCOND-FASER-TB00` enables the 2021 Test-beam setup.
+** `ConfigFlags.GeoModel.FaserVersion = "FASER-TB00"` and `ConfigFlags.IOVDb.GlobalTag = OFLCOND-FASER-02` enables the 2021 Test-beam setup.
 
 * The "FaserActsKalmanFilter" package is temporarily disabled.
 

Simulation/G4Faser/G4FaserAlg/CMakeLists.txt

@@ -37,7 +37,7 @@ atlas_add_test( G4FaserAlgConfig_TestFaserNu
                 PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 
 atlas_add_test( G4FaserAlgConfig_TestTestbeam
-                SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/G4FaserAlgConfigNew_Test.py GeoModel.FaserVersion="'FASER-TB00'" IOVDb.GlobalTag="'OFLCOND-FASER-TB00'" Output.HITSFileName='tb.HITS.pool.root'
+                SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/G4FaserAlgConfigNew_Test.py GeoModel.FaserVersion="'FASER-TB00'" IOVDb.GlobalTag="'OFLCOND-FASER-02'" Output.HITSFileName='tb.HITS.pool.root'
                 PROPERTIES TIMEOUT 300 
                 PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 

Tracker/TrackerRecAlgs/TrackerClusterFit/test/TestBeamClusterFitDbg.py

@@ -95,7 +95,7 @@ ConfigFlags.Input.Files = [
 #ConfigFlags.Output.ESDFileName = "run608.ESD.pool.root"
 #ConfigFlags.Output.ESDFileName = "run001332.ESD.pool.root"
 ConfigFlags.Output.ESDFileName = "tb.ESD.pool.root"
-ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-TB00"             # Always needed; must match FaserVersion
+ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-02"             # Always needed; must match FaserVersion
 ConfigFlags.IOVDb.DatabaseInstance = "OFLP200"               # Use MC conditions for now
 ConfigFlags.Input.ProjectName = "data21"                     # Needed to bypass autoconfig
 ConfigFlags.Input.isMC = False                               # Needed to bypass autoconfig

Waveform/WaveRecAlgs/share/PseudoSimToWaveformRecExample_jobOptions.py

@@ -16,7 +16,7 @@ if __name__ == "__main__":
 
     log.setLevel(INFO)
     
-    ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-TB00"             # Always needed; must match FaserVersion
+    ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-02"             # Always needed; must match FaserVersion
     ConfigFlags.IOVDb.DatabaseInstance = "OFLP200"               # Use MC conditions for now
     ConfigFlags.Input.ProjectName = "mc21"                       # Needed to bypass autoconfig
     ConfigFlags.Input.isMC = True                                # Needed to bypass autoconfig

graphics/VTI12/README.md

@@ -10,6 +10,6 @@ Note that VP1PLUGINPATH can be ninja-changed by asetup, and if it does not inclu
 
 You can also give the -detdescr="FASER-01" (baseline detector), -detdescr="FASER-02" (baseline + IFT), -detdescr="FASERNU-02" (baseline + IFT + emulsion) or -detdescr="FASER-TB00" (2021 Test-beam) to specify the geometry.
 
-You also need either -globcond="OFLCOND-FASER-01" (baseline) or -globcond="OFLCOND-FASER-02" (IFT with or without emulsion), or -globcond="OFLCOND-FASER-TB00" (test-beam) flags to specify the conditions.  
+You also need either -globcond="OFLCOND-FASER-01" (baseline) or -globcond="OFLCOND-FASER-02" (IFT with or without emulsion, or Test-beam) flags to specify the conditions.  
 
 The event display has no way to determine the right values for these settings (it defaults to FASER-01 and OFLCOND-FASER-01).
\ No newline at end of file