Skip to content

Commit 6b6f4d1

Browse files
committed
remove duplicated flag for pw activation
1 parent 1fbf90e commit 6b6f4d1

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

MC/run/ANCHOR/anchorMC.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,12 @@ if [ "${ISEXCLUDED}" ]; then
299299
fi
300300

301301
# -- Create aligned geometry using ITS ideal alignment to avoid overlaps in geant
302-
if [ "${ENABLE_PARALLEL_WORLD}" == "0" ]; then
302+
ENABLEPW = 0
303+
if [[ $remainingargs == "GeometryManagerParam.useParallelWorld=1" ]]; then
304+
ENABLEPW=1
305+
fi
306+
307+
if [ "${ENABLEPW}" == "0" ]; then
303308
CCDBOBJECTS_IDEAL_MC="ITS/Calib/Align"
304309
TIMESTAMP_IDEAL_MC=1
305310
${O2_ROOT}/bin/o2-ccdb-downloadccdbfile --host http://alice-ccdb.cern.ch/ -p ${CCDBOBJECTS_IDEAL_MC} -d ${ALICEO2_CCDB_LOCALCACHE} --timestamp ${TIMESTAMP_IDEAL_MC}
@@ -311,14 +316,14 @@ if [ "${ENABLE_PARALLEL_WORLD}" == "0" ]; then
311316
fi
312317

313318
# TODO This can potentially be removed or if needed, should be taken over by o2dpg_sim_workflow_anchored.py and O2_dpg_workflow_runner.py
314-
if [ "${ENABLE_PARALLEL_WORLD}" == "0" ]; then
319+
if [ "${ENABLEPW}" == "0" ]; then
315320
echo "run with echo in pipe" | ${O2_ROOT}/bin/o2-create-aligned-geometry-workflow --configKeyValues "HBFUtils.startTime=${TIMESTAMP}" --condition-remap=file://${ALICEO2_CCDB_LOCALCACHE}=ITS/Calib/Align -b --run
316321
else
317322
echo "run with echo in pipe" | ${O2_ROOT}/bin/o2-create-aligned-geometry-workflow --configKeyValues "HBFUtils.startTime=${TIMESTAMP}" -b --run
318323
fi
319324
mkdir -p $ALICEO2_CCDB_LOCALCACHE/GLO/Config/GeometryAligned
320325
ln -s -f $PWD/o2sim_geometry-aligned.root $ALICEO2_CCDB_LOCALCACHE/GLO/Config/GeometryAligned/snapshot.root
321-
if [ "${ENABLE_PARALLEL_WORLD}" == "0" ]; then
326+
if [ "${ENABLEPW}" == "0" ]; then
322327
[[ -f $PWD/its_GeometryTGeo.root ]] && mkdir -p $ALICEO2_CCDB_LOCALCACHE/ITS/Config/Geometry && ln -s -f $PWD/its_GeometryTGeo.root $ALICEO2_CCDB_LOCALCACHE/ITS/Config/Geometry/snapshot.root
323328
fi
324329
[[ -f $PWD/mft_GeometryTGeo.root ]] && mkdir -p $ALICEO2_CCDB_LOCALCACHE/MFT/Config/Geometry && ln -s -f $PWD/mft_GeometryTGeo.root $ALICEO2_CCDB_LOCALCACHE/MFT/Config/Geometry/snapshot.root

MC/run/ANCHOR/tests/test_anchor_2023_apass2_pp.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ export SEED=5
3030
# for pp and 50 events per TF, we launch only 4 workers.
3131
export NWORKERS=2
3232

33-
export ENABLE_PARALLEL_WORLD=1
3433
export ALIEN_JDL_ANCHOR_SIM_OPTIONS="-gen pythia8 -confKey \"GeometryManagerParam.useParallelWorld=1;GeometryManagerParam.usePwGeoBVH=1;GeometryManagerParam.usePwCaching=1\""
3534

3635
# run the central anchor steering script; this includes

0 commit comments

Comments
 (0)