Skip to content

TPC Laser calibration - ARGS_ALL_CONFIG fix - #1368

Merged
davidrohr merged 8 commits into
AliceO2Group:masterfrom
rmunzer:tpc_calib
Dec 6, 2023
Merged

TPC Laser calibration - ARGS_ALL_CONFIG fix#1368
davidrohr merged 8 commits into
AliceO2Group:masterfrom
rmunzer:tpc_calib

Conversation

@rmunzer

@rmunzer rmunzer commented Dec 6, 2023

Copy link
Copy Markdown
Contributor

No description provided.

martenole
martenole reviewed Dec 6, 2023
View reviewed changes
Comment thread DATA/production/calib/tpc-laser-filter.sh Outdated
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;keyval.input_dir=$FILEWORKDIR;keyval.output_dir=/dev/null"

@martenole martenole Dec 6, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Hi @rmunzer these defaults are already set in

O2DPG/DATA/common/getCommonArgs.sh

Line 13 in 6c6417b

ARGS_ALL_CONFIG="NameConf.mDirGeom=$FILEWORKDIR;NameConf.mDirGRP=$FILEWORKDIRRUN;keyval.input_dir=$FILEWORKDIR;keyval.output_dir=/dev/null;${ALL_EXTRA_CONFIG:-}"
. So you can simply drop this line completely (if I didn't overlook something)

martenole
martenole reviewed Dec 6, 2023
View reviewed changes
Comment thread DATA/production/calib/tpc-laser.sh Outdated
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;keyval.input_dir=$FILEWORKDIR;keyval.output_dir=/dev/null"

@martenole martenole Dec 6, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

as above

@martenole

martenole commented Dec 6, 2023

Copy link
Copy Markdown
Contributor

Actually, cannot we drop the current ARGS_ALL_CONFIG completely to make the workflows a bit more compact @davidrohr ? At least mDirGeom and mDirGRP should not be needed anymore since that is taken from CCDB. I don't know where the input_dir and output_dir are used, but when commenting them out I can still run my workflows without problems

@shahor02

shahor02 commented Dec 6, 2023

Copy link
Copy Markdown
Collaborator

Indeed, NameConf is used only in MC jobs, dpl-workflow does not need it.

@davidrohr

davidrohr commented Dec 6, 2023

Copy link
Copy Markdown
Collaborator

I think we should clean all this duplicate stuff from the workflows, and the default settings should only come from getCommonArgs.sh.
I would not drop ARGS_ALL_CONFIG alltogether, since it can be used to add configKeyValues globally.
Indeed, we can remove mDirGeam and mDirGRP from getCommonArgs.sh.
For input_dir / output_dir, I am not 100% sure, I would keep that for now.

So we should update getCommonArgs.sh and fix these workflows:

DATA/production/calib/tpc-laser-filter.sh:ARGS_ALL_CONFIG="NameConf.mDirGRP=$FILEWORKDIR;NameConf.mDirGeom=$FILEWORKDIR2;NameConf.mDirCollContext=$FILEWORKDIR;NameConf.mDirMatLUT=$FILEWORKDIR;keyval.input_dir=$FILEWORKDIR;keyval.output_dir=/dev/null"
DATA/production/calib/tpc-laser.sh:ARGS_ALL_CONFIG="NameConf.mDirGRP=$FILEWORKDIR;NameConf.mDirGeom=$FILEWORKDIR2;NameConf.mDirCollContext=$FILEWORKDIR;NameConf.mDirMatLUT=$FILEWORKDIR;keyval.input_dir=$FILEWORKDIR;keyval.output_dir=/dev/null"
DATA/testing/detectors/FT0/ft0-digits-qc-ctf.sh:ARGS_ALL_CONFIG="NameConf.mDirGRP=$FILEWORKDIR;NameConf.mDirGeom=$FILEWORKDIR;NameConf.mDirCollContext=$FILEWORKDIR;NameConf.mDirMatLUT=$FILEWORKDIR;keyval.input_dir=$FILEWORKDIR;keyval.output_dir=/dev/null"
DATA/testing/detectors/FV0/fv0-digits-qc-ctf.sh:ARGS_ALL_CONFIG="NameConf.mDirGRP=$FILEWORKDIR;NameConf.mDirGeom=$FILEWORKDIR;NameConf.mDirCollContext=$FILEWORKDIR;NameConf.mDirMatLUT=$FILEWORKDIR;keyval.input_dir=$FILEWORKDIR;keyval.output_dir=/dev/null"
DATA/testing/private/afurs/fdd-ft0-fv0-ctf.sh:ARGS_ALL_CONFIG="NameConf.mDirGRP=$FILEWORKDIR;NameConf.mDirGeom=$FILEWORKDIR;NameConf.mDirCollContext=$FILEWORKDIR;NameConf.mDirMatLUT=$FILEWORKDIR;keyval.input_dir=$FILEWORKDIR;keyval.output_dir=/dev/null"
DATA/testing/private/afurs/fdd-ft0-fv0-digits-qc-ctf.sh:ARGS_ALL_CONFIG="NameConf.mDirGRP=$FILEWORKDIR;NameConf.mDirGeom=$FILEWORKDIR;NameConf.mDirCollContext=$FILEWORKDIR;NameConf.mDirMatLUT=$FILEWORKDIR;keyval.input_dir=$FILEWORKDIR;keyval.output_dir=/dev/null"
DATA/testing/private/afurs/ft0-fv0-ctf.sh:ARGS_ALL_CONFIG="NameConf.mDirGRP=$FILEWORKDIR;NameConf.mDirGeom=$FILEWORKDIR;NameConf.mDirCollContext=$FILEWORKDIR;NameConf.mDirMatLUT=$FILEWORKDIR;keyval.input_dir=$FILEWORKDIR;keyval.output_dir=/dev/null"
DATA/testing/private/afurs/ft0-fv0-digits-qc-ctf.sh:ARGS_ALL_CONFIG="NameConf.mDirGRP=$FILEWORKDIR;NameConf.mDirGeom=$FILEWORKDIR;NameConf.mDirCollContext=$FILEWORKDIR;NameConf.mDirMatLUT=$FILEWORKDIR;keyval.input_dir=$FILEWORKDIR;keyval.output_dir=/dev/null"
DATA/testing/private/zampolli/zampolli-workflow.sh:ARGS_ALL_CONFIG="NameConf.mDirGRP=$FILEWORKDIR;NameConf.mDirGeom=$FILEWORKDIR;NameConf.mDirCollContext=$FILEWORKDIR;NameConf.mDirMatLUT=$FILEWORKDIR;keyval.input_dir=$FILEWORKDIR;keyval.output_dir=/dev/null"

@martenole : could you take care?

@davidrohr
davidrohr merged commit 8b4e86e into AliceO2Group:master Dec 6, 2023
@martenole

martenole commented Dec 7, 2023

Copy link
Copy Markdown
Contributor

Yes, will do

@rmunzer
rmunzer deleted the tpc_calib branch December 14, 2023 21:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@davidrohr davidrohr Awaiting requested review from davidrohr davidrohr is a code owner
@shahor02 shahor02 Awaiting requested review from shahor02 shahor02 is a code owner
@chiarazampolli chiarazampolli Awaiting requested review from chiarazampolli chiarazampolli is a code owner
1 more reviewer
@martenole martenole martenole left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@rmunzer @martenole @shahor02 @davidrohr