From ca75aa4880226faefac27f199f16529811cad9fa Mon Sep 17 00:00:00 2001 From: GernotMaier Date: Wed, 15 Apr 2026 09:16:45 +0200 Subject: [PATCH 01/12] read nsb/ze from json file --- .../IRF.trainXGBforGammaHadronSeparationTraining.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/scripts/IRF.trainXGBforGammaHadronSeparationTraining.sh b/scripts/IRF.trainXGBforGammaHadronSeparationTraining.sh index 388eb94..e82dd44 100755 --- a/scripts/IRF.trainXGBforGammaHadronSeparationTraining.sh +++ b/scripts/IRF.trainXGBforGammaHadronSeparationTraining.sh @@ -1,11 +1,7 @@ #!/bin/bash # train XGB for gamma/hadron separation # -# note the large amount of hardwired parameters in this scripts: -# - zenith angles to be trained # - training at wobble offsets 0.5 deg only -# - fixed of NSB levels (adapted to stdHV settings) -# h_cpu=11:59:59; h_vmem=16000M; tmpdir_size=24G EDVERSION=$(cat $VERITAS_EVNDISP_AUX_DIR/IRFVERSION) @@ -101,9 +97,9 @@ RUNPAR_CONTENT=$(cat "$RUNPAR") echo "Number of energy bins: $NENE" ##################################### -# zenith angle bins of MC simulation files -ZENITH_ANGLES=( 20 30 35 40 45 50 55 60 65) -NOISE_VALUES=(100 160 200 250 350 450) +# zenith angle / NSB bins of MC simulation files +ZENITH_ANGLES=($(jq -r '.input_zenith_angles[]' "$RUNPAR")) +NOISE_VALUES=($(jq -r '.input_noise_values[]' "$RUNPAR")) #################################### # Run prefix From d13ef86d01b9fa123f526bb406c42b19a7efae8e Mon Sep 17 00:00:00 2001 From: GernotMaier Date: Wed, 15 Apr 2026 10:18:55 +0200 Subject: [PATCH 02/12] simplify --- scripts/IRF.production.sh | 2 +- .../IRF.trainXGBforGammaHadronSeparationTraining.sh | 12 ++++++++---- scripts/helper_scripts/IRF.dispXGB_sub.sh | 1 - 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/IRF.production.sh b/scripts/IRF.production.sh index ab34e4a..eb471b6 100755 --- a/scripts/IRF.production.sh +++ b/scripts/IRF.production.sh @@ -322,7 +322,7 @@ for VX in $EPOCH; do ############################################# # XGB Classification Training if [[ $IRFTYPE == "TRAINXGBGH" ]]; then - BCKDIR="$VERITAS_IRFPRODUCTION_DIR/$EDVERSION/${ANATYPE}/BDTtraining/mscw_${VX:0:2}_DISP" + BCKDIR="$VERITAS_IRFPRODUCTION_DIR/$EDVERSION/${ANATYPE}/BDTtraining/mscw_${VX:0:2}_XGB" RUNPAR="$VERITAS_EVNDISP_AUX_DIR/ParameterFiles/XGB-classify-parameter.json" ODIR="$VERITAS_IRFPRODUCTION_DIR/$EDVERSION/${ANATYPE}/${SIMTYPE}/${VX}_ATM${ATM}_gamma/TrainXGBGammaHadron" echo "XGB Classification Training" diff --git a/scripts/IRF.trainXGBforGammaHadronSeparationTraining.sh b/scripts/IRF.trainXGBforGammaHadronSeparationTraining.sh index e82dd44..2b76079 100755 --- a/scripts/IRF.trainXGBforGammaHadronSeparationTraining.sh +++ b/scripts/IRF.trainXGBforGammaHadronSeparationTraining.sh @@ -91,10 +91,11 @@ mkdir -p $LOGDIR mkdir -p $ODIR ##################################### -# energy bins +# energy / zenith bins NENE=$(jq '.energy_bins_log10_tev | length' "$RUNPAR") +NEZE=$(jq '.zenith_bins_deg | length' "$RUNPAR") RUNPAR_CONTENT=$(cat "$RUNPAR") -echo "Number of energy bins: $NENE" +echo "Number of energy / zenith bins: $NENE $NEZE" ##################################### # zenith angle / NSB bins of MC simulation files @@ -145,13 +146,16 @@ BCKLIST="${ODIR}/bck_files.list" echo "Background file list: $BCKLIST" rm -f "${BCKLIST}" touch "${BCKLIST}" -for ((i=0; i<=2; i++)); do +tmpfile=$(mktemp) +for ((i=0; i<${NEZE}; i++)); do if [[ ! -d "${BDIR}/Ze_${i}" ]]; then echo "Error, directory with background files ${BDIR}/Ze_${i} not found, exiting..." exit 1 fi - find ${BDIR}/Ze_${i} -name "*.root" | sort -R | head -n 1000 >> "${BCKLIST}" + find ${BDIR}/Ze_${i} -name "*.root" | shuf -n 1000 >> "${tmpfile}" done +shuf "$tmpfile" > "${BCKLIST}" +rm "$tmpfile" ############################################################### # loop over energy bins and submit a job for each bin diff --git a/scripts/helper_scripts/IRF.dispXGB_sub.sh b/scripts/helper_scripts/IRF.dispXGB_sub.sh index 1fcec64..0e40129 100755 --- a/scripts/helper_scripts/IRF.dispXGB_sub.sh +++ b/scripts/helper_scripts/IRF.dispXGB_sub.sh @@ -4,7 +4,6 @@ # Don't do set -e. # set -e -# parameters replaced by parent script using sed MSCW_FILE=FFILE ODIR=OODIR env_name="eventdisplay_ml" From 46cf2c74c9ff3ac3a3bd718383f13f8187f17a42 Mon Sep 17 00:00:00 2001 From: GernotMaier Date: Wed, 29 Apr 2026 09:17:30 +0200 Subject: [PATCH 03/12] simplification --- scripts/IRF.mscw_energy_MC.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/IRF.mscw_energy_MC.sh b/scripts/IRF.mscw_energy_MC.sh index d1ee5b1..4a4f5f5 100755 --- a/scripts/IRF.mscw_energy_MC.sh +++ b/scripts/IRF.mscw_energy_MC.sh @@ -96,7 +96,7 @@ if [[ ! -d $INDIR ]]; then fi # output and log directories ODIR="$VERITAS_IRFPRODUCTION_DIR/$EDVERSION/${ANALYSIS_TYPE}/$SIMTYPE/${EPOCH}_ATM${ATM}_gamma" -LOGDIR="$VERITAS_IRFPRODUCTION_DIR/$EDVERSION/${ANALYSIS_TYPE}/${SIMTYPE}/${EPOCH}_ATM${ATM}_gamma/submit-MSCW-RECID${RECID}-${UUID}" +LOGDIR="${ODIR}/submit-MSCW-RECID${RECID}-${UUID}" mkdir -p "$LOGDIR" echo "Input: $INDIR" echo "Output: $ODIR" From 8bc32e433332434999261dd2138eb299fef11b3f Mon Sep 17 00:00:00 2001 From: GernotMaier Date: Thu, 30 Apr 2026 09:51:53 +0200 Subject: [PATCH 04/12] simplify logdir --- scripts/IRF.generate_lookup_table_parts.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/IRF.generate_lookup_table_parts.sh b/scripts/IRF.generate_lookup_table_parts.sh index 203cb03..0a4872f 100755 --- a/scripts/IRF.generate_lookup_table_parts.sh +++ b/scripts/IRF.generate_lookup_table_parts.sh @@ -76,7 +76,7 @@ if [[ ! -d $INDIR ]]; then fi # output and log directories ODIR="$VERITAS_IRFPRODUCTION_DIR/$EDVERSION/${ANALYSIS_TYPE}/$SIMTYPE/${EPOCH}_ATM${ATM}_gamma/Tables" -LOGDIR="$VERITAS_IRFPRODUCTION_DIR/$EDVERSION/${ANALYSIS_TYPE}/${SIMTYPE}/${EPOCH}_ATM${ATM}_gamma/submit-MAKETABLES-${UUID}/" +LOGDIR="${ODIR}/submit-MAKETABLES-${UUID}/" mkdir -p "$ODIR" chmod g+w "$ODIR" mkdir -p "$LOGDIR" From 05a20d6321c4c9b1f0c84765e678a9d1032b21f7 Mon Sep 17 00:00:00 2001 From: GernotMaier Date: Fri, 1 May 2026 11:13:29 +0200 Subject: [PATCH 05/12] simplification --- scripts/IRF.trainTMVAforAngularReconstruction.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/IRF.trainTMVAforAngularReconstruction.sh b/scripts/IRF.trainTMVAforAngularReconstruction.sh index 03cf185..c9f5a22 100755 --- a/scripts/IRF.trainTMVAforAngularReconstruction.sh +++ b/scripts/IRF.trainTMVAforAngularReconstruction.sh @@ -63,7 +63,7 @@ if [[ -z "$VERITAS_IRFPRODUCTION_DIR" ]]; then fi # output and log directories ODIR="$VERITAS_IRFPRODUCTION_DIR/$EDVERSION/${ANALYSIS_TYPE}/$SIMTYPE/${EPOCH}_ATM${ATM}_gamma/TMVA_AngularReconstruction/ze${ZA}deg/" -LOGDIR="$VERITAS_IRFPRODUCTION_DIR/$EDVERSION/${ANALYSIS_TYPE}/${SIMTYPE}/${EPOCH}_ATM${ATM}_gamma/submit-TMVAAngRes-RECID${RECID}-${UUID}" +LOGDIR="${ODIR}/submit-TMVAAngRes-RECID${RECID}-${UUID}" mkdir -p "$ODIR" chmod g+w "$ODIR" mkdir -p "$LOGDIR" From a44c32bf250b909d8ad5a061301592aedfdd7362 Mon Sep 17 00:00:00 2001 From: GernotMaier Date: Fri, 1 May 2026 11:14:29 +0200 Subject: [PATCH 06/12] pwd --- scripts/IRF.production.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/IRF.production.sh b/scripts/IRF.production.sh index eb471b6..28caf24 100755 --- a/scripts/IRF.production.sh +++ b/scripts/IRF.production.sh @@ -210,9 +210,9 @@ elif [[ "${SIMTYPE}" == "CARE_202404" ]] || [[ "${SIMTYPE}" == "CARE_24_20" ]]; ###################################### # TEST # ZENITH_ANGLES=( 00 20 30 35 40 45 ) - # ZENITH_ANGLES=( 60 65 ) + # ZENITH_ANGLES=( 50 55 60 65 ) # WOBBLE_OFFSETS=( 0.5 ) - # NSB_LEVELS=( 160 ) + # NSB_LEVELS=( 200 ) # IRF comparison # ZENITH_ANGLES=( 20 40 50 60 65 ) # WOBBLE_OFFSETS=( 0.5 1.0 1.5 ) @@ -466,6 +466,7 @@ for VX in $EPOCH; do for ID in $RECID; do TFIL="${TABLECOM}" # note: the IDs dependent on what is written in EVNDISP.reconstruction.runparameter + # TFILID=$TFIL$ANATYPE"_flat" TFILID=$TFIL$ANATYPE # run mscw only EFFAREACUTLIST="NOEFFAREA" From aba76f5df9cdc4352a6dafd002b00dd2ec4222f2 Mon Sep 17 00:00:00 2001 From: GernotMaier Date: Fri, 1 May 2026 11:22:40 +0200 Subject: [PATCH 07/12] simplifiy --- scripts/IRF.combine_lookup_table_parts.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/IRF.combine_lookup_table_parts.sh b/scripts/IRF.combine_lookup_table_parts.sh index 4b8b8a5..f7cc1fe 100755 --- a/scripts/IRF.combine_lookup_table_parts.sh +++ b/scripts/IRF.combine_lookup_table_parts.sh @@ -80,7 +80,7 @@ if [[ -f $OFILE ]]; then fi # run scripts and output are written into this directory -LOGDIR="$VERITAS_USER_LOG_DIR/$DATE/MSCW.MAKETABLES/${ANALYSIS_TYPE}/submit-COMBINETABLES-${UUID}/" +LOGDIR="${ODIR}/submit-COMBINETABLES-${UUID}/" echo -e "Log files will be written to:\n $LOGDIR" mkdir -p "$LOGDIR" From 6a3a231988cb1a9e4ebf5ffd719eb05a86b95f96 Mon Sep 17 00:00:00 2001 From: GernotMaier Date: Fri, 1 May 2026 14:50:02 +0200 Subject: [PATCH 08/12] output dir --- scripts/IRF.mscw_energy_MC.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/IRF.mscw_energy_MC.sh b/scripts/IRF.mscw_energy_MC.sh index 4a4f5f5..0a35565 100755 --- a/scripts/IRF.mscw_energy_MC.sh +++ b/scripts/IRF.mscw_energy_MC.sh @@ -97,6 +97,8 @@ fi # output and log directories ODIR="$VERITAS_IRFPRODUCTION_DIR/$EDVERSION/${ANALYSIS_TYPE}/$SIMTYPE/${EPOCH}_ATM${ATM}_gamma" LOGDIR="${ODIR}/submit-MSCW-RECID${RECID}-${UUID}" +mkdir -p "$ODIR" +chmod g+w "$ODIR" mkdir -p "$LOGDIR" echo "Input: $INDIR" echo "Output: $ODIR" From 48e70fffdef54501d430949a0dd772531f45109b Mon Sep 17 00:00:00 2001 From: GernotMaier Date: Sat, 2 May 2026 15:24:06 +0200 Subject: [PATCH 09/12] re-organize DispBDT zenith angle directories --- .../helper_scripts/IRF.mscw_energy_MC_sub.sh | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/scripts/helper_scripts/IRF.mscw_energy_MC_sub.sh b/scripts/helper_scripts/IRF.mscw_energy_MC_sub.sh index 0a2f2de..3fd4d16 100755 --- a/scripts/helper_scripts/IRF.mscw_energy_MC_sub.sh +++ b/scripts/helper_scripts/IRF.mscw_energy_MC_sub.sh @@ -96,14 +96,23 @@ if [ $DISPBDT -eq 1 ]; then else DISPDIR="${VERITAS_EVNDISP_AUX_DIR}/DispBDTs/${ANATYPE}/${EPOCH}_ATM${ATM}/" fi + # zenith angle dependent disp training; important at large zenith if [[ "${ZA}" -lt "38" ]]; then - DISPDIR="${DISPDIR}/SZE/" + DISPDIR="${DISPDIR}/20deg/" elif [[ "${ZA}" -lt "48" ]]; then - DISPDIR="${DISPDIR}/MZE/" + DISPDIR="${DISPDIR}/45deg/" elif [[ "${ZA}" -lt "58" ]]; then - DISPDIR="${DISPDIR}/LZE/" + DISPDIR="${DISPDIR}/55deg/" + elif [[ "${ZA}" -lt "62" ]]; then + DISPDIR="${DISPDIR}/60deg/" + if [[ ${SIMTYPE} == "CARE_RedHV" ]]; then # fix for incomplete MC set + DISPDIR="${DISPDIR}/55deg/" + fi else - DISPDIR="${DISPDIR}/XZE/" + DISPDIR="${DISPDIR}/65deg/" + if [[ ${SIMTYPE} == "CARE_RedHV" ]]; then # fix for incomplete MC set + DISPDIR="${DISPDIR}/55deg/" + fi fi # unzip XML files into DDIR cp -v -f ${DISPDIR}/*.xml.gz ${DDIR}/ From 596ec4fe0505f4efcb54b199ef347f63e1f60104 Mon Sep 17 00:00:00 2001 From: GernotMaier Date: Wed, 6 May 2026 09:18:35 +0200 Subject: [PATCH 10/12] disable curved --- scripts/IRF.generate_effective_area_parts.sh | 2 +- scripts/IRF.generate_lookup_table_parts.sh | 7 ++++--- scripts/IRF.mscw_energy_MC.sh | 5 +++-- scripts/IRF.production.sh | 10 +++++----- scripts/IRF.trainTMVAforAngularReconstruction.sh | 7 ++++--- scripts/helper_scripts/IRF.mscw_energy_MC_sub.sh | 2 +- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/scripts/IRF.generate_effective_area_parts.sh b/scripts/IRF.generate_effective_area_parts.sh index 986ac16..2b40967 100755 --- a/scripts/IRF.generate_effective_area_parts.sh +++ b/scripts/IRF.generate_effective_area_parts.sh @@ -84,7 +84,7 @@ if [[ ${DISPBDT} == "1" ]]; then fi # output and log directories ODIR="$VERITAS_IRFPRODUCTION_DIR/$IRFVERSION/${ANALYSIS_TYPE}/$SIMTYPE/${EPOCH}_ATM${ATM}_gamma" -LOGDIR="$VERITAS_IRFPRODUCTION_DIR/$IRFVERSION/${ANALYSIS_TYPE}/${SIMTYPE}/${EPOCH}_ATM${ATM}_gamma/submit-EFFAREA-RECID${RECID}-${UUID}" +LOGDIR="${ODIR}/submit-EFFAREA-RECID${RECID}-${UUID}" mkdir -p "$LOGDIR" echo "Input: $INDIR" echo "Output: $ODIR" diff --git a/scripts/IRF.generate_lookup_table_parts.sh b/scripts/IRF.generate_lookup_table_parts.sh index 0a4872f..13b8b05 100755 --- a/scripts/IRF.generate_lookup_table_parts.sh +++ b/scripts/IRF.generate_lookup_table_parts.sh @@ -64,12 +64,13 @@ if [[ -z "$VERITAS_IRFPRODUCTION_DIR" ]]; then echo "Error: IRF production directory not found: $VERITAS_IRFPRODUCTION_DIR" exit 1 fi -# input directory containing evndisp products (first check for curved, than normal atmosphere) -INDIR="$VERITAS_IRFPRODUCTION_DIR/${EVNIRFVERSION}/${ANALYSIS_TYPE}/$SIMTYPE/${EPOCH}_ATM${ATM}_gamma/ze${ZA}deg_curved_offset${WOBBLE}deg_NSB${NOISE}MHz" +# input directory containing evndisp products +# CURVED_ATMOSPHERE_MC INDIR="$VERITAS_IRFPRODUCTION_DIR/${EVNIRFVERSION}/${ANALYSIS_TYPE}/$SIMTYPE/${EPOCH}_ATM${ATM}_gamma/ze${ZA}deg_curved_offset${WOBBLE}deg_NSB${NOISE}MHz" +INDIR="$VERITAS_IRFPRODUCTION_DIR/${EVNIRFVERSION}/${ANALYSIS_TYPE}/$SIMTYPE/${EPOCH}_ATM${ATM}_gamma/ze${ZA}deg_offset${WOBBLE}deg_NSB${NOISE}MHz" if [[ ! -d $INDIR ]]; then INDIR="$VERITAS_IRFPRODUCTION_DIR/${EVNIRFVERSION}/${ANALYSIS_TYPE}/$SIMTYPE/${EPOCH}_ATM${ATM}_gamma/ze${ZA}deg_offset${WOBBLE}deg_NSB${NOISE}MHz" if [[ ! -d $INDIR ]]; then - echo "Error, could not locate input directory. Locations searched (plus curved):" + echo "Error, could not locate input directory. Locations searched (minus curved):" echo "$INDIR" exit 1 fi diff --git a/scripts/IRF.mscw_energy_MC.sh b/scripts/IRF.mscw_energy_MC.sh index 0a35565..8aa705f 100755 --- a/scripts/IRF.mscw_energy_MC.sh +++ b/scripts/IRF.mscw_energy_MC.sh @@ -85,11 +85,12 @@ if [[ -z "$VERITAS_IRFPRODUCTION_DIR" ]]; then exit 1 fi # input directory containing evndisp products (first check for curved, than normal atmosphere) -INDIR="$VERITAS_IRFPRODUCTION_DIR/${EVNIRFVERSION}/${ANALYSIS_TYPE}/$SIMTYPE/${EPOCH}_ATM${ATM}_gamma/ze${ZA}deg_curved_offset${WOBBLE}deg_NSB${NOISE}MHz" +# CURVED_ATMOSPHERE_MC INDIR="$VERITAS_IRFPRODUCTION_DIR/${EVNIRFVERSION}/${ANALYSIS_TYPE}/$SIMTYPE/${EPOCH}_ATM${ATM}_gamma/ze${ZA}deg_curved_offset${WOBBLE}deg_NSB${NOISE}MHz" +INDIR="$VERITAS_IRFPRODUCTION_DIR/${EVNIRFVERSION}/${ANALYSIS_TYPE}/$SIMTYPE/${EPOCH}_ATM${ATM}_gamma/ze${ZA}deg_offset${WOBBLE}deg_NSB${NOISE}MHz" if [[ ! -d $INDIR ]]; then INDIR="$VERITAS_IRFPRODUCTION_DIR/${EVNIRFVERSION}/${ANALYSIS_TYPE}/$SIMTYPE/${EPOCH}_ATM${ATM}_gamma/ze${ZA}deg_offset${WOBBLE}deg_NSB${NOISE}MHz" if [[ ! -d $INDIR ]]; then - echo "Error, could not locate input directory. Locations searched (plus curved):" + echo "Error, could not locate input directory. Locations searched (minus curved):" echo "$INDIR" exit 1 fi diff --git a/scripts/IRF.production.sh b/scripts/IRF.production.sh index 28caf24..7abd960 100755 --- a/scripts/IRF.production.sh +++ b/scripts/IRF.production.sh @@ -436,10 +436,11 @@ for VX in $EPOCH; do # run simulations through evndisp if [[ $IRFTYPE == "EVNDISP" ]] || [[ $IRFTYPE == "MVAEVNDISP" ]] || [[ $IRFTYPE == "EVNDISPCOMPRESS" ]]; then SIMDIRZA="$SIMDIR" - if [[ -e "$SIMDIR/Zd${ZA}_curved/" ]]; then - SIMDIRZA="$SIMDIR/Zd${ZA}_curved/" - echo "Using curved atmosphere simulations from $SIMDIRZA" - elif [[ -e "$SIMDIR/Zd${ZA}/" ]]; then + # CURVED_ATMOSPHERE_MC + # if [[ -e "$SIMDIR/Zd${ZA}_curved/" ]]; then + # SIMDIRZA="$SIMDIR/Zd${ZA}_curved/" + # echo "Using curved atmosphere simulations from $SIMDIRZA" + if [[ -e "$SIMDIR/Zd${ZA}/" ]]; then SIMDIRZA="$SIMDIR/Zd${ZA}/" echo "Using flat atmosphere simulations from $SIMDIRZA" fi @@ -466,7 +467,6 @@ for VX in $EPOCH; do for ID in $RECID; do TFIL="${TABLECOM}" # note: the IDs dependent on what is written in EVNDISP.reconstruction.runparameter - # TFILID=$TFIL$ANATYPE"_flat" TFILID=$TFIL$ANATYPE # run mscw only EFFAREACUTLIST="NOEFFAREA" diff --git a/scripts/IRF.trainTMVAforAngularReconstruction.sh b/scripts/IRF.trainTMVAforAngularReconstruction.sh index c9f5a22..ac0d156 100755 --- a/scripts/IRF.trainTMVAforAngularReconstruction.sh +++ b/scripts/IRF.trainTMVAforAngularReconstruction.sh @@ -85,15 +85,16 @@ check_evndisp_directory() { W=${1} N=${2} - # input directory containing evndisp products (first check for curved, than normal atmosphere) + # input directory containing evndisp products INDIRBASE="$VERITAS_IRFPRODUCTION_DIR/${EVNIRFVERSION}/${ANALYSIS_TYPE}/$SIMTYPE/${EPOCH}_ATM${ATM}_gamma" if [[ -n "$VERITAS_IRFPRODUCTION_DIR" ]]; then - INDIR="${INDIRBASE}/ze${ZA}deg_curved_offset${W}deg_NSB${N}MHz" + # CURVED_ATMOSPHERE_MC INDIR="${INDIRBASE}/ze${ZA}deg_curved_offset${W}deg_NSB${N}MHz" + INDIR="${INDIRBASE}/ze${ZA}deg_offset${W}deg_NSB${N}MHz" fi if [[ ! -d $INDIR ]]; then INDIR="${INDIRBASE}/ze${ZA}deg_offset${W}deg_NSB${N}MHz" if [[ ! -d $INDIR ]]; then - echo "Error, could not locate input directory. Locations searched (plus curved):" + echo "Error, could not locate input directory. Locations searched (minus curved):" echo "$INDIR" exit 1 fi diff --git a/scripts/helper_scripts/IRF.mscw_energy_MC_sub.sh b/scripts/helper_scripts/IRF.mscw_energy_MC_sub.sh index 3fd4d16..2b5a655 100755 --- a/scripts/helper_scripts/IRF.mscw_energy_MC_sub.sh +++ b/scripts/helper_scripts/IRF.mscw_energy_MC_sub.sh @@ -94,7 +94,7 @@ if [ $DISPBDT -eq 1 ]; then elif [[ ${SIMTYPE} == *"UV"* ]]; then DISPDIR="${VERITAS_EVNDISP_AUX_DIR}/DispBDTs/${ANATYPE}/${EPOCH}_ATM${ATM}_UV/" else - DISPDIR="${VERITAS_EVNDISP_AUX_DIR}/DispBDTs/${ANATYPE}/${EPOCH}_ATM${ATM}/" + DISPDIR="${VERITAS_EVNDISP_AUX_DIR}/DispBDTs/${ANATYPE}_flat/${EPOCH}_ATM${ATM}/" fi # zenith angle dependent disp training; important at large zenith if [[ "${ZA}" -lt "38" ]]; then From 94fd05708b8632fa88073ea177af7612613bdcca Mon Sep 17 00:00:00 2001 From: GernotMaier Date: Sat, 16 May 2026 12:05:33 +0200 Subject: [PATCH 11/12] changelog --- docs/changes/143.maintenance.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/changes/143.maintenance.md diff --git a/docs/changes/143.maintenance.md b/docs/changes/143.maintenance.md new file mode 100644 index 0000000..0cb2b18 --- /dev/null +++ b/docs/changes/143.maintenance.md @@ -0,0 +1 @@ +Standardize directories and remove legacy support for curved atmospheres. From 557a6404c8c8dae14f3b1c99722075734da2f4cc Mon Sep 17 00:00:00 2001 From: GernotMaier Date: Sat, 16 May 2026 12:54:56 +0200 Subject: [PATCH 12/12] fix flat --- scripts/helper_scripts/IRF.mscw_energy_MC_sub.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/helper_scripts/IRF.mscw_energy_MC_sub.sh b/scripts/helper_scripts/IRF.mscw_energy_MC_sub.sh index 2b5a655..3fd4d16 100755 --- a/scripts/helper_scripts/IRF.mscw_energy_MC_sub.sh +++ b/scripts/helper_scripts/IRF.mscw_energy_MC_sub.sh @@ -94,7 +94,7 @@ if [ $DISPBDT -eq 1 ]; then elif [[ ${SIMTYPE} == *"UV"* ]]; then DISPDIR="${VERITAS_EVNDISP_AUX_DIR}/DispBDTs/${ANATYPE}/${EPOCH}_ATM${ATM}_UV/" else - DISPDIR="${VERITAS_EVNDISP_AUX_DIR}/DispBDTs/${ANATYPE}_flat/${EPOCH}_ATM${ATM}/" + DISPDIR="${VERITAS_EVNDISP_AUX_DIR}/DispBDTs/${ANATYPE}/${EPOCH}_ATM${ATM}/" fi # zenith angle dependent disp training; important at large zenith if [[ "${ZA}" -lt "38" ]]; then