reverted to using directory structure to match conf

jaredmales · Nov 10, 2024 · f7efac4 · f7efac4
1 parent 6442005
commit f7efac4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/AOloopControl/scripts/cacao-calib-apply b/AOloopControl/scripts/cacao-calib-apply
@@ -53,10 +53,10 @@ echo "runstop acquWFS-${CACAO_LOOPNUMBER}" >> /milk/shm/${CACAO_LOOPNAME}_fpsCTR
 echo "confstop acquWFS-${CACAO_LOOPNUMBER}" >> /milk/shm/${CACAO_LOOPNAME}_fpsCTRL.fifo
 
 # Load CM to shared memory
-milk-FITS2shm "${ARCHDIR}CMmodesWFS.fits" aol${CACAO_LOOPNUMBER}_CMmodesWFS
-milk-FITS2shm "${ARCHDIR}CMmodesDM.fits" aol${CACAO_LOOPNUMBER}_CMmodesDM
+milk-FITS2shm "${ARCHDIR}/CMmodesWFS/CMmodesWFS.fits" aol${CACAO_LOOPNUMBER}_CMmodesWFS
+milk-FITS2shm "${ARCHDIR}/CMmodesDM/CMmodesDM.fits" aol${CACAO_LOOPNUMBER}_CMmodesDM
 
-milk-FITS2shm "${ARCHDIR}zrespM-H.fits" aol${CACAO_LOOPNUMBER}_zrespM
+milk-FITS2shm "${ARCHDIR}/RMmodesWFS/zrespM-H.fits" aol${CACAO_LOOPNUMBER}_zrespM
 
 milk-FITS2shm "${ARCHDIR}wfsref.fits" aol${CACAO_LOOPNUMBER}_wfsref
 milk-FITS2shm "${ARCHDIR}wfsref.fits" aol${CACAO_LOOPNUMBER}_wfsrefc

diff --git a/AOloopControl/scripts/cacao-calib-archive b/AOloopControl/scripts/cacao-calib-archive
@@ -62,18 +62,22 @@ ARCHDIR="${BASEARCHDIR}${calib}/"
 
 
 mkdir -p ${ARCHDIR}
+mkdir -p ${ARCHDIR}/RMmodesDM
+mkdir -p ${ARCHDIR}/RMmodesWFS
+mkdir -p ${ARCHDIR}/CMmodesDM
+mkdir -p ${ARCHDIR}/CMmodesWFS
 
 echo "Saving to DIRECTORY ${ARCHDIR}"
 
 
 
 CONFDIR="conf"
 
-cp ${CONFDIR}/RMmodesWFS/zrespM-H.fits ${ARCHDIR}/zrespM-H.fits
-cp ${CONFDIR}/CMmodesDM/CMmodesDM.fits ${ARCHDIR}/CMmodesDM.fits
-cp ${CONFDIR}/CMmodesWFS/CMmodesWFS.fits ${ARCHDIR}/CMmodesWFS.fits
-cp ${CONFDIR}/RMmodesDM/RMmodesDM.fits ${ARCHDIR}/RMmodesDM.fits
-cp ${CONFDIR}/RMmodesWFS/RMmodesWFS.fits ${ARCHDIR}/RMmodesWFS.fits
+cp ${CONFDIR}/RMmodesWFS/zrespM-H.fits ${ARCHDIR}/RMmodesWFS/zrespM-H.fits
+cp ${CONFDIR}/CMmodesDM/CMmodesDM.fits ${ARCHDIR}/CMmodesDM/CMmodesDM.fits
+cp ${CONFDIR}/CMmodesWFS/CMmodesWFS.fits ${ARCHDIR}/CMmodesWFS/CMmodesWFS.fits
+cp ${CONFDIR}/RMmodesDM/RMmodesDM.fits ${ARCHDIR}/RMmodesDM/RMmodesDM.fits
+cp ${CONFDIR}/RMmodesWFS/RMmodesWFS.fits ${ARCHDIR}/RMmodesWFS/RMmodesWFS.fits
 cp ${CONFDIR}/wfsref.fits ${ARCHDIR}/wfsref.fits
 cp ${CONFDIR}/wfsmask.fits ${ARCHDIR}/wfsmask.fits
 cp ${CONFDIR}/wfsmap.fits ${ARCHDIR}/wfsmap.fits