v492 dev20

.github/workflows/CI.yml

@@ -21,10 +21,10 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.11"
 

docs/changes/151.maintenance.md

@@ -0,0 +1 @@
+Dynamic memory adjustment for anasum combine and improved log file checking.

scripts/ANALYSIS.anasum_combine.sh

@@ -56,6 +56,7 @@ if [[ ! -f "$RUNLIST" ]]; then
     echo "Error, anasum runlist $RUNLIST not found, exiting..."
     exit 1
 fi
+NRUNLIST_LINES=$(wc -l < "$RUNLIST")
 
 # Check that run parameter file exists
 if [[ "$RUNP" == $(basename "$RUNP") ]]; then
@@ -100,6 +101,10 @@ if [[ $SUBC == *"ERROR"* ]]; then
     echo "$SUBC"
     exit
 fi
+if [[ $SUBC == *condor* && $NRUNLIST_LINES -gt 500 ]]; then
+    h_vmem=32000M
+    echo "Run list has $NRUNLIST_LINES lines; requesting $h_vmem memory for HTCondor"
+fi
 RUNSCRIPT_LIST="$LOGDIR/runscripts.$(date +"%s").dat"
 submit_job "$FSCRIPT.sh" "$FSCRIPT.sh &> $FSCRIPT.log" "$RUNSCRIPT_LIST"
 if [[ $SUBC == *qsub* ]]; then

scripts/IRF.production.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# shellcheck disable=SC2178,SC2128
+# shellcheck disable=SC2178,SC2128,SC2068
 # IRF production script (VERITAS)
 
 # EventDisplay version
@@ -189,11 +189,10 @@ elif [[ "${SIMTYPE}" == "CARE_RedHV_Feb2024" ]]; then
     SIMDIR="${VERITAS_DCACHE_DIR}/simulations/NSOffsetSimulations_redHV/Atmosphere${ATMOS}"
     ZENITH_ANGLES=$(find "${SIMDIR}" -mindepth 1 -maxdepth 1 -type d -name "Zd*" -exec basename {} \; | awk -F "Zd" '{print $2}' | grep -v curved | sort | uniq)
     # ZENITH_ANGLES=( 60 65 )
-    set -- "$ZENITH_ANGLES"
-    ze_first_bin=$(echo "$ZENITH_ANGLES" | awk '{print $1}')
+    ze_first_bin=$(printf '%s\n' "$ZENITH_ANGLES" | head -n 1)
     # Note! Assumes same NSB and WOBBLE offsets for flat and curved atmosphere
-    NSB_LEVELS=$(find "${SIMDIR}/Zd${ze_first_bin}" -maxdepth 1 -name "*vbf.zst" -exec basename {} \; | awk -F "_" '{print $9}' | awk -F "MHz" '{print $1}' | sort -u)
-    WOBBLE_OFFSETS=$(find "${SIMDIR}/Zd${ze_first_bin}" -maxdepth 1 -name "*.vbf.zst" -exec basename {} \; | awk -F "_" '{print $8}' | awk -F "wob" '{print $1}' | sort -u)
+    NSB_LEVELS=$(find "${SIMDIR}/Zd${ze_first_bin}" -maxdepth 1 -type f -name "*.zst" -exec basename {} \; | sed -nE 's/.*_([0-9.]+)wob_([0-9]+)MHz.*/\2/p' | sort -u)
+    WOBBLE_OFFSETS=$(find "${SIMDIR}/Zd${ze_first_bin}" -maxdepth 1 -type f -name "*.zst" -exec basename {} \; | sed -nE 's/.*_([0-9.]+)wob_([0-9]+)MHz.*/\1/p' | sort -u)
     ######################################
     # TEST
     # NSB_LEVELS=( 300 )
@@ -202,11 +201,10 @@ elif [[ "${SIMTYPE}" == "CARE_RedHV_Feb2024" ]]; then
 elif [[ "${SIMTYPE}" == "CARE_202404" ]] || [[ "${SIMTYPE}" == "CARE_24_20" ]]; then
     SIMDIR="${VERITAS_DCACHE_DIR}/simulations/NSOffsetSimulations_202404/Atmosphere${ATMOS}"
     ZENITH_ANGLES=$(find "${SIMDIR}" -mindepth 1 -maxdepth 1 -type d -name "Zd*" -exec basename {} \; | awk -F "Zd" '{print $2}' | grep -v curved | sort | uniq)
