Merge pull request #56 from Eventdisplay/v2.2-dev2

v2.2 dev2 - maintenance

Author: GernotMaier

.pre-commit-config.yaml

@@ -1,24 +1,24 @@
 repos:
   # https://pycqa.github.io/isort/docs/configuration/black_compatibility.html#integration-with-pre-commit
   - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
+    rev: 6.0.1
     hooks:
       - id: isort
         args: ["--profile", "black", "--filter-files"]
   - repo: https://github.com/psf/black
-    rev: 24.8.0
+    rev: 25.1.0
     hooks:
       - id: black
         args: ["--line-length=100"]
   # https://black.readthedocs.io/en/stable/guides/using_black_with_other_tools.html?highlight=other%20tools#flake8
   - repo: https://github.com/PyCQA/flake8
-    rev: 7.1.1
+    rev: 7.2.0
     hooks:
       - id: flake8
         args: ["--max-line-length=100", "--extend-ignore=E203,E712"]
   # https://github.com/pre-commit/pre-commit-hooks
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer

install/prepareProductionBinaries.sh

@@ -8,7 +8,7 @@
 
 if [ $# -lt 1 ]; then
     echo "
-./prepareProductionBinaries.sh <data set> <Eventdisplay version>
+./prepareProductionBinaries.sh <data set> <Eventdisplay branch>
 
    will install hessioxx, Eventdisplay analysis files and code
 
@@ -118,7 +118,7 @@ mkdir -p $CODEDIR || return
 echo "Software installation into $CODEDIR"
 echo "Preparing binaries for $DSET"
 
-echo 
+echo
 echo "Getting Eventdisplay..."
 cd $CODEDIR
 if [[ $VERSION == "main" ]]; then

utilities/submit_scripts_to_htcondor.sh

@@ -12,37 +12,45 @@ set -e
 if [ $# -lt 1 ]
 then
     echo "
-    ./submit_scripts_to_htcondor.sh <job directory> <submit/nosubmit>
+    ./submit_scripts_to_htcondor.sh <job directory> [submit/nosubmit] [priority]
 
     "
     exit
 fi
 
 JDIR=${1}
-
-SUBMITF=${1}/submit.txt
-rm -f ${SUBMITF}
-touch ${SUBMITF}
-
-echo "Writing HTCondor job submission file ${SUBMITF}"
-
-echo "executable = \$(file)" >>  ${SUBMITF}
-echo "log = \$(file).log" >>  ${SUBMITF}
-echo "output = \$(file).output" >>  ${SUBMITF}
-echo "error = \$(file).error" >>  ${SUBMITF}
-
-# assume that all condor files have similar requests
-CONDORFILE=$(find ${JDIR} -name "*.condor" | head -n 1)
-echo "$(grep -h request_memory $CONDORFILE)"  >>  ${SUBMITF}
-echo "$(grep -h request_disk $CONDORFILE)"  >>  ${SUBMITF}
-echo "getenv = True" >>  ${SUBMITF}
-echo "max_materialize = 5000" >>  ${SUBMITF}
-echo "priority = 150" >> ${SUBMITF}
-echo "queue file matching files *.sh" >> ${SUBMITF}
-
-PDIR=$(pwd)
-if [[ ${2} == "submit" ]]; then
-    cd ${JDIR}
-    condor_submit submit.txt requirements='OpSysAndVer=="AlmaLinux9"'
-    cd ${PDIR}
+PRIORITY="${3:-1}"
+
+echo "Writing HTCondor job submission file ${SUBMITF} (job priority $PRIORITY) for ${JDIR}"
+if find "${JDIR}" -name "*.condor" -print -quit | grep -q .; then
+    SUBMITF=${1}/submit.txt
+    rm -f ${SUBMITF}
+    touch ${SUBMITF}
+
+    mkdir -p ${JDIR}/log
+    mkdir -p ${JDIR}/output
+    mkdir -p ${JDIR}/error
+
+    echo "executable = \$(file)" >>  ${SUBMITF}
+    echo "log = log/\$(file).log" >>  ${SUBMITF}
+    echo "output = output/\$(file).output" >>  ${SUBMITF}
+    echo "error = error/\$(file).error" >>  ${SUBMITF}
+
+    # assume that all condor files have similar requests
+    CONDORFILE=$(find ${JDIR} -name "*.condor" | head -n 1)
+    echo "$(grep -h request_memory $CONDORFILE)"  >>  ${SUBMITF}
+    echo "$(grep -h request_disk $CONDORFILE)"  >>  ${SUBMITF}
+    echo "getenv = True" >>  ${SUBMITF}
+    echo "max_materialize = 1800" >>  ${SUBMITF}
+    echo "priority = $PRIORITY"  >> ${SUBMITF}
+    echo "queue file matching files *.sh" >> ${SUBMITF}
+
+    PDIR=$(pwd)
+    if [[ ${2} == "submit" ]]; then
+        cd ${JDIR}
+        condor_submit submit.txt requirements='OpSysAndVer=="AlmaLinux9"'
+        cd ${PDIR}
+    fi
+else
+    echo "Error: no condor files found in ${JDIR}"
 fi