Update scripts to handle new alignment

Control/CalypsoExample/Reconstruction/scripts/faser_reco.py

@@ -25,8 +25,9 @@ parser.add_argument("file_path",
                     help="Fully qualified path of the raw input file")
 parser.add_argument("-g", "--geom", default="",
                     help="Specify geometry (if it can't be parsed from run number)\n Values: TI12Data03 (2022 TI12)")
-parser.add_argument("-c", "--config", default="",
-                    help="Specify conditions tag (default depends on geometry)")
+parser.add_argument("-c", "--cond", default="",
+                    help="Override global conditions tag (old alignment: --cond FASER-03")
+
 parser.add_argument("-r", "--reco", default="",
                     help="Specify reco tag (to append to output filename)")
 parser.add_argument("-n", "--nevents", type=int, default=-1,
@@ -136,12 +137,12 @@ elif runtype == "TestBeamData" or runtype == "TestBeamMC":
 # New TI12 geometry (ugh)
 elif runtype == "TI12Data02":
     ConfigFlags.GeoModel.FaserVersion = "FASER-02" 
-    ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-04"  # 2023 alignment
+    ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03"
 
 # Final 2022 TI12 geometry
 elif runtype == "TI12Data03":
     ConfigFlags.GeoModel.FaserVersion = "FASERNU-03" 
-    ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-04"  # 2023 alignment
+    ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-04" # Updated 2023 alignment
     useCal = True
     if not args.isMC:
         useLHC = True
@@ -151,10 +152,10 @@ else:
     print("Specify correct type or update list")
     sys.exit(1)
 
-# Override global tag if requested
-if len(args.config)>0:
-    print(f"Override ConfigFlags.IOVDb.GlobalTag = {args.config}") 
-    ConfigFlags.IOVDb.GlobalTag = args.config
+# Check if we want to override global conditions tag
+if len(args.cond):
+    ConfigFlags.IOVDb.GlobalTag = args.cond
+    print(f"Override global tag ConfigFlags.IOVDb.GlobalTag = {args.config}") 
 
 # Must use original input string here, as pathlib mangles double // in path names
 ConfigFlags.Input.Files = [ args.file_path ]

Control/CalypsoExample/Reconstruction/scripts/submit_faser_reco.sh

@@ -151,7 +151,7 @@ cd "$release_directory"
 asetup --input=calypso/asetup.faser Athena,22.0.49
 source run/setup.sh
 #
-echo "ATLAS_POOLCOND_PATH = $ATLAS_POOLCOND_PATH"
+echo "Initial ATLAS_POOLCOND_PATH = $ATLAS_POOLCOND_PATH"
 #
 # Check if there are data overrides
 if [ -d "run/data/sqlite200" ]; then
@@ -199,17 +199,17 @@ else
 fi
 # 
 # Further check if there is a pool conditions override
-#if [[ -d "data/poolcond" ]]; then
-#    echo "Local POOL directory found!"
-#    echo "Change ATLAS_POOLCOND_PATH"
-#    echo " from $ATLAS_POOLCOND_PATH"
-#    export ATLAS_POOLCOND_PATH=`pwd -P`/data
-#    echo " to $ATLAS_POOLCOND_PATH"
-#else
-#    echo "No local pool files found, use default:"
-#    echo " $ATLAS_POOLCOND_PATH"
-#fi
-echo "ATLAS_POOLCOND_PATH: $ATLAS_POOLCOND_PATH"
+if [[ -d "data/poolcond" ]]; then
+    echo "Local POOL directory found!"
+    echo "Change ATLAS_POOLCOND_PATH"
+    echo " from $ATLAS_POOLCOND_PATH"
+    export ATLAS_POOLCOND_PATH=`pwd -P`/data
+    echo " to $ATLAS_POOLCOND_PATH"
+else
+    echo "No local pool files found, use default:"
+    echo " $ATLAS_POOLCOND_PATH"
+fi
+echo "Final ATLAS_POOLCOND_PATH: $ATLAS_POOLCOND_PATH"
 #
 # Run job
 if [[ -z "$tag" ]]; then

PhysicsAnalysis/NtupleDumper/scripts/faser_ntuple_maker.py

@@ -44,8 +44,8 @@ parser.add_argument("--isMC", action='store_true',
 parser.add_argument("--partial", action='store_true',
                     help="Allow partial input files")
 
-parser.add_argument("-c", "--config", default="",
-                    help="Specify conditions tag (default: OFLCOND-FASER-04)")
+parser.add_argument("-c", "--cond", default="",
+                    help="Specify global conditions tag (default: OFLCOND-FASER-04)")
 
 parser.add_argument("--trigFilt", action='store_true',
                     help="apply trigger event filter")
@@ -233,11 +233,11 @@ Configurable.configurableRun3Behavior = True
 
 # Configure
 ConfigFlags.Input.Files = filelist
-if len(args.config) == 0:
+if len(args.cond) == 0:
     ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-04"         # Always needed; must match FaserVersionS
 else:
-    print(f"Setting ConfigFlags.IOVDb.GlobalTag = {args.config}")
-    ConfigFlags.IOVDb.GlobalTag = args.config
+    print(f"Setting ConfigFlags.IOVDb.GlobalTag = {args.cond}")
+    ConfigFlags.IOVDb.GlobalTag = args.cond
 
 ConfigFlags.Input.isMC = args.isMC
 if args.isMC:

PhysicsAnalysis/NtupleDumper/scripts/submit_faser_ntuple_maker.sh

@@ -183,7 +183,7 @@ cd "$release_directory"
 asetup --input=calypso/asetup.faser Athena,22.0.49
 source run/setup.sh
 #
-echo "ATLAS_POOLCOND_PATH = $ATLAS_POOLCOND_PATH"
+echo "Initial ATLAS_POOLCOND_PATH = $ATLAS_POOLCOND_PATH"
 #
 # Check if there are data overrides
 if [ -d "run/data/sqlite200" ]; then
@@ -239,6 +239,20 @@ else
     cp -r $cond_directory .
     ls -R data
 fi
+# 
+# Further check if there is a pool conditions override
+if [[ -d "data/poolcond" ]]; then
+    echo "Local POOL directory found!"
+    echo "Change ATLAS_POOLCOND_PATH"
+    echo " from $ATLAS_POOLCOND_PATH"
+    export ATLAS_POOLCOND_PATH=`pwd -P`/data
+    echo " to $ATLAS_POOLCOND_PATH"
+else
+    echo "No local pool files found, use default:"
+    echo " $ATLAS_POOLCOND_PATH"
+fi
+echo "Final ATLAS_POOLCOND_PATH: $ATLAS_POOLCOND_PATH"
+#
 #
 export EOS_MGM_URL=root://eospublic.cern.ch
 #