Changeset 605 for BAORadio

Timestamp:

Nov 18, 2011, 3:16:52 PM (13 years ago)

Author:

campagne

Message:

suivi du ON et OFF separement (jec)

Location:

BAORadio/AmasNancay/trunk

Files:

• etude_mergeAna.pic (modified) (2 diffs)
• mergeAnaFiles.cc (modified) (5 diffs)

BAORadio/AmasNancay/trunk/etude_mergeAna.pic

@@ -25 +25 @@
 clearscript sigmaRaw1420Side
 clearscript sigmaRaw1400a1420
+clearscript evolAt1400a1420OffOn
 ############################################################################
 defscript evolAtCalibFreq
@@ -297 +298 @@
 endscript
 ###########################################
-
+defscript evolAt1400a1420OffOn
+
+#graphicatt "xylimits=0,500,-0.01,0.01"
+
+newwin 1 1
+n/pl onoffevol.offRaw0f14001415%cycle ! ! "blue cpts notit nsta"
+n/pl onoffevol.offRaw1f14001415%cycle ! ! "same red cpts notit nsta"
+n/pl onoffevol.onRaw0f14001415%cycle ! ! "same cyan cpts notit nsta"
+n/pl onoffevol.onRaw1f14001415%cycle ! ! "same orange cpts notit nsta"
+settitle "Raw OFF and ON  ${source} Ch 0 (blue/cyan) Ch 1 (red/orange) ${ncycles}cycles " ' ' $defatt
+setaxelabels "cycle" "I[1400,1415]MHz Raw (a.u)" $axedefatt
+        
+endscript
+###########################################
 defscript evolAt1420SideFreq
 

BAORadio/AmasNancay/trunk/mergeAnaFiles.cc

@@ -39 +39 @@
 //
 //./Objs/mergeAnaFiles -act meanRawDiffOnOff -inPath /sps/baoradio/AmasNancay/JEC/ -src NGC4383 -ppfFile dataRaw -debug 1000 -mxcycles 10
-//./Objs/mergeAnaFiles -act meanCalibBAODiffOnOff -inPath /sps/baoradio/AmasNancay/JEC/ -src Abell85 -ppfFile dataRaw -debug 1 -mxcycles 500
 //./Objs/mergeAnaFiles -src Abell85 -act meanCalibBAODiffOnOff -mxcycles 500 -calibfreq 1410 -inPath /sps/baoradio/AmasNancay/JEC/ -ppfFile dataRaw -debug 1 >& mergeAna-500.log
 //
@@ -294 +293 @@
   TMatrix<r_4> meanDiffONOFF_perRunCalib(NUMBER_OF_CHANNELS,NUMBER_OF_FREQ);      //set to 0
   TMatrix<r_4> meanDiffONOFF_perCycleCalib(NUMBER_OF_CHANNELS,NUMBER_OF_FREQ);    //set to 0
-  static const int NINFO=21;
+  static const int NINFO=25;
   char* onffTupleName[NINFO]={"cycle"
                               ,"onoffRaw0","onoffRaw1"
@@ -306 +305 @@
                               ,"onoffCycle01420side","onoffCycle11420side"
                               ,"onoffRaw0f14001420","onoffRaw1f14001420"
+                              ,"offRaw0f14001415","offRaw1f14001415"
+                              ,"onRaw0f14001415","onRaw1f14001415"
   };
   NTuple onoffevolution(NINFO,onffTupleName);
@@ -323 +324 @@
   sa_size_t ch1420bHigh = freqToChan(1423);
   
-  //25/10/11 follow 1400-1420Mhz
+  //1400-1420Mhz
+  sa_size_t ch1400 = freqToChan(1400);
+  sa_size_t ch1415 = freqToChan(1415);
   sa_size_t ch1420 = freqToChan(1420);
-  sa_size_t ch1400 = freqToChan(1400);
 
   if (para.debuglev_>0){
@@ -750 +752 @@
       xnt[19] = meanInRange_1400a1420Freq_noCalib(0);
       xnt[20] = meanInRange_1400a1420Freq_noCalib(1);
-      
-
+
+      //JEC 18/11/11 follow up the 1400-1420MHz OFF only
+      TVector<r_4> meanInRange_1400a1415Freq_OFF_noCalib(NUMBER_OF_CHANNELS);
+      meanInRange(aSpecOff,ch1400,ch1415,meanInRange_1400a1415Freq_OFF_noCalib);
+
+      xnt[21] = meanInRange_1400a1415Freq_OFF_noCalib(0);
+      xnt[22] = meanInRange_1400a1415Freq_OFF_noCalib(1);
+
+      TVector<r_4> meanInRange_1400a1415Freq_ON_noCalib(NUMBER_OF_CHANNELS);
+      meanInRange(aSpecOn,ch1400,ch1415,meanInRange_1400a1415Freq_ON_noCalib);
+
+      xnt[23] = meanInRange_1400a1415Freq_ON_noCalib(0);
+      xnt[24] = meanInRange_1400a1415Freq_ON_noCalib(1);
       
       //store infos to Ntuple