-    set -- "$ZENITH_ANGLES"
-    ze_first_bin=$(echo "$ZENITH_ANGLES" | awk '{print $1}')
+    ze_first_bin=$(printf '%s\n' "$ZENITH_ANGLES" | head -n 1)
     # assume same NSB and wobble offsets in all bins
-    NSB_LEVELS=$(find "${SIMDIR}" -path "*${ze_first_bin}*/*" -type f -exec basename {} \; | awk -F "_" '{print $9}' | awk -F "MHz" '{print $1}' | sort -u)
-    WOBBLE_OFFSETS=$(find "${SIMDIR}" -path "*${ze_first_bin}*/*" -type f -exec basename {} \; | awk -F "_" '{print $8}' | awk -F "wob" '{print $1}' | sort -u)
+    NSB_LEVELS=$(find "${SIMDIR}/Zd${ze_first_bin}" -maxdepth 1 -type f -name "*.zst" -exec basename {} \; | sed -nE 's/.*_([0-9.]+)wob_([0-9]+)MHz.*/\2/p' | sort -u)
+    WOBBLE_OFFSETS=$(find "${SIMDIR}/Zd${ze_first_bin}" -maxdepth 1 -type f -name "*.zst" -exec basename {} \; | sed -nE 's/.*_([0-9.]+)wob_([0-9]+)MHz.*/\1/p' | sort -u)
     ######################################
     # TEST
     # ZENITH_ANGLES=( 00 20 30 35 40 45 )
@@ -251,7 +249,7 @@ read_cutlist()
     for CUT in "${CUTLISTFROMFILE[@]}"; do
         CUTLIST="${CUTLIST} ANASUM.GammaHadron-Cut-$CUT.dat"
     done
-    echo "$CUTLIST"
+    echo "${CUTLIST# }"
 }
 
 # Cut types are used for BDT training and optimisation
@@ -398,8 +396,8 @@ for VX in $EPOCH; do
            done
            continue
        fi
-       # zenith angle dependent analysis
-       for ZA in "${ZENITH_ANGLES[@]}"; do
+    # zenith angle dependent analysis
+    for ZA in ${ZENITH_ANGLES[@]}; do
             ######################
             # train MVA for angular resolution
             if [[ $IRFTYPE == "TRAINMVANGRES" ]]; then
@@ -425,8 +423,8 @@ for VX in $EPOCH; do
                fi
                continue
             fi
-            for NOISE in "${NSB_LEVELS[@]}"; do
-                for WOBBLE in "${WOBBLE_OFFSETS[@]}"; do
+            for NOISE in ${NSB_LEVELS[@]}; do
+                for WOBBLE in ${WOBBLE_OFFSETS[@]}; do
                     echo "Preparing epoch $VX, atmo $ATM, zenith $ZA, wobble $WOBBLE, noise $NOISE"
                     ######################
                     # run simulations through evndisp

scripts/IRF.trainTMVAforAngularReconstruction.sh

@@ -64,7 +64,7 @@ if [[ -z "$VERITAS_IRFPRODUCTION_DIR" ]]; then
     exit 1
 fi
 # output and log directories
-ODIR="$VERITAS_IRFPRODUCTION_DIR/$EDVERSION/${ANALYSIS_TYPE}/$SIMTYPE/${EPOCH}_ATM${ATM}_gamma/TMVA_AngularReconstruction/ze${ZA}deg/"
+ODIR="$VERITAS_IRFPRODUCTION_DIR/$EDVERSION/${ANALYSIS_TYPE}/$SIMTYPE/${EPOCH}_ATM${ATM}_gamma/TMVA_AngularReconstruction/ze${ZA}deg"
 LOGDIR="${ODIR}/submit-TMVAAngRes-RECID${RECID}-${UUID}"
 mkdir -p "$ODIR"
 chmod g+w "$ODIR"

scripts/helper_scripts/ANALYSIS.anasum_combine_sub.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+# shellcheck disable=SC2086
+# EVNDISPSYS may include an apptainer exec prefix and must split into command words.
 # script to combine anasum runs
 #
 # set observatory environmental variables
