Skip to content

TPC: move disable-IDC-scalers to CorrectionMapsOptions - #15754

Merged
shahor02 merged 2 commits into
AliceO2Group:devfrom
matthias-kleiner:tpc-disable-idc-scalers-correctionmapsoptions
Sep 3, 2026
Merged

TPC: move disable-IDC-scalers to CorrectionMapsOptions#15754
shahor02 merged 2 commits into
AliceO2Group:devfrom
matthias-kleiner:tpc-disable-idc-scalers-correctionmapsoptions

Conversation

@matthias-kleiner

Copy link
Copy Markdown
Contributor

No description provided.

const auto enableMShape = configcontext.options().get<bool>("enable-M-shape-correction");
const auto enableIDCs = !configcontext.options().get<bool>("disable-IDC-scalers");
specs.emplace_back(o2::tpc::getTPCScalerSpec(enableIDCs, enableMShape, sclOpt));
specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt.enableIDCScalers, sclOpt.enableMShapeCorrection, sclOpt));

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Any reason for keeping enableIDCScalers and enableMShapeCorrection as separate arguments of getTPCScalerSpec, instead of calling directly getTPCScalerSpec(sclOpt) ?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you are right, so in principle we could just automatically disable the IDCs like we do already in other places like Detectors/Align/Workflow/src/barrel-alignment-workflow.cxx in case we dont use the IDCs for scaling or? This should make it alot easier I assume

Unify getTPCScalerSpec() across all 13 call sites to take just
CorrectionMapsGloOpts and derive enableIDCs/enableMShape internally,
instead of passing them as separate bools. This removes the
disable-IDC-scalers CLI flag and enableIDCScalers field added in the
previous commit: tpc-scaler.cxx/tpc-refitter-workflow.cxx now derive
enableIDCs the same way as every other caller already did
(sclOpts.lumiType == LumiScaleType::TPCScaler), instead of a separate
manual override.

dpl-workflow.sh's parse_TPC_CORR_SCALING() previously hand-replicated
this exact lumiType==TPCScaler logic externally (IGNOREIDC) just to
synthesize --disable-IDC-scalers for o2-tpc-scaler-workflow; that
workaround is now unnecessary and removed.

@shahor02 shahor02 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@alibuild

alibuild commented Sep 3, 2026

Copy link
Copy Markdown
Collaborator

Error while checking build/O2/fullCI_slc9 for cd73feb at 2026-09-03 22:18:

## sw/BUILD/O2Physics-latest/log
c++: fatal error: Killed signal terminated program cc1plus
c++: fatal error: Killed signal terminated program cc1plus
ninja: build stopped: subcommand failed.


## sw/BUILD/o2checkcode-latest/log
--
========== List of errors found ==========
++ GRERR=0
++ grep -v clang-diagnostic-error error-log.txt
++ grep ' error:'
grep: error-log.txt: binary file matches
++ GRERR=1
++ [[ 1 == 0 ]]
++ mkdir -p /sw/INSTALLROOT/1ce412ceef3ea57a3119b903b0bba99020deefb9/slc9_x86-64/o2checkcode/1.0-local547/etc/modulefiles
++ alibuild-generate-module
+ HAS_BIN=
+ HAS_LIB=
+ HAS_CMAKE=
+ HAS_ROOT=
+ '[' 0 '!=' 0 ']'
+ cat
+ printf 'if ![ is-loaded '\''BASE/1.0'\'' ] {\n module load BASE/1.0\n}'
+ echo 'BUILD_REQUIRES=CMake alibuild-recipe-tools defaults-release'
BUILD_REQUIRES=CMake alibuild-recipe-tools defaults-release
+ FULL_BUILD_REQUIRES='defaults-release alibuild-recipe-tools MPFR ninja bz2 Alice-GRID-Utils pytorch_cpuinfo json-c googlebenchmark Python-modules-list O2-customization UUID double-conversion FairCMakeModules CMake safe_int ninja-fortran date'
+ echo 'FULL_BUILD_REQUIRES=defaults-release alibuild-recipe-tools MPFR ninja bz2 Alice-GRID-Utils pytorch_cpuinfo json-c googlebenchmark Python-modules-list O2-customization UUID double-conversion FairCMakeModules CMake safe_int ninja-fortran date'
FULL_BUILD_REQUIRES=defaults-release alibuild-recipe-tools MPFR ninja bz2 Alice-GRID-Utils pytorch_cpuinfo json-c googlebenchmark Python-modules-list O2-customization UUID double-conversion FairCMakeModules CMake safe_int ninja-fortran date
++ env
++ cut -f1 -d=
++ grep -v '^DEFAULT_'
++ grep -v PKGREVISION
++ grep -v ALIBUILD_RECIPE_TOOLS
++ grep REVISION
++ sed -e s/_REVISION//
+ for x in $(env | cut -f1 -d= | grep -v "^DEFAULT_" | grep -v PKGREVISION | grep -v ALIBUILD_RECIPE_TOOLS | grep REVISION | sed -e 's/_REVISION//')
++ eval 'echo $LIBFFI_REVISION'
+++ echo 14
+ REVISION_VALUE=14
++ eval 'echo $LIBFFI_VERSION'
+++ echo v3.2.1-alice1
+ VERSION_VALUE=v3.2.1-alice1
++ eval 'echo $LIBFFI_ROOT'
+++ echo /sw/slc9_x86-64/libffi/v3.2.1-alice1-14
+ ROOT_PATH_VALUE=/sw/slc9_x86-64/libffi/v3.2.1-alice1-14
+ '[' -z 14 ']'
+ echo 'defaults-release alibuild-recipe-tools MPFR ninja bz2 Alice-GRID-Utils pytorch_cpuinfo json-c googlebenchmark Python-modules-list O2-customization UUID double-conversion FairCMakeModules CMake safe_int ninja-fortran date'
+ tr '[:lower:]' '[:upper:]'
[0 more errors; see full log]

Full log here.

@shahor02

shahor02 commented Sep 3, 2026

Copy link
Copy Markdown
Collaborator

CIs seem to be broken, tested locally, merging.

@shahor02
shahor02 merged commit ad5c282 into AliceO2Group:dev Sep 3, 2026
8 of 12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants