TPC: Fix usage of derivative map for scaling of space-charge corrections#12264
Conversation
- add option to override lumi of reference map (reference map can be the derivative map) - changing definition of scaling when using the derivative map: The derivative map is defined as "map_high_IR - map_low_IR". The stored lumi of the derivative map should correspond to "<Lumi_high_IR> - <Lumi_low_IR>" - Changing condition when scaling is used: for the derivative map the scaling is negative, when the inst_lumi < mean_lumi
| --lumi-type) ASK_CTP_LUMI_GPU=" --lumi-type ${2}"; [[ ${2} == "2" ]] && NEED_TPC_SCALERS_WF=1; shift 2;; | ||
| --lumi-type=*) ASK_CTP_LUMI_GPU="${ASK_CTP_LUMI_GPU} --lumi-type ${1#*=}"; shift 1;; | ||
| --lumi-type) ASK_CTP_LUMI_GPU="${ASK_CTP_LUMI_GPU} --lumi-type ${2}"; shift 2;; | ||
| --corrmap-lumi-mode=*) ASK_CTP_LUMI_GPU="${ASK_CTP_LUMI_GPU} --corrmap-lumi-mode ${1#*=}"; shift 1;; |
There was a problem hiding this comment.
Hello @shahor02
I moved the --corrmap-lumi-mode to the tpc-reco-workflow and I also added it to gpu-reco-workflow. Otherwise the default value was actually used at some places in the code (invoid CorrectionMapsLoader::requestCCDBInputs(std::vector<InputSpec>& inputs, std::vector<o2::framework::ConfigParamSpec>& options, int lumiScaleType, int lumiScaleMode) the lumiScaleMode was always 0). I assume this is fine? I also added the --corrmap-lumi-mode to the parse_TPC_CORR_SCALING. Is this correct how I did it?
There was a problem hiding this comment.
Indeed, as it is now the corrmap-lumi-mode could not be used: as an option defining device inputs it must be defined on the workflow level. But then it should be added to all global tracking workflows using TPC corrections (same as --lumi-type). Let me open a PR on your branch to minimize the boiler plate code.
The fix for the dpl-workflow looks fine.
There was a problem hiding this comment.
@matthias-kleiner for a reason I don't understand I am not able to open PR on your branch, matthias-kleiner/AliceO2 does not show up in the Choose a Base Repository menu...
Could you rebase your branch to my branch https://github.com/shahor02/AliceO2/tree/DCAd_monitoring (forked from yours with just 1 commit atted, you can also cherry-pick shahor02@884ce98 )
shahor02@884ce98
matthias-kleiner
requested review from
a team,
bazinski,
davidrohr,
f3sch,
martenole,
sgorbuno and
wiechula
as code owners
Former options --corrmap-lumi-mean, --corrmap-lumi-inst, --corrmap-lumi-ref, --ctp-lumi-factor, --ctp-lumi-source are moved to new configurable param CorrMapParam as TPCCorrMap.lumiMean, lumiInst, lumiMeanRef, lumiInstFactor and ctpLumiSource respectively. The object is not loaded from the CCDB (default uploaded) and can be modified from the command line as a usial configurable param. The dpl-workflow.sh parses TPC_CORR_SCALING env var. which is now a mix of options --lumi-type <0,1,2>, --corrmap-lumi-mode <0,1> abd TPCCorrMap... settings, e.g. TPCCorrMap=--lumi-type 2 --corrmap-lumi-mode 1 TPCCorrMap.lumiInstFactor=3.141
|
@matthias-kleiner I've updated my fork https://github.com/shahor02/AliceO2/tree/DCAd_monitoring which what we have discussed today: shahor02@faaa9fb The default configurable param was uploaded: https://alice.its.cern.ch/jira/browse/O2-4394. |
|
@matthias-kleiner @wiechula the CI failure is unrelated, for me it is fine to merge this, shall I go on? |
For me it is also fine |
3 participants
add option to override lumi of reference map (reference map can be the derivative map)
changing definition of scaling when using the derivative map: The derivative map is defined as "map_high_IR - map_low_IR". The stored lumi of the derivative map should correspond to "<Lumi_high_IR> - <Lumi_low_IR>"
Changing condition when scaling is used: for the derivative map the scaling is negative, when the inst_lumi < mean_lumi