Skip to content

Commit d730765

Browse files
committed
Residual aggregator output dir specified automatically
1 parent 496dfc2 commit d730765

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

Detectors/GlobalTrackingWorkflow/tpcinterpolationworkflow/include/TPCInterpolationWorkflow/TPCResidualAggregatorSpec.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class ResidualAggregatorDevice : public o2::framework::Task
6262
storeMetaFile = true;
6363
}
6464
if (!mWriteOutput && (outputDirConf != "none" || storeMetaFile)) {
65-
LOGF(alarm, "File output is disabled, but output directory %s was specified and meta file storage is set to %i", outputDirConf, storeMetaFile);
65+
LOGF(info, "File output is disabled, but output directory %s was specified and meta file storage is set to %i. No output file will be written", outputDirConf, storeMetaFile);
6666
storeMetaFile = false;
6767
}
6868
mAggregator = std::make_unique<o2::tpc::ResidualAggregator>(minEnt);

prodtests/full-system-test/aggregator-workflow.sh

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,21 @@ if [[ "0$GEN_TOPO_VERBOSE" == "01" ]]; then
3030
echo "CCDB_POPULATOR_UPLOAD_PATH = $CCDB_POPULATOR_UPLOAD_PATH" 1>&2
3131
fi
3232

33+
# Additional settings for calibration workflows
34+
if [[ -z $CALIB_DIR ]]; then CALIB_DIR=$FILEWORKDIR; fi # Directory where to store output from calibration workflows
35+
36+
# All meta files go into the same directory
37+
if [[ -z $CALIB_METAFILES_DIR ]]; then
38+
if [[ ! -z $CTF_METAFILES_DIR ]]; then
39+
CALIB_METAFILES_DIR=$CTF_METAFILES_DIR
40+
else
41+
CALIB_METAFILES_DIR="/dev/null"
42+
fi
43+
fi
44+
45+
if [[ $RUNTYPE == "SYNTHETIC" ]]; then DISABLE_CALIB_OUTPUT="--disable-root-output"; fi
46+
47+
3348
# Adding calibrations
3449
EXTRA_WORKFLOW_CALIB=
3550

@@ -174,9 +189,7 @@ if [[ $AGGREGATOR_TASKS == BARREL_TF ]] || [[ $AGGREGATOR_TASKS == ALL ]]; then
174189
fi
175190
# TPC
176191
if [[ $CALIB_TPC_SCDCALIB == 1 ]]; then
177-
# TODO: the residual aggregator should have --output-dir and --meta-output-dir defined
178-
# without that the residuals will be stored in the local working directory (and deleted after a week)
179-
add_W o2-calibration-residual-aggregator "--disable-root-input $ENABLE_TRACK_INPUT $CALIB_TPC_SCDCALIB_CTP_INPUT --output-type trackParams,unbinnedResid,binnedResid --autosave-interval $RESIDUAL_AGGREGATOR_AUTOSAVE"
192+
add_W o2-calibration-residual-aggregator "--disable-root-input $DISABLE_CALIB_OUTPUT $ENABLE_TRACK_INPUT $CALIB_TPC_SCDCALIB_CTP_INPUT --output-dir $CALIB_DIR --meta-output-dir $CALIB_METAFILES_DIR --autosave-interval $RESIDUAL_AGGREGATOR_AUTOSAVE"
180193
fi
181194
if [[ $CALIB_TPC_VDRIFTTGL == 1 ]]; then
182195
# options available via ARGS_EXTRA_PROCESS_o2_tpc_vdrift_tgl_calibration_workflow="--nbins-tgl 20 --nbins-dtgl 50 --max-tgl-its 2. --max-dtgl-itstpc 0.15 --min-entries-per-slot 1000 --time-slot-seconds 600 <--vdtgl-histos-file-name name> "

0 commit comments

Comments
 (0)