Merge pull request #18 from pooser/pooser-organization-work

Pooser organization work

DBASE/general.param

 #real raddeg
 raddeg=3.14159265/180
-;
-#include "PARAM/hcana.param"
-; hmsflags.param include spectrometer offsets and options.
-#include "PARAM/genflags.param"
-#include "PARAM/hmsflags.param"
 
-#include "PARAM/gdebug.param"
-#include "PARAM/hdebug.param"
-#include "PARAM/htracking.param"
+; General Hall-C parameter files
+#include "PARAM/GEN/genflags.param"
+#include "PARAM/GEN/gdebug.param"
+#include "PARAM/GEN/gtarget.param"
+#include "PARAM/GEN/gbeam.param"
 
-#include "PARAM/gtarget.param"
-#include "PARAM/gbeam.param"
-;  
-#include "PARAM/hdc_offsets.param"
-#include "PARAM/hdc.pos"
-#include "PARAM/hhodo.pos"
-#include "PARAM/hcal.pos"
-#include "PARAM/hhodo.param"
-#include "PARAM/haero.param"
-#include "PARAM/hdc.param"
-#include "PARAM/hdriftmap.param"
-#include "PARAM/hcal.param"
-#include "PARAM/hcer.param"
+; General HMS parameter files
+; Note: hmsflags.param includes spectrometer offsets and options.
+#include "PARAM/HMS/GEN/hcana.param"
+#include "PARAM/HMS/GEN/hdebug.param"
+#include "PARAM/HMS/GEN/hmsflags.param"
+#include "PARAM/HMS/GEN/htracking.param"
 
-#include "PARAM/pdc.param"
+; HMS detector specific paramter files  
+#include "PARAM/HMS/AERO/haero.param"
+#include "PARAM/HMS/CAL/hcal.pos"
+#include "PARAM/HMS/CAL/hcal.param"
+#include "PARAM/HMS/CER/hcer.param"
+#include "PARAM/HMS/DC/hdc_offsets.param"
+#include "PARAM/HMS/DC/hdc.pos"
+#include "PARAM/HMS/DC/hdc.param"
+#include "PARAM/HMS/DC/hdriftmap.param"
+#include "PARAM/HMS/HODO/hhodo.pos"
+#include "PARAM/HMS/HODO/hhodo.param"
+
+; General SHMS parameter files
+; Note: shmsflags.param includes spectrometer offsets and options.
+#include "PARAM/SHMS/GEN/pcana.param"
+#include "PARAM/SHMS/GEN/pdebug.param"
+#include "PARAM/SHMS/GEN/shmsflags.param"
+#include "PARAM/SHMS/GEN/ptracking.param"
+
+; SHMS detector specific paramter files
+#include "PARAM/SHMS/DC/pdc.pos"
+#include "PARAM/SHMS/DC/pdc.param"
+#include "PARAM/SHMS/DC/pdriftmap.param"

MAPS/HMS/haero.map → MAPS/HMS/DETEC/haero.map

 !HMS:
-! HAERO_ID= 7             (TDC),ADC
+! HAERO_ID= 12             (TDC),ADC
 
 ROC=1
-detector=7
+detector=12
 
 !F250 modules
 SLOT=16

MAPS/HMS/hcal.map → MAPS/HMS/DETEC/hcal.map

 !HMS:
-! HCAL_ID= 4              ADC
+! HCAL_ID= 15              ADC
 
 ROC=1
-detector=4
+detector=15
 
 !F250 modules
 SLOT=3

MAPS/HMS/hdc.map → MAPS/HMS/DETEC/hdc.map

 !HMS:
-! HDC_ID= 1               TDC
+! HDC_ID= 11               TDC
 
 ROC=3
-detector=1 ! HMS chambers >> detector=11  for SOS chambers
+detector=11 ! HMS chambers 
 
 ! Caen 1190 VME Modules >> DC1
 SLOT=5

MAPS/HMS/hhodo.map → MAPS/HMS/DETEC/hhodo.map

 !HMS:
-! HSCIN_ID= 2   ADC+,ADC-,TDC+,TDC-
+! HSCIN_ID= 13   ADC+,ADC-,TDC+,TDC-
 
 ROC=1
-detector=2
+detector=13
 
 ! F250 modules
 SLOT=8

MAPS/HMS/htrig.map → MAPS/HMS/DETEC/htrig.map

 !HMS:
-! THMS_ID=2    ADC,TDC
+! THMS_ID=10    ADC,TDC
 
 ! Plane = 1 >> ADC Only
 ! Plane = 2 >> TDC Only

MAPS/SHMS/pcal.map → MAPS/SHMS/DETEC/pcal.map

 !SHMS
-! SCAL_ID=14              ADC
+! SCAL_ID=26              ADC
 
 ROC=4
-detector=14
+detector=26
 
 !F250 modules
 SLOT=3

MAPS/SHMS/pdc.map → MAPS/SHMS/DETEC/pdc.map

@@ -2,7 +2,7 @@
 ! PDC_ID=21               TDC
 
 ROC=6
-detector=21 ! SHMS chambers >> detector=21, 11 for HMS drift chambers
+detector=21 ! SHMS chambers
 
 ! Caen 1190 VME Modules >> DC1
 SLOT=9

MAPS/make_cratemap.sh

@@ -14,10 +14,10 @@ function proceed {
     done
     for crate in "${arr[@]}"; do
 	if ((crate%2 == 1)) && ((crate != 7)); then
-	    (cat ${PWD}/HMS/db_crate${crate}map.dat; echo; echo) >> db_cratemap.dat
+	    (cat ${PWD}/HMS/CRATE/db_crate${crate}map.dat; echo; echo) >> db_cratemap.dat
 	    echo; echo "HMS  Crate ${crate} has been added to db_cratemap.dat"
 	elif ((crate%2 == 0)) || ((crate == 7)); then
-	    (cat ${PWD}/SHMS/db_crate${crate}map.dat; echo; echo) >> db_cratemap.dat
+	    (cat ${PWD}/SHMS/CRATE/db_crate${crate}map.dat; echo; echo) >> db_cratemap.dat
 	    echo; echo "SHMS Crate ${crate} has been added to db_cratemap.dat"
 	    if ((crate == 7)); then echo; fi
 	fi