Merge 4a765ea into sapling-pr-archive-ehellbar

Author: ehellbar

DATA/production/calib/tpc-laser-filter.sh

@@ -13,6 +13,13 @@ FILEWORKDIR2="/home/epn/odc/files/"
 #ARGS_ALL_CONFIG+="NameConf.mDirGRP=$FILEWORKDIR;NameConf.mDirGeom=$FILEWORKDIR2;NameConf.mDirCollContext=$FILEWORKDIR;NameConf.mDirMatLUT=$FILEWORKDIR;keyval.input_dir=$FILEWORKDIR;keyval.output_dir=/dev/null"
 #ARGS_ALL_CONFIG+="NameConf.mDirGRP=$FILEWORKDIR;NameConf.mDirGeom=$FILEWORKDIR2;NameConf.mDirCollContext=$FILEWORKDIR;NameConf.mDirMatLUT=$FILEWORKDIR"
 
+GPUTYPE=${GPUTYPE:-CPU}
+if workflow_has_parameter GPU; then
+  GPUTYPE=HIP
+  GPUMEMSIZE=$(( 24 << 30 ))
+  HOSTMEMSIZE=$(( 5 << 30 ))
+fi
+
 if [ ${NUMAGPUIDS} != 0 ]; then
   ARGS_ALL+=" --child-driver 'numactl --membind $NUMAID --cpunodebind $NUMAID'"
 fi

DATA/production/calib/tpc-laser.sh

@@ -10,6 +10,13 @@ FILEWORKDIR="/home/wiechula/processData/inputFilesTracking/triggeredLaser"
 
 FILEWORKDIR2="/home/epn/odc/files/"
 
+GPUTYPE=${GPUTYPE:-CPU}
+if workflow_has_parameter GPU; then
+  GPUTYPE=HIP
+  GPUMEMSIZE=$(( 24 << 30 ))
+  HOSTMEMSIZE=$(( 5 << 30 ))
+fi
+
 if [ $NUMAGPUIDS != 0 ]; then
   ARGS_ALL+=" --child-driver 'numactl --membind $NUMAID --cpunodebind $NUMAID'"
 fi

DATA/production/qc-async/mch-digits.json

@@ -36,7 +36,12 @@
                     "type": "direct",
                     "query": "digits:MCH/DIGITS"
                 },
+                "movingWindows": [
+                    "RateSignalPerDualSampa"
+                ],
                 "taskParameters": {
+                    "Enable1DRateMaps": "true",
+                    "Enable2DRateMaps": "false",
                     "Diagnostic": "false"
                 },
                 "grpGeomRequest": {

DATA/production/qc-async/mch-reco.json

@@ -49,6 +49,13 @@
                 "dataSource": {
                     "type": "direct",
                     "query": "preclusters:MCH/PRECLUSTERS/0;preclusterdigits:MCH/PRECLUSTERDIGITS/0"
+                },
+                "movingWindows": [
+                    "PseudoeffPerDualSampa"
+                ],
+                "taskParameters": {
+                    "Enable1DPseudoeffMaps": "true",
+                    "Enable2DPseudoeffMaps": "false"
                 }
             },
             "FRofs": {
@@ -68,4 +75,4 @@
             }
         }
     }
-}
+}

DATA/production/standalone-calibration.desc

@@ -38,9 +38,9 @@ TPC-pulser-long: "O2PDPSuite" reco,1,1," production/calib/tpc-pulser-long.sh"
 
 TPC-pedestal: "O2PDPSuite" reco,1,1," production/calib/tpc-pedestal.sh"
 
-TPC-laser: "O2PDPSuite" reco,1,1,"SHMSIZE=$((128 << 30)) GPUTYPE=HIP GPUMEMSIZE=$(( 24 << 30 )) HOSTMEMSIZE=$(( 5 << 30 ))  production/calib/tpc-laser.sh"
+TPC-laser: "O2PDPSuite" reco,1,1,"SHMSIZE=$((128 << 30)) production/calib/tpc-laser.sh"
 
-TPC-laser-multi: "O2PDPSuite" reco,10,10,"SHMSIZE=$((128 << 30)) GPUTYPE=HIP GPUMEMSIZE=$(( 24 << 30 )) HOSTMEMSIZE=$(( 5 << 30 ))  production/calib/tpc-laser-filter.sh" calib,1,"production/calib/tpc-laser-aggregator.sh"
+TPC-laser-multi: "O2PDPSuite" reco,10,10,"SHMSIZE=$((128 << 30)) production/calib/tpc-laser-filter.sh" calib,1,"production/calib/tpc-laser-aggregator.sh"
 
 MFT-noise-calibration: "O2PDPSuite" reco,20,20,"production/calib/mft-noise-processing.sh" calib,20,"production/calib/mft-noise-aggregator.sh"