@@ -116,28 +118,28 @@ echo "RUNP ${RUNP}"
 echo "OUTPUTDATAFILE ${OUTPUTDATAFILE}"
 echo "OUTPUTLOGFILE ${OUTPUTLOGFILE}"
 
-"$EVNDISPSYS"/bin/anasum \
+$EVNDISPSYS/bin/anasum \
     -i 1 \
     ${RUNLISTSTRING} "${RUNLIST}" \
     -d "${TEMPDIR}" \
     -f "${RUNP}" \
     -o "${OUTPUTDATAFILE}".root 2>&1 | tee ${OUTPUTLOGFILE}
 
 # for Crab runs: print sensitivity estimate
-RUNINFO=$("$EVNDISPSYS"/bin/printRunParameter "${OUTPUTDATAFILE}".root -runinfo)
+RUNINFO=$($EVNDISPSYS/bin/printRunParameter "${OUTPUTDATAFILE}".root -runinfo)
 TMPTARGET=$(echo "$RUNINFO" | cut -d\  -f7- )
 if [[ ${TMPTARGET} == "Crab" ]]; then
     {
         echo "========================== SENSITIVITY ESTIMATE =========================="
-        "$EVNDISPSYS"/bin/printCrabSensitivity "${OUTPUTDATAFILE}".root
+        $EVNDISPSYS/bin/printCrabSensitivity "${OUTPUTDATAFILE}".root
         echo "========================== =========================="
     } >> "${OUTFILE}.log"
 fi
 
 inspect_executables >> ${OUTFILE}.log
 
 # log file into root file
-"$EVNDISPSYS"/bin/logFile \
+$EVNDISPSYS/bin/logFile \
     anasumLog \
     "${OUTPUTDATAFILE}".root \
     "${OUTPUTDATAFILE}".log

scripts/helper_scripts/ANALYSIS.anasum_sub.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+# shellcheck disable=SC2086
+# EVNDISPSYS may include an apptainer exec prefix and must split into command words.
 # script to analyse one run with anasum
 
 # set observatory environmental variables
@@ -122,7 +124,7 @@ if [[ $FLIST == "NOTDEFINED" ]]; then
     echo "* VERSION 6" > $FLIST
     echo "" >> $FLIST
     # preparing effective area and radial acceptance names
-    RUNINFO=$("$EVNDISPSYS"/bin/printRunParameter "$INFILEPATH" -runinfo)
+    RUNINFO=$($EVNDISPSYS/bin/printRunParameter "$INFILEPATH" -runinfo)
     EPOCH=$(echo "$RUNINFO" | awk '{print $(1)}')
     MAJOREPOCH=$(echo "$RUNINFO" | awk '{print $(2)}')
     ATMO=${FORCEDATMO:-$(echo "$RUNINFO" | awk '{print $(3)}')}
@@ -206,7 +208,7 @@ RUNP="${TEMPDIR}/$(basename $RUNP)"
 
 #################################
 # run anasum
-"$EVNDISPSYS"/bin/anasum   \
+$EVNDISPSYS/bin/anasum   \
     -f "$RUNP"             \
     -l "$FLIST"            \
     -d $INDIR            \
@@ -219,7 +221,7 @@ RUNP="${TEMPDIR}/$(basename $RUNP)"
 } >> "${OUTPUTLOGFILE}"
 
 if [[ -e "$OUTPUTLOGFILE" ]]; then
-    "$EVNDISPSYS"/bin/logFile anasumLog "$OUTPUTDATAFILE" "$(dirname $OUTPUTDATAFILE)/$(basename $OUTPUTLOGFILE)"
+    $EVNDISPSYS/bin/logFile anasumLog "$OUTPUTDATAFILE" "$(dirname $OUTPUTDATAFILE)/$(basename $OUTPUTLOGFILE)"
 fi
 
 echo "RUN$RUNNUM ANPARLOG log file: $OUTPUTLOGFILE"

scripts/helper_scripts/ANALYSIS.dispXGB_sub.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+# shellcheck disable=SC2086
+# EVNDISPSYS may include an apptainer exec prefix and must split into command words.
 # XGBoost disp stereo and classification analysis on mscw data file
 
 # Don't do set -e.
