Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "ZDC: Add configuration file PbPb, modify configuration file pp, add s…" #1702

Merged
merged 1 commit into from
Jul 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 9 additions & 16 deletions DATA/production/qc-async/zdc.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
"name": "not_applicable"
},
"Activity": {
"number": "42",
"type": "2"
},
"monitoring": {
"url": "influxdb-unix:///tmp/telegraf.sock"
Expand All @@ -35,23 +37,15 @@
},
"taskParameters": {
"ADC": "3025;-100;12000",
"ADCZEM": "3025;-100;12000",
"ADCH": "1100;-100;1000",
"TDCT": "2400;-13.5;11.45",
"TDCT": "2400;-25;25",
"TDCA": "2050;-0.5;4099.5",
"TDCAH": "520;-20;500",
"TDCAZEM": "2050;-0.5;4099.5",
"ADCSUMvsTC": "121;-100;12000;121;-100;12000",
"ADCZEMvsADCZEM": "121;-100;12000;121;-100;12000",
"ADCZEMvsTC": "121;-100;12000;121;-100;12000",
"ADCvsTDCT": "120;-13.5;11.45;121;-100;12000",
"ADCZEMvsTDCT": "120;-13.5;11.45;121;-100;12000",
"TDCDIFF": "240;-27;22.90;240;-27;22.90",
"TDCAvsTDCT": "120;-13.5;11.45;125;-1;3999",
"TDCAZEMvsTDCT": "120;-13.5;11.45;125;-1;3999",
"TDCAvsTDCA": "125;-1;3999;125;-1;3999",
"TDCAZEMvsTDCAZEM": "125;-1;3999;125;-1;3999",
"TDCAZEMvsTDCA": "125;-1;3999;125;-1;3999",
"TDCAH": "2000;-0.5;3999.5",
"ADCSUMvsTC": "605;-100;12000;605;-100;12000",
"ADCvsTDCT": "240;-25;25;605;-100;12000",
"TDCDIFF": "240;-25;25;240;-25;25",
"TDCAvsTDCT": "480;-25;25;500;-1;3999",
"TDCAvsTDCA": "500;-1;3999;500;-1;3999",
"CENTR_ZNA": "200;-2;2;200;-2;2",
"CENTR_ZNC": "200;-2;2;200;-2;2",
"CENTR_ZPA": "2240;0;22.4",
Expand All @@ -61,4 +55,3 @@
}
}
}

64 changes: 0 additions & 64 deletions DATA/production/qc-async/zdcPbPb.json

This file was deleted.

8 changes: 1 addition & 7 deletions DATA/production/qc-workflow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -183,20 +183,14 @@ elif [[ -z ${QC_JSON_FROM_OUTSIDE:-} ]]; then
[[ -z "${QC_JSON_FV0:-}" ]] && QC_JSON_FV0=$O2DPG_ROOT/DATA/production/qc-async/fv0.json
[[ -z "${QC_JSON_FDD:-}" ]] && QC_JSON_FDD=$O2DPG_ROOT/DATA/production/qc-async/fdd.json
[[ -z "${QC_JSON_MID:-}" ]] && QC_JSON_MID=$O2DPG_ROOT/DATA/production/qc-async/mid.json
[[ -z "${QC_JSON_ZDC:-}" ]] && has_processing_step ZDC_RECO && QC_JSON_ZDC=$O2DPG_ROOT/DATA/production/qc-async/zdc.json
if [[ -z "${QC_JSON_EMC:-}" ]]; then
if [[ "$BEAMTYPE" == "PbPb" ]]; then
QC_JSON_EMC=$O2DPG_ROOT/DATA/production/qc-async/emc_PbPb.json
else
QC_JSON_EMC=$O2DPG_ROOT/DATA/production/qc-async/emc.json
fi
fi
if [[ -z "${QC_JSON_ZDC:-}" ]] && has_processing_step ZDC_RECO; then
if [[ "$BEAMTYPE" == "PbPb" ]]; then
QC_JSON_ZDC=$O2DPG_ROOT/DATA/production/qc-async/zdcPbPb.json
else
QC_JSON_ZDC=$O2DPG_ROOT/DATA/production/qc-async/zdc.json
fi
fi
if has_detector_qc MCH && [[ -z "${QC_JSON_MCH:-}" ]]; then
add_QC_JSON MCH_DIGITS $O2DPG_ROOT/DATA/production/qc-async/mch-digits.json
if has_processing_step "MCH_RECO"; then
Expand Down