Further refactoring (extract run-convert2h5)

Author: mjkramer

run-larnd-sim/convert_edepsim_roottoh5.py …n-convert2h5/convert_edepsim_roottoh5.pyrun-larnd-sim/convert_edepsim_roottoh5.py renamed to run-convert2h5/convert_edepsim_roottoh5.py run-larnd-sim/convert_edepsim_roottoh5.py renamed to run-convert2h5/convert_edepsim_roottoh5.py

@@ -11,10 +11,10 @@ if [[ "$SHIFTER_IMAGEREQUEST" != "$ARCUBE_CONTAINER" ]]; then
     exit
 fi
 
-source /environment
+source /environment             # from the container
 
 rm -rf convert.venv
 python3 -m venv convert.venv
 source convert.venv/bin/activate
 
-pip3 install -r pip/requirements.convert2h5.sh
+pip3 install -r requirements.txt

run-larnd-sim/install_convert2h5.sh run-convert2h5/install_convert2h5.shrun-larnd-sim/install_convert2h5.sh renamed to run-convert2h5/install_convert2h5.sh

@@ -1,6 +1,4 @@
 /larnd-sim
-/venv
-/liblockfile
 /logs
 /input
 /output

…arnd-sim/pip/requirements.convert2h5.txt run-convert2h5/requirements.txtrun-larnd-sim/pip/requirements.convert2h5.txt renamed to run-convert2h5/requirements.txt run-larnd-sim/pip/requirements.convert2h5.txt renamed to run-convert2h5/requirements.txt

@@ -3,14 +3,14 @@
 module load cudatoolkit         # 11.7
 module load python              # 3.9-anaconda-2021.11
 
-rm -rf larnd-sim venv
+rm -rf larnd-sim larnd.venv
 
-python -m venv venv/
-source venv/bin/activate
+python -m venv larnd.venv/
+source larnd.venv/bin/activate
 
 # Might need to remove larnd-sim from this requirements file
-pip install -r pip/requirements.larnd-sim.txt
-exit
+pip install -r requirements.txt
+# exit
 
 # If installation via requirements.txt doesn't work, the below should rebuild
 # the venv. Ideally, install everything *except* larnd-sim using the
@@ -23,7 +23,8 @@ pip install -U pip wheel setuptools
   cd larnd-sim || exit
   # temperarily* checkout the feature branch for spill simulation
   # *soon to be merged into develop
-  git checkout feature_spillSim
+  # git checkout feature_spillSim
+  git checkout bfeaf9c2388beca3e26efb9f01a81a5e14720270
   # HACK: Replace cupy with cupy-cuda11x
   mv setup.py setup.py.orig
   sed 's/cupy/cupy-cuda11x/' setup.py.orig > setup.py

run-larnd-sim/run_convert2h5.sh run-convert2h5/run_convert2h5.shrun-larnd-sim/run_convert2h5.sh renamed to run-convert2h5/run_convert2h5.sh

@@ -1,12 +1,14 @@
 #!/usr/bin/env bash
 
+module load cudatoolkit         # 11.7
+module load python              # 3.9-anaconda-2021.11
+
+source larnd.venv/bin/activate
+
 if [[ "$NERSC_HOST" == "cori" ]]; then
     export HDF5_USE_FILE_LOCKING=FALSE
 fi
 
-# source venv/bin/activate
-source load_larnd_sim.sh
-
 globalIdx=$ARCUBE_INDEX
 echo "globalIdx is $globalIdx"