@@ -67,7 +69,7 @@ if [[ ! -e ${MSCW_FILE} ]]; then
     echo "File ${MSCW_FILE} not found. Exiting."
     exit
 fi
-RUNINFO=$("$EVNDISPSYS"/bin/printRunParameter "${MSCW_FILE}" -runinfo)
+RUNINFO=$($EVNDISPSYS/bin/printRunParameter "${MSCW_FILE}" -runinfo)
 echo "RUNINFO $RUNINFO"
 ZA=$(echo "$RUNINFO" | awk '{print $8}')
 EPOCH=$(echo "$RUNINFO" | awk '{print $1}')

scripts/helper_scripts/ANALYSIS.evndisp_sub.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+# shellcheck disable=SC2086
+# EVNDISPSYS may include an apptainer exec prefix and must split into command words.
 # script to analyse VTS raw files (VBF) with eventdisplay
 
 # set observatory environmental variables
@@ -197,7 +199,7 @@ fi
 # pedestal calculation
 if [[ $CALIB == "1" || $CALIB == "2" || $CALIB == "4" || $CALIB == "5" ]]; then
     rm -f $LOGDIR/$RUN.ped.log
-    "$EVNDISPSYS"/bin/evndisp \
+    $EVNDISPSYS/bin/evndisp \
         -runmode=1 -runnumber="$RUN" \
         -reconstructionparameter "$ACUTS" \
         "${OPT[@]}" \
@@ -229,7 +231,7 @@ fi
 # average tzero calculation
 if [[ $CALIB == "1" || $CALIB == "3" || $CALIB == "4" || $CALIB == "5" ]]; then
     rm -f $LOGDIR/$RUN.tzero.log
-    "$EVNDISPSYS"/bin/evndisp \
+    $EVNDISPSYS/bin/evndisp \
         -runnumber=$RUN -runmode=7 \
         -calibrationsummin=50 \
         -reconstructionparameter "$ACUTS" \
@@ -264,7 +266,7 @@ fi
 if [[ $CALIB != "5" ]]; then
 LOGFILE="$LOGDIR/$RUN.log"
     rm -f "$LOGDIR/$RUN.log"
-    "$EVNDISPSYS"/bin/evndisp \
+    $EVNDISPSYS/bin/evndisp \
         -runnumber="$RUN" \
         -reconstructionparameter "$ACUTS" \
         -outputfile "$TEMPDIR/$RUN.root" \
@@ -278,17 +280,17 @@ fi
 if [[ -e "$LOGFILE" ]]; then
     cp -v "$LOGFILE" "$TEMPDIR"
     LLF="${TEMPDIR}/$RUN.log"
-    "$EVNDISPSYS"/bin/logFile evndispLog "$TEMPDIR/$RUN.root" "$LLF"
+    $EVNDISPSYS/bin/logFile evndispLog "$TEMPDIR/$RUN.root" "$LLF"
 fi
 if [[ -e "$LOGDIR/$RUN.ped.log" ]]; then
     cp -v $LOGDIR/$RUN.ped.log "$TEMPDIR"
     LLF="${TEMPDIR}/$RUN.ped.log"
-    "$EVNDISPSYS"/bin/logFile evndisppedLog "$TEMPDIR/$RUN.root" "$LLF"
+    $EVNDISPSYS/bin/logFile evndisppedLog "$TEMPDIR/$RUN.root" "$LLF"
 fi
 if [[ -e "$LOGDIR/$RUN.tzero.log" ]]; then
     cp -v $LOGDIR/$RUN.tzero.log "$TEMPDIR"
     LLF="${TEMPDIR}/$RUN.tzero.log"
-    "$EVNDISPSYS"/bin/logFile evndisptzeroLog "$TEMPDIR/$RUN.root" "$LLF"
+    $EVNDISPSYS/bin/logFile evndisptzeroLog "$TEMPDIR/$RUN.root" "$LLF"
 fi
 
 # move data file from tmp dir to data dir

scripts/helper_scripts/ANALYSIS.mscw_energy_sub.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+# shellcheck disable=SC2086
+# EVNDISPSYS may include an apptainer exec prefix and must split into command words.
 # analyse MC files with lookup tables
 
 # set observatory environmental variables
@@ -67,7 +69,7 @@ if [ -n "$EVNDISP_APPTAINER" ]; then
 fi
 
 echo "READING RUNINFO from $INFILEPATH"
-RUNINFO=$("$EVNDISPSYS"/bin/printRunParameter "$INFILEPATH" updated-runinfo)
+RUNINFO=$($EVNDISPSYS/bin/printRunParameter "$INFILEPATH" updated-runinfo)
 EPOCH=$(echo "$RUNINFO" | awk '{print $(1)}')
 ATMO=${FORCEDATMO:-$(echo "$RUNINFO" | awk '{print $(3)}')}
 HVSETTINGS=$(echo "$RUNINFO" | awk '{print $(4)}')
@@ -154,7 +156,7 @@ get_disp_dir()
 }
 
 if [[ $DISPBDT == "1" ]]; then
-    ZA=$("$EVNDISPSYS"/bin/printRunParameter "$INFILEPATH" -zenith | awk '{print $4}')
+    ZA=$($EVNDISPSYS/bin/printRunParameter "$INFILEPATH" -zenith | awk '{print $4}')
     DISPDIR=$(get_disp_dir "${ZA}")
     echo "DISPDIR (Zenith is $ZA deg): " "$DISPDIR"
     if [[ ! -d "$DISPDIR" ]]; then
@@ -216,7 +218,7 @@ if [ $DISPBDT -eq 1 ]; then
     echo "DISP BDT options: ${MOPT[*]}"
 fi
 
-"$EVNDISPSYS"/bin/mscw_energy         \
+$EVNDISPSYS/bin/mscw_energy         \
     "${MOPT[@]}" \
     -updateEpoch=1 \
     -tablefile "$TABFILE"             \
@@ -241,7 +243,7 @@ fi
 if [[ -e ${MSCWLOGFILE} ]]; then
   cp -v "${MSCWLOGFILE}" "$DDIR"/
   LLF="${DDIR}/$(basename "${MSCWLOGFILE}")"
-  "$EVNDISPSYS"/bin/logFile mscwTableLog "$DDIR/$BFILE.mscw.root" "$LLF"
+  $EVNDISPSYS/bin/logFile mscwTableLog "$DDIR/$BFILE.mscw.root" "$LLF"
 fi
 
 # move output file from scratch and clean up

scripts/helper_scripts/IRF.compress_evndisp_MC_sub.sh

@@ -1,9 +1,13 @@
 #!/bin/bash
+# shellcheck disable=SC2086
+# EVNDISPSYS may include an apptainer exec prefix and must split into command words.
 # script put log files into evndisp file and compress output
 
 # shellcheck source=/dev/null
 # set observatory environmental variables
-source "$EVNDISPSYS"/setObservatory.sh VTS
+if [ ! -n "$EVNDISP_APPTAINER" ]; then
+    source "$EVNDISPSYS"/setObservatory.sh VTS
+fi
 
 ONAME=RUNNUMBER
 IDIR=INPUTDIR
@@ -21,7 +25,7 @@ mkdir -p $ODIR
 
 compare_log_file()
 {
-    "$EVNDISPSYS"/bin/logFile "$1" "$DDIR"/$ONAME.root > "${DDIR}"/"${1}".log
+    $EVNDISPSYS/bin/logFile "$1" "$DDIR"/$ONAME.root > "${DDIR}"/"${1}".log
     if cmp -s "${2}" "${DDIR}/${1}.log"; then
         echo "FILES ${1} ${2} are the same, removing"
     else
@@ -33,11 +37,11 @@ compare_log_file()
 add_log_file()
 {
      # first check if logFile is already included in evndisp file
-     LCON=$("$EVNDISPSYS"/bin/logFile "$1" "$DDIR"/$ONAME.root | grep -c "Error: log file object")
+     LCON=$($EVNDISPSYS/bin/logFile "$1" "$DDIR"/$ONAME.root | grep -c "Error: log file object")
      if [[ ${LCON} == 1 ]]; then
          echo "writing log file ${2}"
          if [[ -f ${2} ]]; then
-             "$EVNDISPSYS"/bin/logFile "$1" "$DDIR"/$ONAME.root "${2}"
+             $EVNDISPSYS/bin/logFile "$1" "$DDIR"/$ONAME.root "${2}"
          fi
      else
          echo "log file ${2} already in $DDIR/$ONAME.root"

scripts/helper_scripts/IRF.dispXGB_sub.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+# shellcheck disable=SC2086
+# EVNDISPSYS may include an apptainer exec prefix and must split into command words.
 # XGBoost disp stereo and classification analysis on mscw MC file
 
 # Don't do set -e.
@@ -57,7 +59,7 @@ if [[ ! -e ${MSCW_FILE} ]]; then
     echo "File ${MSCW_FILE} not found. Exiting."
     exit
 fi
-RUNINFO=$("$EVNDISPSYS"/bin/printRunParameter ${MSCW_FILE} -runinfo)
+RUNINFO=$($EVNDISPSYS/bin/printRunParameter ${MSCW_FILE} -runinfo)
 echo "RUNINFO $RUNINFO"
 ZA=$(echo "$RUNINFO" | awk '{print $8}')
 EPOCH=$(echo "$RUNINFO" | awk '{print $1}')

scripts/helper_scripts/IRF.effective_area_combine_sub.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+# shellcheck disable=SC2086
+# EVNDISPSYS may include an apptainer exec prefix and must split into command words.
 # combine effective areas
 
 # set observatory environmental variables
@@ -51,8 +53,8 @@ done
 echo "Found $(cat $ODIR/$OFILE.list | wc -l) input files to merge"
 echo "File list: $ODIR/$OFILE.list"
 
-"$EVNDISPSYS"/bin/combineEffectiveAreas "$OPTODIR/$OFILE.list" ${OPTODIR}/$OFILE DL3reduced &> ${ODIR}/$OFILE.log
+$EVNDISPSYS/bin/combineEffectiveAreas "$OPTODIR/$OFILE.list" ${OPTODIR}/$OFILE DL3reduced &> ${ODIR}/$OFILE.log
 
 # log files
 inspect_executables >> "$ODIR/$OFILE.log"
-"$EVNDISPSYS"/bin/logFile effAreaCombineLog "${OPTODIR}/$OFILE.root" "${OPTODIR}/$OFILE.log"
+$EVNDISPSYS/bin/logFile effAreaCombineLog "${OPTODIR}/$OFILE.root" "${OPTODIR}/$OFILE.log"

scripts/helper_scripts/IRF.effective_area_parallel_sub.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+# shellcheck disable=SC2086
+# EVNDISPSYS may include an apptainer exec prefix and must split into command words.
 # calculate effective areas
 #
 # v490: possible issue with "RERUN_STEREO_RECONSTRUCTION_3TEL" option
@@ -129,13 +131,13 @@ eval "echo \"$PARAMFILE\"" > "$DDIR"/"$EAPARAMS".dat
 
 # calculate effective areas
 rm -f "$OSUBDIR"/"$OFILE".root
-"$EVNDISPSYS"/bin/makeEffectiveArea "$DDIR"/"$EAPARAMS".dat "$DDIR"/"$EAPARAMS".root &> "$OSUBDIR"/"$EAPARAMS".log
+$EVNDISPSYS/bin/makeEffectiveArea "$DDIR"/"$EAPARAMS".dat "$DDIR"/"$EAPARAMS".root &> "$OSUBDIR"/"$EAPARAMS".log
 
 echo "Filling log file into root file"
 inspect_executables >> "$OSUBDIR/$EAPARAMS.log"
 cp -v "$OSUBDIR/$EAPARAMS.log" "$DDIR/$EAPARAMS.log"
-"$EVNDISPSYS"/bin/logFile effAreaLog "$DDIR"/"$EAPARAMS".root "$DDIR"/"$EAPARAMS".log
-rm -f "$OSUBDIR"/"$EAPARAMS".log
+$EVNDISPSYS/bin/logFile effAreaLog "$DDIR"/"$EAPARAMS".root "$DDIR"/"$EAPARAMS".log
 cp -f "$DDIR"/"$EAPARAMS".root "$OSUBDIR"/"$EAPARAMS".root
 chmod -R g+w "$OSUBDIR"
 chmod g+w "$OSUBDIR"/"$EAPARAMS".root
+rm -f "$OSUBDIR"/"$EAPARAMS".log