Skip to content

Commit ebb1f88

Browse files
sawenzelsawenzel
authored
Merge branch 'master' into swenzel/interactionRateCTPScalers
2 parents a9bb133 + dcdaf0b commit ebb1f88

54 files changed

Lines changed: 2786 additions & 393 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎DATA/common/gen_topo_helper_functions.sh‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@ workflow_has_parameter()
7676
[[ $WORKFLOW_PARAMETERS =~ (^|,)"$1"(,|$) ]]
7777
}
7878

79+
has_processing_step()
80+
{
81+
[[ ${WORKFLOW_EXTRA_PROCESSING_STEPS:-} =~ (^|,)"$1"(,|$) ]]
82+
}
83+
7984
_check_multiple()
8085
{
8186
CHECKER=$1
@@ -160,4 +165,61 @@ add_semicolon_separated()
160165
done
161166
}
162167

168+
# ---------------------------------------------------------------------------------------------------------------------
169+
# Helper functions for multiplicities
170+
171+
get_N() # USAGE: get_N [processor-name] [DETECTOR_NAME] [RAW|CTF|REST] [threads, to be used for process scaling. 0 = do not scale this one process] [optional name [FOO] of variable "$N_[FOO]" with default, default = 1]
172+
{
173+
local NAME_FACTOR="N_F_$3"
174+
local NAME_DET="MULTIPLICITY_FACTOR_DETECTOR_$2"
175+
local NAME_PROC="MULTIPLICITY_PROCESS_${1//-/_}"
176+
local NAME_PROC_FACTOR="MULTIPLICITY_FACTOR_PROCESS_${1//-/_}"
177+
local NAME_DEFAULT="N_${5:-}"
178+
local MULT=${!NAME_PROC:-$((${!NAME_FACTOR} * ${!NAME_DET:-1} * ${!NAME_PROC_FACTOR:-1} * ${!NAME_DEFAULT:-1}))}
179+
[[ ! -z ${EPN_GLOBAL_SCALING:-} && $1 != "gpu-reconstruction" ]] && MULT=$(($MULT * $EPN_GLOBAL_SCALING))
180+
if [[ -z ${NAME_PROC} && "0$GEN_TOPO_AUTOSCALE_PROCESSES" == "01" && ($WORKFLOWMODE != "print" || $GEN_TOPO_RUN_HOME_TEST == 1) && $4 != 0 ]]; then
181+
echo $1:\$\(\(\($MULT*\$AUTOSCALE_PROCESS_FACTOR/100\) \< 16 ? \($MULT*\$AUTOSCALE_PROCESS_FACTOR/100\) : 16\)\)
182+
else
183+
echo $1:$MULT
184+
fi
185+
}
186+
187+
math_max()
188+
{
189+
echo $(($1 > $2 ? $1 : $2))
190+
}
191+
math_min()
192+
{
193+
echo $(($1 < $2 ? $1 : $2))
194+
}
195+
196+
# ---------------------------------------------------------------------------------------------------------------------
197+
# Helper to check if root ouput is requested for certain process
198+
199+
needs_root_output()
200+
{
201+
local NAME_PROC_ENABLE_ROOT_OUTPUT="ENABLE_ROOT_OUTPUT_${1//-/_}"
202+
[[ ! -z ${!NAME_PROC_ENABLE_ROOT_OUTPUT+x} ]]
203+
}
204+
205+
# ---------------------------------------------------------------------------------------------------------------------
206+
# Helper to add binaries to workflow adding automatic and custom arguments
207+
208+
add_W() # Add binarry to workflow command USAGE: add_W [BINARY] [COMMAND_LINE_OPTIONS] [CONFIG_KEY_VALUES] [Add ARGS_ALL_CONFIG, optional, default = 1]
209+
{
210+
local NAME_PROC_ARGS="ARGS_EXTRA_PROCESS_${1//-/_}"
211+
local NAME_PROC_CONFIG="CONFIG_EXTRA_PROCESS_${1//-/_}"
212+
local KEY_VALUES=
213+
[[ "0${4:-}" != "00" ]] && KEY_VALUES+="$ARGS_ALL_CONFIG;"
214+
[[ ! -z "${3:-}" ]] && KEY_VALUES+="$3;"
215+
[[ ! -z ${!NAME_PROC_CONFIG:-} ]] && KEY_VALUES+="${!NAME_PROC_CONFIG};"
216+
[[ ! -z "$KEY_VALUES" ]] && KEY_VALUES="--configKeyValues \"$KEY_VALUES\""
217+
local WFADD="$1 $ARGS_ALL ${2:-} ${!NAME_PROC_ARGS:-} $KEY_VALUES | "
218+
local NAME_PROC_ENABLE_ROOT_OUTPUT="ENABLE_ROOT_OUTPUT_${1//-/_}"
219+
if [[ ! -z $DISABLE_ROOT_OUTPUT ]] && needs_root_output $1 ; then
220+
WFADD=${WFADD//$DISABLE_ROOT_OUTPUT/}
221+
fi
222+
WORKFLOW+=$WFADD
223+
}
224+
163225
fi # functions.sh sourced

‎DATA/common/setenv.sh‎

Lines changed: 69 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ if [[ -z "${TFLOOP:-}" ]]; then export TFLOOP=0; fi #
6464
if [[ -z "${NTIMEFRAMES:-}" ]]; then export NTIMEFRAMES=-1; fi # max number of time frames to process, <=0 : unlimited
6565
if [[ -z "${CTFDICT_NTF:-}" ]]; then export CTFDICT_NTF=100; fi # auto-save CTF dictionary after each CTFDICT_NTF TFs (if > 0)
6666
if [[ -z "${CTF_MAXDETEXT:-}" ]]; then export CTF_MAXDETEXT=0; fi # extend CTF output dir.name by detectors names if their number does not exceed this
67-
if [[ -z "${TFDELAY:-}" ]]; then export TFDELAY=100; fi # Delay in seconds between publishing time frames
67+
if [[ -z "${TFDELAY:-}" ]]; then export TFDELAY=0; fi # Delay in seconds between publishing time frames
6868
if [[ -z "${GPUTYPE:-}" ]]; then export GPUTYPE=CPU; fi # GPU Tracking backend to use, can be CPU / CUDA / HIP / OCL / OCL2
6969
if [[ -z "${DDSHMSIZE:-}" ]]; then export DDSHMSIZE=$(( 8 << 10 )); fi # Size of shared memory for DD Input
7070
if [[ -z "${DDHDRSIZE:-}" ]]; then export DDHDRSIZE=$(( 1 << 10 )); fi # Size of shared memory for DD Input
@@ -133,6 +133,74 @@ if [[ -z "${MULTIPLICITY_FACTOR_REST:-}" ]]; then export MULTIPLICITY_FACTOR_RES
133133

134134
if [[ `uname` == Darwin ]]; then export UDS_PREFIX=; else export UDS_PREFIX="@"; fi
135135

136+
# Env variables required for workflow setup
137+
if [[ $SYNCMODE == 1 ]]; then
138+
if [[ -z "${WORKFLOW_DETECTORS_MATCHING+x}" ]]; then export WORKFLOW_DETECTORS_MATCHING="ITSTPC,ITSTPCTRD,ITSTPCTOF,ITSTPCTRDTOF,PRIMVTX"; fi # Select matchings that are enabled in sync mode
139+
else
140+
if [[ -z "${WORKFLOW_DETECTORS_MATCHING+x}" ]]; then export WORKFLOW_DETECTORS_MATCHING="ALL"; fi # All matching / vertexing enabled in async mode
141+
fi
142+
143+
LIST_OF_ASYNC_RECO_STEPS="MID MCH MFT FDD FV0 ZDC HMP"
144+
145+
DISABLE_DIGIT_ROOT_INPUT="--disable-root-input"
146+
: ${DISABLE_DIGIT_CLUSTER_INPUT="--clusters-from-upstream"}
147+
148+
# Special detector related settings
149+
MID_FEEID_MAP="$FILEWORKDIR/mid-feeId_mapper.txt"
150+
151+
ITSMFT_STROBES=""
152+
[[ ! -z ${ITS_STROBE:-} ]] && ITSMFT_STROBES+="ITSAlpideParam.roFrameLengthInBC=$ITS_STROBE;"
153+
[[ ! -z ${MFT_STROBE:-} ]] && ITSMFT_STROBES+="MFTAlpideParam.roFrameLengthInBC=$MFT_STROBE;"
154+
155+
156+
# Set active reconstruction steps (defaults added according to SYNCMODE)
157+
for i in `echo $LIST_OF_GLORECO | sed "s/,/ /g"`; do
158+
has_processing_step MATCH_$i && add_comma_separated WORKFLOW_DETECTORS_MATCHING $i # Enable extra matchings requested via WORKFLOW_EXTRA_PROCESSING_STEPS
159+
done
160+
if [[ $SYNCMODE == 1 ]]; then # Add default steps for synchronous mode
161+
add_comma_separated WORKFLOW_EXTRA_PROCESSING_STEPS ENTROPY_ENCODER
162+
else # Add default steps for async mode
163+
for i in $LIST_OF_ASYNC_RECO_STEPS; do
164+
has_detector_reco $i && add_comma_separated WORKFLOW_EXTRA_PROCESSING_STEPS ${i}_RECO
165+
done
166+
add_comma_separated WORKFLOW_EXTRA_PROCESSING_STEPS TPC_DEDX
167+
fi
168+
169+
# Assemble matching sources
170+
TRD_SOURCES=
171+
TOF_SOURCES=
172+
TRACK_SOURCES=
173+
has_detectors_reco ITS TPC && has_detector_matching ITSTPC && add_comma_separated TRACK_SOURCES "ITS-TPC"
174+
has_detectors_reco TPC TRD && has_detector_matching TPCTRD && { add_comma_separated TRD_SOURCES TPC; add_comma_separated TRACK_SOURCES "TPC-TRD"; }
175+
has_detectors_reco ITS TPC TRD && has_detector_matching ITSTPCTRD && { add_comma_separated TRD_SOURCES ITS-TPC; add_comma_separated TRACK_SOURCES "ITS-TPC-TRD"; }
176+
has_detectors_reco TPC TOF && has_detector_matching TPCTOF && { add_comma_separated TOF_SOURCES TPC; add_comma_separated TRACK_SOURCES "TPC-TOF"; }
177+
has_detectors_reco ITS TPC TOF && has_detector_matching ITSTPC && has_detector_matching ITSTPCTOF && { add_comma_separated TOF_SOURCES ITS-TPC; add_comma_separated TRACK_SOURCES "ITS-TPC-TOF"; }
178+
has_detectors_reco TPC TRD TOF && has_detector_matching TPCTRD && has_detector_matching TPCTRDTOF && { add_comma_separated TOF_SOURCES TPC-TRD; add_comma_separated TRACK_SOURCES "TPC-TRD-TOF"; }
179+
has_detectors_reco ITS TPC TRD TOF && has_detector_matching ITSTPCTRD && has_detector_matching ITSTPCTRDTOF && { add_comma_separated TOF_SOURCES ITS-TPC-TRD; add_comma_separated TRACK_SOURCES "ITS-TPC-TRD-TOF"; }
180+
has_detectors_reco MFT MCH && has_detector_matching MFTMCH && add_comma_separated TRACK_SOURCES "MFT-MCH"
181+
has_detectors_reco MCH MID && has_detector_matching MCHMID && add_comma_separated TRACK_SOURCES "MCH-MID"
182+
for det in `echo $LIST_OF_DETECTORS | sed "s/,/ /g"`; do
183+
if [[ $LIST_OF_ASYNC_RECO_STEPS =~ (^| )${det}( |$) ]]; then
184+
has_detector ${det} && has_processing_step ${det}_RECO && add_comma_separated TRACK_SOURCES "$det"
185+
else
186+
has_detector_reco $det && add_comma_separated TRACK_SOURCES "$det"
187+
fi
188+
done
189+
190+
: ${VERTEXING_SOURCES:="$TRACK_SOURCES"}
191+
: ${VERTEX_TRACK_MATCHING_SOURCES:="$TRACK_SOURCES"}
192+
[[ ! -z $VERTEXING_SOURCES ]] && PVERTEX_CONFIG+=" --vertexing-sources $VERTEXING_SOURCES"
193+
[[ ! -z $VERTEX_TRACK_MATCHING_SOURCES ]] && PVERTEX_CONFIG+=" --vertex-track-matching-sources $VERTEX_TRACK_MATCHING_SOURCES"
194+
195+
if [[ -z ${SVERTEXING_SOURCES:-} ]]; then
196+
SVERTEXING_SOURCES="$VERTEXING_SOURCES"
197+
[[ -z ${TPC_TRACKS_SVERTEXING:-} ]] && SVERTEXING_SOURCES=$(echo $SVERTEXING_SOURCES | sed -E -e "s/(^|,)TPC(-TRD|-TOF)+//g" -e "s/,TPC,/,/")
198+
fi
199+
200+
# this option requires well calibrated timing beween different detectors, at the moment suppress it
201+
#has_detector_reco FT0 && PVERTEX_CONFIG+=" --validate-with-ft0"
202+
203+
# Sanity checks on env variables
136204
if [[ $(( $EXTINPUT + $CTFINPUT + $RAWTFINPUT + $DIGITINPUT )) -ge 2 ]]; then
137205
echo Only one of EXTINPUT / CTFINPUT / RAWTFINPUT / DIGITINPUT must be set
138206
exit 1

‎DATA/common/setenv_calib.sh‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,15 @@ if has_detector_calib TRD && has_detectors ITS TPC TRD && has_detector_matching
2424
if has_detector_calib EMC && has_detector_reco EMC; then CAN_DO_CALIB_EMC_BADCHANNELCALIB=1; CAN_DO_CALIB_EMC_TIMECALIB=1; else CAN_DO_CALIB_EMC_BADCHANNELCALIB=0; CAN_DO_CALIB_EMC_TIMECALIB=0; fi
2525
if has_detector_calib PHS && has_detector_reco PHS; then CAN_DO_CALIB_PHS_ENERGYCALIB=0; CAN_DO_CALIB_PHS_BADMAPCALIB=1; CAN_DO_CALIB_PHS_TURNONCALIB=1; CAN_DO_CALIB_PHS_RUNBYRUNCALIB=1; CAN_DO_CALIB_PHS_L1PHASE=1; else CAN_DO_CALIB_PHS_ENERGYCALIB=0; CAN_DO_CALIB_PHS_BADMAPCALIB=0; CAN_DO_CALIB_PHS_TURNONCALIB=0; CAN_DO_CALIB_PHS_RUNBYRUNCALIB=0; CAN_DO_CALIB_PHS_L1PHASE=0; fi
2626
if has_detector_calib CPV && has_detector_reco CPV; then CAN_DO_CALIB_CPV_GAIN=1; else CAN_DO_CALIB_CPV_GAIN=0; fi
27+
if has_detector_calib FT0; then CAN_DO_CALIB_FT0_TIMEOFFSET=1; else CAN_DO_CALIB_FT0_TIMEOFFSET=0; fi
2728
if has_detector_calib ZDC && has_processing_step ZDC_RECO; then CAN_DO_CALIB_ZDC_TDC=1; else CAN_DO_CALIB_ZDC_TDC=0; fi
2829
# for async recalibration
2930
if has_detector_calib EMC && has_detector_reco EMC && [[ $SYNCMODE != 1 ]]; then CAN_DO_CALIB_EMC_ASYNC_RECALIB=1; else CAN_DO_CALIB_EMC_ASYNC_RECALIB=0; fi
3031

3132
# additional individual settings for calibration workflows
32-
has_detector CTP && export CALIB_TPC_SCDCALIB_CTP_INPUT="--enable-ctp"
33+
if has_detector CTP; then export CALIB_TPC_SCDCALIB_CTP_INPUT="--enable-ctp"; else export CALIB_TPC_SCDCALIB_CTP_INPUT=""; fi
34+
# the slot length needs to be known both on the aggregator and the processing nodes, therefore it is defined (in seconds!) here
35+
: ${CALIB_TPC_SCDCALIB_SLOTLENGTH:=600}
3336

3437
if [[ $BEAMTYPE != "cosmic" ]] || [[ ${FORCECALIBRATIONS:-} == 1 ]] ; then
3538

@@ -114,8 +117,15 @@ if [[ $BEAMTYPE != "cosmic" ]] || [[ ${FORCECALIBRATIONS:-} == 1 ]] ; then
114117
if [[ $CAN_DO_CALIB_ZDC_TDC == 1 ]]; then
115118
if [[ -z ${CALIB_ZDC_TDC+x} ]]; then CALIB_ZDC_TDC=1; fi
116119
fi
120+
121+
# calibrations for FT0
122+
if [[ $CAN_DO_CALIB_FT0_TIMEOFFSET == 1 ]]; then
123+
if [[ -z ${CALIB_FT0_TIMEOFFSET+x} ]]; then CALIB_FT0_TIMEOFFSET=1; fi
124+
fi
117125
fi
118126

127+
( [[ -z ${CALIB_FT0_TIMEOFFSET:-} ]] || [[ $CAN_DO_CALIB_FT0_TIMEOFFSET == 0 ]] ) && CALIB_FT0_TIMEOFFSET=0
128+
119129
( [[ -z ${CALIB_PRIMVTX_MEANVTX:-} ]] || [[ $CAN_DO_CALIB_PRIMVTX_MEANVTX == 0 ]] ) && CALIB_PRIMVTX_MEANVTX=0
120130
( [[ -z ${CALIB_TOF_LHCPHASE:-} ]] || [[ $CAN_DO_CALIB_TOF_LHCPHASE == 0 ]] ) && CALIB_TOF_LHCPHASE=0
121131
( [[ -z ${CALIB_TOF_CHANNELOFFSETS:-} ]] || [[ $CAN_DO_CALIB_TOF_CHANNELOFFSETS == 0 ]] ) && CALIB_TOF_CHANNELOFFSETS=0
@@ -125,6 +135,7 @@ fi
125135
( [[ -z ${CALIB_TPC_RESPADGAIN:-} ]] || [[ $CAN_DO_CALIB_TPC_RESPADGAIN == 0 ]] ) && CALIB_TPC_RESPADGAIN=0
126136
( [[ -z ${CALIB_TPC_IDC:-} ]] || [[ $CAN_DO_CALIB_TPC_IDC == 0 ]] ) && CALIB_TPC_IDC=0
127137
( [[ -z ${CALIB_TPC_SAC:-} ]] || [[ $CAN_DO_CALIB_TPC_SAC == 0 ]] ) && CALIB_TPC_SAC=0
138+
( [[ -z ${CALIB_TPC_VDRIFTTGL:-} ]] || [[ $CAN_DO_CALIB_TPC_VDRIFTTGL == 0 ]] ) && CALIB_TPC_VDRIFTTGL=0
128139
( [[ -z ${CALIB_TRD_VDRIFTEXB:-} ]] || [[ $CAN_DO_CALIB_TRD_VDRIFTEXB == 0 ]] ) && CALIB_TRD_VDRIFTEXB=0
129140
( [[ -z ${CALIB_EMC_BADCHANNELCALIB:-} ]] || [[ $CAN_DO_CALIB_EMC_BADCHANNELCALIB == 0 ]] ) && CALIB_EMC_BADCHANNELCALIB=0
130141
( [[ -z ${CALIB_EMC_TIMECALIB:-} ]] || [[ $CAN_DO_CALIB_EMC_TIMECALIB == 0 ]] ) && CALIB_EMC_TIMECALIB=0
@@ -158,6 +169,7 @@ if [[ "0${GEN_TOPO_VERBOSE:-}" == "01" ]]; then
158169
echo "CALIB_TPC_SAC = $CALIB_TPC_SAC" 1>&2
159170
echo "CALIB_CPV_GAIN = $CALIB_CPV_GAIN" 1>&2
160171
echo "CALIB_ZDC_TDC = $CALIB_ZDC_TDC" 1>&2
172+
echo "CALIB_FT0_TIMEOFFSET = $CALIB_FT0_TIMEOFFSET" 1>&2
161173
echo "Calibrations for async:" 1>&2
162174
echo "CALIB_EMC_ASYNC_RECALIB = $CALIB_EMC_ASYNC_RECALIB" 1>&2
163175
fi
@@ -175,8 +187,6 @@ if [[ -z ${CALIBDATASPEC_BARREL_TF:-} ]]; then
175187
if [[ $CALIB_TPC_SCDCALIB == 1 ]]; then
176188
add_semicolon_separated CALIBDATASPEC_BARREL_TF "unbinnedTPCResiduals:GLO/UNBINNEDRES/0"
177189
add_semicolon_separated CALIBDATASPEC_BARREL_TF "trackReferences:GLO/TRKREFS/0"
178-
# the slot length needs to be known both on the aggregator and the processing nodes, therefore it is defined (in seconds!) here
179-
[[ -z ${CALIB_TPC_SCDCALIB_SLOTLENGTH:-} ]] && export CALIB_TPC_SCDCALIB_SLOTLENGTH=600
180190
fi
181191
if [[ $CALIB_TPC_SCDCALIB == 1 ]] && [[ ${CALIB_TPC_SCDCALIB_SENDTRKDATA:-} == "1" ]]; then add_semicolon_separated CALIBDATASPEC_BARREL_TF "tpcInterpTrkData:GLO/TRKDATA/0"; fi
182192
if [[ $CALIB_TPC_SCDCALIB == 1 ]] && [[ ${CALIB_TPC_SCDCALIB_CTP_INPUT:-} == "--enable-ctp" ]]; then
@@ -247,6 +257,10 @@ if [[ -z ${CALIBDATASPEC_FORWARD_TF:-} ]]; then
247257
add_semicolon_separated CALIBDATASPEC_FORWARD_TF "tdcZDC:ZDC/TDCCALIBDATA/0"
248258
add_semicolon_separated CALIBDATASPEC_FORWARD_TF "histoZDC:ZDC/TDC_1DH"
249259
fi
260+
# FT0
261+
if [[ $CALIB_FT0_TIMEOFFSET == 1 ]]; then
262+
add_semicolon_separated CALIBDATASPEC_FORWARD_TF "timeSpectraFT0:FT0/TIME_SPECTRA/0"
263+
fi
250264
fi
251265

252266
if [[ "0${GEN_TOPO_VERBOSE:-}" == "01" ]]; then

‎DATA/production/calib/ft0-timeoffset-aggregator.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ source common/setenv.sh
77
source common/getCommonArgs.sh
88

99
PROXY_INSPEC_EOS="eos:***/INFORMATION"
10-
PROXY_INSPEC="calib:FT0/CALIB_INFO/0;${PROXY_INSPEC_EOS}"
10+
PROXY_INSPEC="calib:FT0/TIME_SPECTRA/0;${PROXY_INSPEC_EOS}"
1111
CALIB_TIME_OFFSET_CONFIG="FT0CalibParam.mNExtraSlots=0"
1212

1313
WORKFLOW="o2-dpl-raw-proxy ${ARGS_ALL} --proxy-name ft0-timeoffset-input-proxy --dataspec \"${PROXY_INSPEC}\" --network-interface ib0 --channel-config \"name=ft0-timeoffset-input-proxy,method=bind,type=pull,rateLogging=1,transport=zeromq\" | "

‎DATA/production/calib/ft0-timeoffset-processing.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ source common/getCommonArgs.sh
99
PROXY_INSPEC_EOS="eos:***/INFORMATION"
1010
PROXY_INSPEC_DD="dd:FLP/DISTSUBTIMEFRAME/0"
1111
PROXY_INSPEC="digits:FT0/DIGITSBC/0;channels:FT0/DIGITSCH/0;${PROXY_INSPEC_DD};${PROXY_INSPEC_EOS}"
12-
PROXY_OUTSPEC="calib:FT0/CALIB_INFO/0"
12+
PROXY_OUTSPEC="calib:FT0/TIME_SPECTRA/0"
1313
PROXY_NAME="ft0-timeoffset-input-proxy"
1414
WORKFLOW="o2-dpl-raw-proxy ${ARGS_ALL} --dataspec \"${PROXY_INSPEC}\" --channel-config \"name=readout-proxy,type=pull,method=connect,address=ipc://@${INRAWCHANNAME},transport=shmem,rateLogging=1\" | "
1515
WORKFLOW+="o2-calibration-ft0-time-spectra-processor ${ARGS_ALL} | "

‎DATA/production/calib/tpc-pedestal.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ CALIB_INSPEC="A:TPC/RAWDATA;dd:FLP/DISTSUBTIMEFRAME/0;eos:***/INFORMATION"
1515

1616
CALIB_CONFIG="TPCCalibPedestal.LastTimeBin=12000"
1717
EXTRA_CONFIG=" "
18-
EXTRA_CONFIG=" --publish-after-tfs 100 --max-events 120 --lanes 36"
18+
EXTRA_CONFIG=" --publish-after-tfs 400 --max-events 30 --lanes 36"
1919
CCDB_PATH="--ccdb-path http://o2-ccdb.internal"
2020
HOST=localhost
2121
QC_CONFIG="consul-json://aliecs.cern.ch:8500/o2/components/qc/ANY/any/tpc-raw-qcmn"

‎DATA/production/calib/tpc-pulser.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ CALIB_INSPEC="A:TPC/RAWDATA;dd:FLP/DISTSUBTIMEFRAME/0;eos:***/INFORMATION"
1515
CALIB_CONFIG="TPCCalibPulser.FirstTimeBin=80;TPCCalibPulser.LastTimeBin=260;TPCCalibPulser.NbinsQtot=250;TPCCalibPulser.XminQtot=10;TPCCalibPulser.XmaxQtot=510;TPCCalibPulser.NbinsWidth=100;TPCCalibPulser.XminWidth=0.3;TPCCalibPulser.XmaxWidth=0.7;TPCCalibPulser.MinimumQtot=30;TPCCalibPulser.MinimumQmax=25;TPCCalibPulser.XminT0=125;TPCCalibPulser.XmaxT0=145;TPCCalibPulser.NbinsT0=800"
1616

1717
EXTRA_CONFIG=" "
18-
EXTRA_CONFIG="--calib-type pulser --publish-after-tfs 30 --max-events 120 --lanes 36"
18+
EXTRA_CONFIG="--calib-type pulser --publish-after-tfs 100 --max-events 120 --lanes 36"
1919

2020
CCDB_PATH="--ccdb-path http://o2-ccdb.internal"
2121
HOST=localhost

‎DATA/production/common/getStat.sh‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@ nCTFsProcessed=$((nCTFsProcessed + 1))
1414

1515
if [[ $nCTFsFilesInspected != $((nCTFsFilesFailed + nCTFsFilesOK)) ]]; then
1616
echo "Something went wrong with parsing the log file: CTF files inspected ($nCTFsFilesInspected) is not the sum of those successfully processed ($nCTFsFilesOK) and those that failed ($nCTFsFilesFailed)"
17-
else
18-
while read -r line; do
19-
currentPVs=`echo $line | sed 's/^.*Found \([0-9]*\) PVs.*/\1/'`
20-
PVs=$((PVs + currentPVs))
21-
done < <(grep "Found" $1 | grep "PVs")
2217
fi
18+
while read -r line; do
19+
currentPVs=`echo $line | sed 's/^.*Found \([0-9]*\) PVs.*/\1/'`
20+
PVs=$((PVs + currentPVs))
21+
done < <(grep "Found" $1 | grep "PVs")
2322

2423
echo CTFsFilesProcessedMsg = $CTFsFilesProcessedMsg
2524
echo nCTFsFilesInspected = $nCTFsFilesInspected

‎DATA/production/configurations/2021/OCT/apass4/async_pass.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ fi
143143

144144
ln -sf $O2DPG_ROOT/DATA/common/setenv.sh
145145
ln -sf $O2DPG_ROOT/DATA/common/getCommonArgs.sh
146-
ln -sf $O2_ROOT/prodtests/full-system-test/workflow-setup.sh
147146

148147
# reco and matching
149148
# print workflow

‎DATA/production/configurations/2021/OCT/apass5/async_pass.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ fi
143143

144144
ln -sf $O2DPG_ROOT/DATA/common/setenv.sh
145145
ln -sf $O2DPG_ROOT/DATA/common/getCommonArgs.sh
146-
ln -sf $O2_ROOT/prodtests/full-system-test/workflow-setup.sh
147146

148147
# reco and matching
149148
# print workflow

0 commit comments

Comments
 (0)