in progress commit for JF11 calibration. FW and SW updated to 5.1.0.rc

BP_analysis.cpp

@@ -350,6 +350,8 @@ int main(int argc, char* argv[]) {
       grap_g1->SetLineColor(kGreen+2);
     }
 
+    //debug 
+    //   cout << i <<" r0size= "<<  r0_adc.size()<< " r1size= "<<  r1_adc.size()<< endl;
     // plot the datapoints
     if (r1_adc.size() > 1) {
 

BP_scan.sh

@@ -16,7 +16,7 @@ sls_detector_put delay 0
 sls_detector_put cycles 1
 sls_detector_put frames 100
 sls_detector_put period 0.005 
-sls_detector_put exptime 0.000020 
+sls_detector_put exptime 0.000040 
 sls_detector_put vhighvoltage 0
 
 

BP_scan_JF11.sh

@@ -0,0 +1,169 @@
+#!/bin/bash
+
+# to run do: bash BP_scan.sh 0/1
+# arg 1 specify if normal or HG0G1G2 setting
+
+# prerequisites:
+# - setup_env.sh souced
+# - the hostname is set
+# - detector is on
+# - waveform generator is on
+# - amplifier board is powered and unconnected.
+
+if [ "$1" == "" ] || [ $# -gt 1 ]; then
+        echo "Parameter 1 is empty  specify G0 for normal, HG0 for HG0G1G2"
+        exit 0
+fi 
+
+sls_detector_put stop;
+sls_detector_put setbit 0x5d 7  
+sls_detector_put powerchip 1
+
+sleep 1 
+
+if [ "$1" == 'HG0' ]; then 
+sls_detector_put reg 0x58 0x00800f ; sls_detector_put setbit 0x58 31 ; sls_detector_put clearbit 0x58 31;
+echo "HG0G1G2 mode"
+else
+sls_detector_put reg 0x58 0x10800f ; sls_detector_put setbit 0x58 31 ; sls_detector_put clearbit 0x58 31;
+echo "normal mode"
+fi 
+
+sls_detector_put reg 0x7f 0xff1f
+sls_detector_put reg 0x59 0x1110
+
+
+sls_detector_put reg 0x5b 0xffffffff
+sls_detector_put reg 0x5a 0xffffffff
+sls_detector_put setbit 0x58 30 ; sls_detector_put clearbit 0x58 30;
+
+#sls_detector_put setbit 0x5d 0
+
+sls_detector_put delay 0
+sls_detector_put cycles 1
+sls_detector_put frames 100
+sls_detector_put period 0.005 
+sls_detector_put exptime 0.000040 
+sls_detector_put highvoltage 0
+
+# configure for receiver on mpc2012
+sls_detector_put rx_udpport 32410
+sls_detector_put rx_udpip 10.1.4.105
+sls_detector_put rx_udpmac 3C:FD:FE:A2:14:D8
+sls_detector_put detectorip 10.1.4.9
+sls_detector_put detectormac 00:ab:be:cc:dd:e2
+#sls_detector_put configuremac 0 
+sls_detector_put speed  1
+
+
+#sls_detector_put reg 0x5b 0xffffffff
+#sls_detector_put reg 0x5a 0xffffffff
+#sls_detector_put setbit 0x5d 16
+#sls_detector_put start;
+#sls_detector_put stop;
+#sls_detector_put clearbit 0x5d 16
+
+
+# prepare the AGILENT 33250A
+/afs/psi.ch/project/sls_det_software/serial_control_software/minidelay/minidelay OUTP OFF
+sleep 0.2
+
+# pulse
+/afs/psi.ch/project/sls_det_software/serial_control_software/minidelay/minidelay FUNC PULS
+sleep 0.2
+# frequency 1kHz
+/afs/psi.ch/project/sls_det_software/serial_control_software/minidelay/minidelay FREQ 1000
+sleep 0.2
+# width 40 us
+/afs/psi.ch/project/sls_det_software/serial_control_software/minidelay/minidelay PULS:WIDT 0.000040
+sleep 0.2
+# amplitude 0.1 V
+/afs/psi.ch/project/sls_det_software/serial_control_software/minidelay/minidelay VOLT 0.1
+sleep 0.2
+# offset 0 V
+/afs/psi.ch/project/sls_det_software/serial_control_software/minidelay/minidelay VOLT:OFFS 0
+sleep 0.2
+# edge 50 ns
+/afs/psi.ch/project/sls_det_software/serial_control_software/minidelay/minidelay PULS:TRAN 0.000000050
+sleep 0.2
+# triggered burst
+/afs/psi.ch/project/sls_det_software/serial_control_software/minidelay/minidelay BURS:MODE TRIG
+sleep 0.2
+# cycles 1
+/afs/psi.ch/project/sls_det_software/serial_control_software/minidelay/minidelay BURS:NCYC 1
+sleep 0.2
+# external trigger source
+/afs/psi.ch/project/sls_det_software/serial_control_software/minidelay/minidelay TRIG:SOUR EXT
+sleep 0.2
+# delay 1 us
+/afs/psi.ch/project/sls_det_software/serial_control_software/minidelay/minidelay TRIG:DEL 0.000001
+sleep 0.2
+# slope positive
+/afs/psi.ch/project/sls_det_software/serial_control_software/minidelay/minidelay TRIG:SLOP POS
+sleep 0.2
+# turn on burst mode
+/afs/psi.ch/project/sls_det_software/serial_control_software/minidelay/minidelay BURS:STAT ON
+sleep 0.2
+
+
+echo "It is now safe to connect the cable between the amplifier board and the readout board"
+echo "Please do so and press any key to continue, or press q to exit this script"
+read -n 1 -s input 
+if [[ $input = "q" ]]; then 
+    echo "Exiting script"
+    exit 1 
+fi
+
+# high voltage
+sls_detector_put vhighvoltage 130
+# output on
+/afs/psi.ch/project/sls_det_software/serial_control_software/minidelay/minidelay OUTP ON
+sleep 0.2
+
+echo "The current on the amplifier board should be ~0.035 A"
+echo "Please check and press any key to continue, or press q to exit this script"
+read -n 1 -s input 
+if [[ $input = "q" ]]; then 
+    echo "Exiting script"
+    exit 1 
+fi
+
+echo "The receiver should be waiting for data"
+echo "Please check and press any key to continue, or press q to exit this script"
+read -n 1 -s input 
+if [[ $input = "q" ]]; then 
+    echo "Exiting script"
+    exit 1 
+fi
+
+
+# the scan
+for ivpulse in {10..1000..10}
+do 
+
+vpulse=$(printf %.3f $(echo "$ivpulse/1000" | bc -l))
+/afs/psi.ch/project/sls_det_software/serial_control_software/minidelay/minidelay VOLT $vpulse
+sleep 1
+sls_detector_put start 
+sleep 1
+done
+
+for ivpulse in {1050..7000..50}
+do 
+vpulse=$(printf %.3f $(echo "$ivpulse/1000" | bc -l))
+/afs/psi.ch/project/sls_det_software/serial_control_software/minidelay/minidelay VOLT $vpulse
+sleep 1
+sls_detector_put start 
+sleep 1
+done
+
+
+# high voltage
+sls_detector_put vhighvoltage 0
+# output off
+/afs/psi.ch/project/sls_det_software/serial_control_software/minidelay/minidelay OUTP OFF
+
+echo "Finished scan, please wait for capacitor to discharge"
+sleep 20
+echo "It is now safe to disconnect the cable between the amplifier board and the readout board"
+echo "Script finished"

CS_analysis.cpp

@@ -235,7 +235,18 @@ int main(int argc, char* argv[]) {
   scan_v6.push_back("360");
   scan_v6.push_back("373");
   scan_v6.push_back("380");
-
+  scan_v6.push_back("304");
+  scan_v6.push_back("321");
+  scan_v6.push_back("346");
+  scan_v6.push_back("375");
+  scan_v6.push_back("381");
+  scan_v6.push_back("383");
+  scan_v6.push_back("310");
+  scan_v6.push_back("313");
+  scan_v6.push_back("314");
+  scan_v6.push_back("334");
+  scan_v6.push_back("337");
+  scan_v6.push_back("347");
 
 
   jungfrauFile *thisfile = new jungfrauFile();
@@ -526,9 +537,13 @@ int main(int argc, char* argv[]) {
 	    adcmap_all->Fill(i%NC,i/NC,adc);
 	    gainmap_all->Fill(i%NC,i/NC,gain);
 	  }
-
+#ifdef JF11
+	  if (((i/NC <= 255) && (((i%64)) ==  63-(j)%64)) ||
+	      ((i/NC >= 256) &&( ((-1*(i-524287))%64) == 63-(j)%64))) {  //scanning on "+-i") 
+#else
 	  if (((i/NC <= 255) && (i%64 == (j-1)%64)) ||
 	      ((i/NC >= 256) &&((-1*(i-524287))%64 == (j-1)%64))) {
+#endif
 
 	    uint16_t adc = imagedptr[i]&0x3fff;
 	    uint16_t gain = (imagedptr[i]&0xc000) >> 14;
@@ -1799,7 +1814,13 @@ int main(int argc, char* argv[]) {
     g1overg2map->GetXaxis()->SetTitle("Column");
     g1overg2map->GetYaxis()->SetTitle("Row");
     g1overg2map->GetYaxis()->SetTitleOffset(0.7);
-    g1overg2map->GetZaxis()->SetRangeUser(12,13.2);
+
+#ifdef JF11
+    g1overg2map->GetZaxis()->SetRangeUser(11,12.5);
+#else
+ g1overg2map->GetZaxis()->SetRangeUser(12,13.2);
+#endif
+
     g1overg2map->Draw("colz");
     pave->Clear();
     pave->AddText("G1/G2");

CS_scan_JF11.sh

@@ -0,0 +1,218 @@
+#!/bin/bash
+
+# to run do: bash CS_scan.sh
+
+# prerequisites:
+# - setup_env.sh souced 
+# - the hostname is set
+# - detector is on
+if [ "$1" == "" ] || [ $# -gt 1 ]; then
+        echo "Parameter 1 is empty  specify G0 for normal, HG0 for HG0G1G2"
+        exit 0
+fi 
+
+
+
+sls_detector_put powerchip 0
+sleep 1
+
+sls_detector_put stop;
+sls_detector_put setbit 0x5d 7  
+sls_detector_put powerchip 1
+
+sleep 2 
+
+ 
+
+if [ "$1" == 'HG0' ]; then 
+sls_detector_put reg 0x58 0x00800f ; sls_detector_put setbit 0x58 31 ; sls_detector_put clearbit 0x58 31;
+echo "HG0G1G2 mode"
+else
+sls_detector_put reg 0x58 0x10800f ; sls_detector_put setbit 0x58 31 ; sls_detector_put clearbit 0x58 31;
+echo "normal mode"
+fi 
+
+sls_detector_put reg 0x7f 0xff1f
+sls_detector_put reg 0x59 0x1110
+
+
+sls_detector_put reg 0x5b 0xffffffff
+sls_detector_put reg 0x5a 0xffffffff
+sls_detector_put setbit 0x58 30 ; sls_detector_put clearbit 0x58 30;
+
+sls_detector_put clearbit 0x5d 16
+sls_detector_put clearbit 0x5d 17
+
+
+sls_detector_put frames 640
+sls_detector_put period 0.005
+sls_detector_put exptime 0.000010
+sls_detector_put vhighvoltage 200
+
+# configure for receiver on mpc2012
+sls_detector_put rx_udpport 32410
+sls_detector_put rx_udpip 10.1.4.105
+sls_detector_put rx_udpmac 3C:FD:FE:A2:14:D8
+sls_detector_put detectorip 10.1.4.9
+sls_detector_put detectormac 00:ab:be:cc:dd:e2
+
+
+
+echo "The receiver should be waiting for data"
+echo "Please check and press any key to continue, or press q to exit this script"
+read -n 1 -s input 
+if [[ $input = "q" ]]; then 
+    echo "Exiting script"
+    exit 1 
+fi
+
+
+echo "recording G0 pede" 
+sls_detector_put start 
+sleep 4
+
+
+echo "recording G1 pede" 
+sls_detector_put setbit 0x5d 12
+sls_detector_put start 
+sleep 4
+
+
+echo "recording G2 pede"
+sls_detector_put setbit 0x5d 13
+sls_detector_put start 
+sleep 4
+
+
+sls_detector_put clearbit 0x5d 12
+sls_detector_put clearbit 0x5d 13
+
+
+# turn on current source
+# bit 16 high bit 17 low = automatic cal col sweep 
+# bit 16 high bit 17 high = cal col selected with bits 26-20
+
+
+
+sls_detector_put reg 0x5b 0x00000001
+sls_detector_put reg 0x5a 0x00000001
+sls_detector_put setbit 0x58 30 ; sls_detector_put clearbit 0x58 30;
+
+
+sls_detector_put setbit 0x5d 16
+sleep 1
+
+
+
+
+
+
+
+
+
+
+# loop 1
+for tint in {50..450..50} # 25 is too small here, 50 min
+do
+tint_sec=$(printf %.9f $(echo "$tint/1000000000" | bc -l))
+echo "setting integration time to (s) " $tint_sec
+sls_detector_put exptime $tint_sec
+sls_detector_put start
+sleep 4
+done
+
+
+# loop 2a
+for tint in {50..100..5}
+do
+tint_sec=$(printf %.8f $(echo "$tint/100000000" | bc -l))
+echo "setting integration time to (s) " $tint_sec
+sls_detector_put exptime $tint_sec
+sls_detector_put start
+sleep 4
+done
+
+
+# loop 2b
+for tint in {110..200..10}
+do
+tint_sec=$(printf %.8f $(echo "$tint/100000000" | bc -l))
+echo "setting integration time to (s) " $tint_sec
+sls_detector_put exptime $tint_sec
+sls_detector_put start
+sleep 4
+done
+
+
+# loop 2c
+for tint in {225..450..25}
+do
+tint_sec=$(printf %.8f $(echo "$tint/100000000" | bc -l))
+echo "setting integration time to (s) " $tint_sec
+sls_detector_put exptime $tint_sec
+sls_detector_put start
+sleep 4
+done
+
+
+# loop 3a
+for tint in {50..100..5}
+do 
+tint_sec=$(printf %.7f $(echo "$tint/10000000" | bc -l))
+echo "setting integration time to (s) " $tint_sec 
+sls_detector_put exptime $tint_sec
+sls_detector_put start 
+sleep 4
+done
+
+
+# loop 3b
+for tint in {110..200..10}
+do 
+tint_sec=$(printf %.7f $(echo "$tint/10000000" | bc -l))
+echo "setting integration time to (s) " $tint_sec 
+sls_detector_put exptime $tint_sec
+sls_detector_put start 
+sleep 4
+done
+
+
+# loop 3c
+for tint in {225..450..25}
+do 
+tint_sec=$(printf %.7f $(echo "$tint/10000000" | bc -l))
+echo "setting integration time to (s) " $tint_sec 
+sls_detector_put exptime $tint_sec
+sls_detector_put start 
+sleep 4
+done
+
+
+# loop 4a
+for tint in {50..100..5}
+do 
+tint_sec=$(printf %.7f $(echo "$tint/1000000" | bc -l))
+echo "setting integration time to (s) " $tint_sec 
+sls_detector_put exptime $tint_sec
+sls_detector_put start 
+sleep 4
+done
+
+
+# loop 4b
+for tint in {110..250..10}
+do 
+tint_sec=$(printf %.7f $(echo "$tint/1000000" | bc -l))
+echo "setting integration time to (s) " $tint_sec 
+sls_detector_put exptime $tint_sec
+sls_detector_put start 
+sleep 4
+done
+
+
+echo "Finished scan"
+sls_detector_put exptime 0.000010
+sls_detector_put period 0.002 
+sls_detector_put frames 1000000
+sls_detector_put clearbit 0x5d 16
+echo "Script finished"

CuFluo_exposure.sh

@@ -9,113 +9,110 @@
 # - detector is on
 # - xray tube is on and ramped for 40 kV, 60 mA, set to Cu
 
+sls_detector_put stop #just in case
 sls_detector_put powerchip 1
 
-# set ADCINVERSionreg (by trial and error)
-sls_detector_put reg 0x43 0x453b2a9c 
 
 sls_detector_put period 0.002
 sls_detector_put exptime 0.000010
 sls_detector_put vhighvoltage 200
 
 # configure for receiver on mpc2012
-sls_detector_put rx_udpport 32411
-sls_detector_put rx_udpip 10.1.1.105
-sls_detector_put rx_udpmac 3C:FD:FE:A2:14:DB
-sls_detector_put detectorip 10.1.1.9
+sls_detector_put rx_udpport 32410
+sls_detector_put rx_udpip 10.1.4.105
+sls_detector_put rx_udpmac 3C:FD:FE:A2:14:D8
+sls_detector_put detectorip 10.1.4.9
 sls_detector_put detectormac 00:ab:be:cc:dd:e2
-sls_detector_put configuremac 0 
+sls_detector_put speed 1 
 
+KILLRCV="killall ju_udp_receiver_3threads_2_0"
+$KILLRCV
 
 CLI=/afs/psi.ch/project/sls_det_software/bin/xrayClient_sl7 
 $CLI setv 40
 $CLI setc 60
 $CLI HV on
 
+
 $CLI shutter 1 off
-echo "The receiver should be waiting for data (G0 pede file)"
-echo "Please check and press any key to continue, or press q to exit this script"
-read -n 1 -s input 
-if [[ $input = "q" ]]; then 
-    echo "Exiting script"
-    exit 1 
-fi
+echo "warmin up the board"
+#sls_detector_put frames 100000
+#sls_detector_put start 
+#sleep 210
+echo "end of board warm up"
+
 
 sls_detector_put frames 1000
+$KILLRCV 
+sleep 1
+$TKPG0 &
 
 echo "recording G0 pede" 
-sls_detector_put status start 
+sls_detector_put start 
 sleep 3 
 # 1000 frames at 500 frames per second takes 2s
 
-
 echo "recording G1 pede" 
 sls_detector_put setbit 0x5d 12
-sls_detector_put status start 
+sls_detector_put start 
 sleep 3
 
 
 echo "recording G2 pede"
 sls_detector_put setbit 0x5d 13
-sls_detector_put status start 
+sls_detector_put start 
 sleep 3
 
 
 sls_detector_put clearbit 0x5d 12
 sls_detector_put clearbit 0x5d 13
 
-
-echo "Please close the G0 pede file and open the G0 CuFluo file"
-echo "Please check and press any key to continue, or press q to exit this script"
-read -n 1 -s input 
-if [[ $input = "q" ]]; then 
-    echo "Exiting script"
-    exit 1 
-fi
+$KILLRCV
+echo "closed G0 pede file and open the G0 CuFluo file"
+sleep 1 
+$TKFG0 &
 
 
-sls_detector_put frames 200000
+sls_detector_put frames 220000
 $CLI shutter 1 on
-sleep 1
-sls_detector_put status start 
-sleep 410
+ sleep 1
+sls_detector_put start 
+sleep 450
 # 200k frames at 500 frames per second takes 400s
 $CLI shutter 1 off
 
-echo "Please close the G0 CuFluo file and open HG0 pede file"
-echo "Please check and press any key to continue, or press q to exit this script"
-read -n 1 -s input 
-if [[ $input = "q" ]]; then 
-    echo "Exiting script"
-    exit 1 
-fi
+
+$KILLRCV
+echo "closed G0 CuFluo file and open HG0 pede file"
+sleep 1 
+$TKPHG0 &
 
 sls_detector_put setbit 0x5d 0
 
 sls_detector_put frames 1000
 
 echo "recording HG0 pede" 
-sls_detector_put status start 
+sls_detector_put start 
 sleep 3 
 # 1000 frames at 500 frames per second takes 2s
 
 
-echo "Please close the HG0 pede file and open the HG0 CuFluo file"
-echo "Please check and press any key to continue, or press q to exit this script"
-read -n 1 -s input 
-if [[ $input = "q" ]]; then 
-    echo "Exiting script"
-    exit 1 
-fi
+$KILLRCV
+echo "closed HG0 pede file and open the HG0 CuFluo file"
+sleep 1 
+$TKFHG0 &
 
 
-sls_detector_put frames 200000
+sls_detector_put frames 220000
 $CLI shutter 1 on
 sleep 1
-sls_detector_put status start 
-sleep 410
+sls_detector_put start 
+sleep 450
 # 200k frames at 500 frames per second takes 400s
 $CLI shutter 1 off
 
-echo "You can close the HG0 CuFluo file"
+
+$KILLRCV
+
+
 echo "Script finished"

filename_creator.sh

@@ -3,23 +3,81 @@ echo "printing filenames for module " $1
 echo "copy paste to execute "
 datafolder="/mnt/pcmoench_jungfrau_calib/data/Module_"$1"_Calib/"
 datestring=$(date +%F)
-echo "mkdir "$datafolder
+echo "mkdir "$datafolder 
 
 echo "./ju_udp_receiver_3threads_2_0 S "$datafolder"BP_M"$1"_"$datestring"_ 10.1.4.105"
 echo "./ju_udp_receiver_3threads_2_0 S "$datafolder"CS_M"$1"_"$datestring"_ 10.1.4.105"
-echo "./ju_udp_receiver_3threads_2_0 S "$datafolder"CuFluoG0_M"$1"_"$datestring"_ 10.1.4.105"
-echo "./ju_udp_receiver_3threads_2_0 S "$datafolder"CuFluoHG0_M"$1"_"$datestring"_ 10.1.4.105"
-echo "./ju_udp_receiver_3threads_2_0 S "$datafolder"pedeG0_M"$1"_"$datestring"_ 10.1.4.105"
-echo "./ju_udp_receiver_3threads_2_0 S "$datafolder"pedeHG0_M"$1"_"$datestring"_ 10.1.4.105"
+
+echo "additional lines for JF11"
+echo "./ju_udp_receiver_3threads_2_0 S "$datafolder"BP_M"$1"_"$datestring"_HGOG1G2 10.1.4.105"                                                                               
+echo "./ju_udp_receiver_3threads_2_0 S "$datafolder"CS_M"$1"_"$datestring"_HGOG1G2 10.1.4.105"
+
+
+echo "exporting the fluorescence receiver commands "
+export TKFG0="ju_udp_receiver_3threads_2_0 S "$datafolder"CuFluoG0_M"$1"_"$datestring"_ 10.1.4.105"
+export TKFHG0="ju_udp_receiver_3threads_2_0 S "$datafolder"CuFluoHG0_M"$1"_"$datestring"_ 10.1.4.105"
+export TKPG0="ju_udp_receiver_3threads_2_0 S "$datafolder"pedeG0_M"$1"_"$datestring"_ 10.1.4.105"
+export TKPHG0="ju_udp_receiver_3threads_2_0 S "$datafolder"pedeHG0_M"$1"_"$datestring"_ 10.1.4.105"
+
+
+echo "printing the analysis commands " 
+for file in $(find $datafolder -type f -exec basename {} \; | grep 000000 ); do 
+    prefix=${file%_000000.dat}
+    echo $prefix ; 
+    if [[ $prefix == *"BP"* ]]; then
+
+	    bpfile=$prefix
+  
+    fi
+     if [[ $prefix == *"CS"* ]]; then
+
+	   	csfile=$prefix 
+
+    fi
+    if [[ $prefix == *"oG0"* ]]; then
+
+	   cgofile=$prefix
+
+    fi 
+    if [[ $prefix == *"eG0"* ]]; then
+
+	   pgofile=$prefix
+
+    fi 
+    if [[ $prefix == *"oHG0"* ]]; then
+
+	   chgofile=$prefix
+
+    fi 
+    if [[ $prefix == *"eHG0"* ]]; then
+
+	   phgofile=$prefix
+
+    fi 
+
+#    echo "ss"
+done
+echo "----------------------------------------------------------------------"
+echo "---------------------START OF ANALYSIS CLI commands --------------------"
+echo "----------------------------------------------------------------------"
+echo "./CuFluo_analysis "$1" G0 "$datafolder $pgofile $cgofile 
+echo "./CuFluo_analysis "$1" HG0 "$datafolder $phgofile $chgofile 
+echo "./BP_analysis "$1" "$datafolder"/"$bpfile
+echo "./CS_analysis "$1" "$datafolder $csfile
+echo "./JFMC_CalibWriter_wBP" "$1"
+echo "----------------------------------------------------------------------"
+echo "---------------------END OF ANALYSIS CLI commands --------------------"
+echo "----------------------------------------------------------------------"
+
 
 echo "creating the output folders?   Y for yes "
 read -n 1 -s input
 if [[ $input = "Y" ]]; then 
     echo "creating the output folders."
-    plotbasefolder="/afs/psi.ch/project/mythen/sophie/JFCalibration/plot/M"$1
+    plotbasefolder="/afs/psi.ch/project/mythen/sophie/JFCalibration/plots/M"$1
     mkdir -v $plotbasefolder
     mkdir -v $plotbasefolder"/BackplanePulsing"
-    mkdir -v $plotbasefolder"/Calib_"$datestring
+#    mkdir -v $plotbasefolder"/Calib_"$datestring #done by/JFMC_CalibWrite 
     mkdir -v $plotbasefolder"/CuFluo"
     mkdir -v $plotbasefolder"/CuFluo/G0"
     mkdir -v $plotbasefolder"/CuFluo/HG0"

makefile

@@ -7,6 +7,10 @@ DB_analysis: DB_analysis.cpp
 
 CS_analysis: CS_analysis.cpp
 	g++ -Wall -O3 -m64 -I$(ROOTSYS)/include -L$(ROOTSYS)/lib -lGui -lCore -lCint -lRIO -lNet -lHist -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript -lMatrix -lPhysics -lMathCore -lThread -pthread -lm -ldl -rdynamic CS_analysis.cpp -o CS_analysis
+	g++ -DJF11 -Wall -O3 -m64 -I$(ROOTSYS)/include -L$(ROOTSYS)/lib -lGui -lCore -lCint -lRIO -lNet -lHist -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript -lMatrix -lPhysics -lMathCore -lThread -pthread -lm -ldl -rdynamic CS_analysis.cpp -o CS_analysis_JF11
+
+
+
 
 CS_BaselineTest: CS_BaselineTest.cpp
 	g++ -Wall -O3 -m64 -I$(ROOTSYS)/include -L$(ROOTSYS)/lib -lGui -lCore -lCint -lRIO -lNet -lHist -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript -lMatrix -lPhysics -lMathCore -lThread -pthread -lm -ldl -rdynamic CS_BaselineTest.cpp -o CS_BaselineTest

run_JFCalibration.txt

@@ -1487,3 +1487,101 @@ Module 380
 ./BP_analysis 380 /mnt/pcmoench_jungfrau_calib/data/Module_380_Calib/BP_M380_2020-01-22_120V
 ./CS_analysis 380 /mnt/pcmoench_jungfrau_calib/data/Module_380_Calib CS_M380_2020-01-22_120V
 ./JFMC_CalibWriter_wBP 380
+
+
+M304
+./CuFluo_analysis 304 G0 /mnt/pcmoench_jungfrau_calib/data/Module_304_Calib/ pedeG0_M304_2020-11-17 CuFluoG0_M304_2020-11-17
+./CuFluo_analysis 304 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_304_Calib/ pedeHG0_M304_2020-11-17 CuFluoHG0_M304_2020-11-17
+./BP_analysis 304 /mnt/pcmoench_jungfrau_calib/data/Module_304_Calib//BP_M304_2020-11-19
+./CS_analysis 304 /mnt/pcmoench_jungfrau_calib/data/Module_304_Calib/ CP_M304_2020-11-11
+./JFMC_CalibWriter_wBP 304
+
+
+
+M321
+./CuFluo_analysis 321 G0 /mnt/pcmoench_jungfrau_calib/data/Module_321_Calib/ pedeG0_M321_2020-11-17 CuFluoG0_M321_2020-11-17
+./CuFluo_analysis 321 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_321_Calib/ pedeHG0_M321_2020-11-17 CuFluoHG0_M321_2020-11-17
+./BP_analysis 321 /mnt/pcmoench_jungfrau_calib/data/Module_321_Calib//BP_M321_2020-11-19
+./CS_analysis 321 /mnt/pcmoench_jungfrau_calib/data/Module_321_Calib/ CS_M321_2020-11-11
+./JFMC_CalibWriter_wBP 321 
+
+
+
+M346
+./CuFluo_analysis 346 G0 /mnt/pcmoench_jungfrau_calib/data/Module_346_Calib/ pedeG0_M346_2020-11-17 CuFluoG0_M346_2020-11-17
+./CuFluo_analysis 346 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_346_Calib/ pedeHG0_M346_2020-11-17 CuFluoHG0_M346_2020-11-17
+./BP_analysis 346 /mnt/pcmoench_jungfrau_calib/data/Module_346_Calib//BP_M346_2020-11-19
+./CS_analysis 346 /mnt/pcmoench_jungfrau_calib/data/Module_346_Calib/ CS_M346_2020-11-11
+./JFMC_CalibWriter_wBP 346 
+
+
+
+
+
+M375
+ ./CuFluo_analysis 375 G0 /mnt/pcmoench_jungfrau_calib/data/Module_375_Calib/ pedeG0_M375_2020-11-23 CuFluoG0_M375_2020-11-23
+ ./CuFluo_analysis 375 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_375_Calib/ pedeHG0_M375_2020-11-23 CuFluoHG0_M375_2020-11-23
+./BP_analysis 375 /mnt/pcmoench_jungfrau_calib/data/Module_375_Calib//BP_M375_2020-11-19
+./CS_analysis 375 /mnt/pcmoench_jungfrau_calib/data/Module_375_Calib/ CS_M375_2020-11-11
+./JFMC_CalibWriter_wBP  375
+
+
+M381
+./CuFluo_analysis 381 G0 /mnt/pcmoench_jungfrau_calib/data/Module_381_Calib/ pedeG0_M381_2020-11-17 CuFluoG0_M381_2020-11-17
+./CuFluo_analysis 381 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_381_Calib/ pedeHG0_M381_2020-11-17 CuFluoHG0_M381_2020-11-17
+./BP_analysis 381 /mnt/pcmoench_jungfrau_calib/data/Module_381_Calib//BP_M381_2020-11-19
+./CS_analysis 381 /mnt/pcmoench_jungfrau_calib/data/Module_381_Calib/ CS_M381_2020-11-11
+./JFMC_CalibWriter_wBP 381
+
+
+M383
+
+./CuFluo_analysis 383 G0 /mnt/pcmoench_jungfrau_calib/data/Module_383_Calib/ pedeG0_M383_2020-11-17 CuFluoG0_M383_2020-11-17
+./CuFluo_analysis 383 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_383_Calib/ pedeHG0_M383_2020-11-17 CuFluoHG0_M383_2020-11-17
+./BP_analysis 383 /mnt/pcmoench_jungfrau_calib/data/Module_383_Calib//BP_M383_2020-11-19
+./CS_analysis 383 /mnt/pcmoench_jungfrau_calib/data/Module_383_Calib/ CS_M383_2020-11-11
+./JFMC_CalibWriter_wBP 383 
+
+M310
+./CuFluo_analysis 310 G0 /mnt/pcmoench_jungfrau_calib/data/Module_310_Calib/ pedeG0_M310_2021-01-18 CuFluoG0_M310_2021-01-18
+./CuFluo_analysis 310 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_310_Calib/ pedeHG0_M310_2021-01-18 CuFluoHG0_M310_2021-01-18
+./BP_analysis 310 /mnt/pcmoench_jungfrau_calib/data/Module_310_Calib//BP_M310_2021-01-18
+./CS_analysis 310 /mnt/pcmoench_jungfrau_calib/data/Module_310_Calib/ CS_M310_2021-01-18
+./JFMC_CalibWriter_wBP 310
+
+
+M313
+./CuFluo_analysis 313 G0 /mnt/pcmoench_jungfrau_calib/data/Module_313_Calib/ pedeG0_M313_2021-01-18 CuFluoG0_M313_2021-01-18
+./CuFluo_analysis 313 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_313_Calib/ pedeHG0_M313_2021-01-18 CuFluoHG0_M313_2021-01-18
+./BP_analysis 313 /mnt/pcmoench_jungfrau_calib/data/Module_313_Calib//BP_M313_2021-01-18
+./CS_analysis 313 /mnt/pcmoench_jungfrau_calib/data/Module_313_Calib/ CS_M313_2021-01-18
+./JFMC_CalibWriter_wBP 313
+
+
+M314
+./CuFluo_analysis 314 G0 /mnt/pcmoench_jungfrau_calib/data/Module_314_Calib/ pedeG0_M314_2021-01-18 CuFluoG0_M314_2021-01-18
+./CuFluo_analysis 314 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_314_Calib/ pedeHG0_M314_2021-01-18 CuFluoHG0_M314_2021-01-18
+./BP_analysis 314 /mnt/pcmoench_jungfrau_calib/data/Module_314_Calib//BP_M314_2021-01-18
+./CS_analysis 314 /mnt/pcmoench_jungfrau_calib/data/Module_314_Calib/ CS_M314_2021-01-18
+./JFMC_CalibWriter_wBP 314
+
+M334
+./CuFluo_analysis 334 G0 /mnt/pcmoench_jungfrau_calib/data/Module_334_Calib/ pedeG0_M334_2021-01-18 CuFluoG0_M334_2021-01-18
+./CuFluo_analysis 334 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_334_Calib/ pedeHG0_M334_2021-01-18 CuFluoHG0_M334_2021-01-18
+./BP_analysis 334 /mnt/pcmoench_jungfrau_calib/data/Module_334_Calib//BP_M334_2021-01-18
+./CS_analysis 334 /mnt/pcmoench_jungfrau_calib/data/Module_334_Calib/ CS_M334_2021-01-18
+./JFMC_CalibWriter_wBP 334
+
+M337
+./CuFluo_analysis 337 G0 /mnt/pcmoench_jungfrau_calib/data/Module_337_Calib/ pedeG0_M337_2021-01-18 CuFluoG0_M337_2021-01-18
+./CuFluo_analysis 337 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_337_Calib/ pedeHG0_M337_2021-01-18 CuFluoHG0_M337_2021-01-18
+./BP_analysis 337 /mnt/pcmoench_jungfrau_calib/data/Module_337_Calib//BP_M337_2021-01-18
+./CS_analysis 337 /mnt/pcmoench_jungfrau_calib/data/Module_337_Calib/ CS_M337_2021-01-18
+./JFMC_CalibWriter_wBP 337
+
+M342
+./CuFluo_analysis 342 G0 /mnt/pcmoench_jungfrau_calib/data/Module_342_Calib/ pedeG0_M342_2021-01-18 CuFluoG0_M342_2021-01-18
+./CuFluo_analysis 342 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_342_Calib/ pedeHG0_M342_2021-01-18 CuFluoHG0_M342_2021-01-18
+./BP_analysis 342 /mnt/pcmoench_jungfrau_calib/data/Module_342_Calib//BP_M342_2021-01-18
+./CS_analysis 342 /mnt/pcmoench_jungfrau_calib/data/Module_342_Calib/ CS_M342_2021-01-18
+./JFMC_CalibWriter_wBP 342