halld daq scripts update to use new rcdb versions

JeffersonLab · Jan 20, 2023 · aaece87 · aaece87
1 parent a8ed96b
commit aaece87
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/python/halld_rcdb/parse_coda_log_v2 b/python/halld_rcdb/parse_coda_log_v2
@@ -8,16 +8,23 @@
 
 
 # 2. IS ENVIRONMENT SET?
+unset PYTHONPATH
 
 export RCDB_HOME=${DAQ_HOME}/rcdb/rcdb_master
 export LD_LIBRARY_PATH="$RCDB_HOME/cpp/lib":$LD_LIBRARY_PATH
 export PYTHONPATH="$RCDB_HOME/python":$PYTHONPATH
 export PATH="$RCDB_HOME":"$RCDB_HOME/bin":"$RCDB_HOME/cpp/bin":$PATH
 
+
 # 1. Setup python
 source ${DAQ_HOME}/rcdb/miniconda3/etc/profile.d/conda.sh
 conda activate
 
+# 4. DEAL WITH CONNECTION TO DATABASE
+if [ -f ~/.rcdb ];
+then
+   source ~/.rcdb
+fi
 
 #3. PYTHON SCRIPT START
 
@@ -40,6 +47,6 @@ echo "update.py params: $*"
 echo `which python3`
 python3 --version 
 which python3
-python3 $RCDB_HOME/python/update.py $LOGFILE "$@" 
+python3 $RCDB_HOME/python/daq/update.py $LOGFILE "$@" 
 #gdb -ex run --args python $RCDB_HOME/python/update.py $LOGFILE "$@" 
 
diff --git a/python/halld_rcdb/run_end b/python/halld_rcdb/run_end
@@ -152,7 +152,7 @@ while true ; do
     sleep 1
 done
 
-${DAQ_HOME}/rcdb/parse_coda_log   --update=epics,coda,conf --verbose --ipl --reason=end  --udl=$UDL  
+${DAQ_HOME}/rcdb/parse_coda_log_v2   --update=epics,coda,conf --verbose --ipl --reason=end  --udl=$UDL  
 ERRRCDB=$?
 [[ $ERRRCDB != 0 ]] && rcm_log "rcdb Error  rc=$ERRRCDB " "WARN"
 #

diff --git a/python/halld_rcdb/run_go b/python/halld_rcdb/run_go
@@ -96,7 +96,7 @@ echo "   RCDB parse  "
 echo "-----------------------------------------------------------------------------------"  
 sleep 1
 #${DAQ_HOME}/rcdb/run_prestart   
-${DAQ_HOME}/rcdb/parse_coda_log   --update=epics,coda,config,roc --reason=start  --ipl --verbose  --udl=$UDL 
+${DAQ_HOME}/rcdb/parse_coda_log_v2   --update=epics,coda,config,roc --reason=start  --ipl --verbose  --udl=$UDL 
 ERRRCDB=$?
 [[ $ERRRCDB != 0 ]] && rcm_log "rcdb Error  rc=$ERRRCDB " "WARN"
 #

diff --git a/python/halld_rcdb/run_update_rcdb b/python/halld_rcdb/run_update_rcdb
@@ -92,7 +92,7 @@ if [ $USER != "hdops" ] ; then
 #    run_log.sh "UPDATE" $RUN $CONFIG_FILE
     exit 0
 fi
-echo " start: parse_coda_log  --update=epics,coda,config --reason=update  --ipl  --udl=$UDL --verbose "
+echo " start: parse_coda_log_v2  --update=epics,coda,config --reason=update  --ipl  --udl=$UDL --verbose "
 python --version
 
 #exit 0
@@ -105,7 +105,7 @@ for ff in 1    ; do
 #    sleep 10
 done
 
-${DAQ_HOME}/rcdb/parse_coda_log  --update=epics,coda,config --reason=update  --ipl  --udl=$UDL --verbose 
+${DAQ_HOME}/rcdb/parse_coda_log_v2  --update=epics,coda,config --reason=update  --ipl  --udl=$UDL --verbose 
 
 #===========================================================================================
 #            HDOPS account only ...