updating scripts!

cacao-org · Oct 19, 2023 · 99c681a · 99c681a
1 parent c6d7a9b
commit 99c681a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 1 deletion.
diff --git a/AOloopControl/examples/scexao-NIRPL-conf/cacaovars.bash b/AOloopControl/examples/scexao-NIRPL-conf/cacaovars.bash
@@ -104,3 +104,6 @@ export CACAO_FPSPROC_MODALFILTERING="ON"
 # Compute DM command from control mode values
 #
 export CACAO_FPSPROC_MVMGPU_CMODEVAL2DM="ON"
+
+# Env variable to see if we are in sim mode or not
+export CACAO_MODE=""
diff --git a/AOloopControl/examples/scexao-NIRPL-conf/scripts/addcolumn_sum.sh b/AOloopControl/examples/scexao-NIRPL-conf/scripts/addcolumn_sum.sh
@@ -5,4 +5,21 @@
 source cacao-check-cacaovars
 source ./scripts/fps-utility.sh
 
-setupfps "column_sum"
+# name of function to setup
+fname = "column_sum"
+
+# add to fpsCTRL, start tmux, start conf, turn on procinfo
+setupfps "${fname}"
+
+# procinfo specific stuff
+sendFPScmd "setval ${fname}-${CACAO-LOOPNUMBER}.procinfo.triggermode 3"
+sendFPScmd "setval ${fname}-${CACAO-LOOPNUMBER}.procinfo.loopcntMax -1"
+
+if ${CACAO_MODE} == "HARDW"
+then
+  sendFPScmd "setval ${fname}-${CACAO-LOOPNUMBER}.procinfo.triggersname ${CACAO_WFSSTREAM}"
+elif ${CACAO_MODE} == "SIM"
+then
+  sendFPScmd "setcal ${fname}-${CACAO-LOOPNUMBER}.procinfo.triggersname ${CACAO_WFSSTREAMSIM}"
+fi
+
diff --git a/AOloopControl/examples/scexao-NIRPL-conf/scripts/aorun-setmode-hardw b/AOloopControl/examples/scexao-NIRPL-conf/scripts/aorun-setmode-hardw
@@ -70,3 +70,5 @@ ln -sf ${MILK_SHM_DIR}/dm${CACAO_DMINDEX}disp00.im.shm ${MILK_SHM_DIR}/aol${CACA
 ln -sf ${MILK_SHM_DIR}/dm${CACAO_DMINDEX}disp02.im.shm ${MILK_SHM_DIR}/aol${CACAO_LOOPNUMBER}_dmRM.im.shm
 
 ln -sf ${MILK_SHM_DIR}/dm${CACAO_DMINDEX}disp.im.shm ${MILK_SHM_DIR}/aol${CACAO_LOOPNUMBER}_dmdisp.im.shm
+
+$CACAO_MODE = "HARDW"
diff --git a/AOloopControl/examples/scexao-NIRPL-conf/scripts/aorun-setmode-sim b/AOloopControl/examples/scexao-NIRPL-conf/scripts/aorun-setmode-sim
@@ -60,3 +60,5 @@ ln -sf ${MILK_SHM_DIR}/dm${CACAO_DMSIMINDEX}disp00.im.shm ${MILK_SHM_DIR}/aol${C
 ln -sf ${MILK_SHM_DIR}/dm${CACAO_DMSIMINDEX}disp02.im.shm ${MILK_SHM_DIR}/aol${CACAO_LOOPNUMBER}_dmRM.im.shm
 
 ln -sf ${MILK_SHM_DIR}/dm${CACAO_DMSIMINDEX}disp.im.shm ${MILK_SHM_DIR}/aol${CACAO_LOOPNUMBER}_dmdisp.im.shm
+
+CACAO_MODE="SIM"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -70,3 +70,5 @@ ln -sf ${MILK_SHM_DIR}/dm${CACAO_DMINDEX}disp00.im.shm ${MILK_SHM_DIR}/aol${CACA
		ln -sf ${MILK_SHM_DIR}/dm${CACAO_DMINDEX}disp02.im.shm ${MILK_SHM_DIR}/aol${CACAO_LOOPNUMBER}_dmRM.im.shm

		ln -sf ${MILK_SHM_DIR}/dm${CACAO_DMINDEX}disp.im.shm ${MILK_SHM_DIR}/aol${CACAO_LOOPNUMBER}_dmdisp.im.shm

		$CACAO_MODE = "HARDW"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -60,3 +60,5 @@ ln -sf ${MILK_SHM_DIR}/dm${CACAO_DMSIMINDEX}disp00.im.shm ${MILK_SHM_DIR}/aol${C
		ln -sf ${MILK_SHM_DIR}/dm${CACAO_DMSIMINDEX}disp02.im.shm ${MILK_SHM_DIR}/aol${CACAO_LOOPNUMBER}_dmRM.im.shm

		ln -sf ${MILK_SHM_DIR}/dm${CACAO_DMSIMINDEX}disp.im.shm ${MILK_SHM_DIR}/aol${CACAO_LOOPNUMBER}_dmdisp.im.shm

		CACAO_MODE="SIM"