Changeset 606 for BAORadio

Timestamp:

Nov 21, 2011, 10:47:14 AM (13 years ago)

Author:

campagne

Message:

suivi du OFF et ON /OFF filtre (jec)

Location:

BAORadio/AmasNancay/trunk

Files:

• etude_mergeAna.pic (modified) (1 diff)
• mergeAnaFiles.cc (modified) (3 diffs)

BAORadio/AmasNancay/trunk/etude_mergeAna.pic

@@ -300 +300 @@
 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
+graphicatt "xylimits=0,500,0.99,1.02"
+
+newwin 1 1
+n/pl onoffevol.offRaw0f14001420%cycle ! ! "blue cpts notit nsta"
+n/pl onoffevol.offRaw1f14001420%cycle ! ! "same red cpts notit nsta"
+n/pl onoffevol.onRaw0f14001420%cycle ! ! "same cyan cpts notit nsta"
+n/pl onoffevol.onRaw1f14001420%cycle ! ! "same orange cpts notit nsta"
+settitle "Raw (OFF,ON)/OFF  ${source} Ch 0 (blue/cyan) Ch 1 (red/orange) ${ncycles}cycles " ' ' $defatt
+setaxelabels "cycle" "I[1400,1420]MHz Raw (a.u)" $axedefatt
         
 endscript

BAORadio/AmasNancay/trunk/mergeAnaFiles.cc

@@ -305 +305 @@
                               ,"onoffCycle01420side","onoffCycle11420side"
                               ,"onoffRaw0f14001420","onoffRaw1f14001420"
-                              ,"offRaw0f14001415","offRaw1f14001415"
-                              ,"onRaw0f14001415","onRaw1f14001415"
+                              ,"offRaw0f14001420","offRaw1f14001420"
+                              ,"onRaw0f14001420","onRaw1f14001420"
   };
   NTuple onoffevolution(NINFO,onffTupleName);
@@ -326 +326 @@
   //1400-1420Mhz
   sa_size_t ch1400 = freqToChan(1400);
+  sa_size_t ch1405 = freqToChan(1400);
   sa_size_t ch1415 = freqToChan(1415);
   sa_size_t ch1420 = freqToChan(1420);
@@ -754 +755 @@
 
       //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);
+      TMatrix<r_4> aSpecOffovOff(aSpecOff,false);
+      aSpecOffovOff.Div(aSpecOffFitltered);
+
+      TVector<r_4> meanInRange_1400a1420Freq_OFF_noCalib(NUMBER_OF_CHANNELS);
+      meanInRange(aSpecOffovOff,ch1400,ch1420,meanInRange_1400a1420Freq_OFF_noCalib);
+
+      xnt[21] = meanInRange_1400a1420Freq_OFF_noCalib(0);
+      xnt[22] = meanInRange_1400a1420Freq_OFF_noCalib(1);
+
+      //      TMatrix<r_4> aSpecOnFitltered(NUMBER_OF_CHANNELS,NUMBER_OF_FREQ);
+      //      medianFiltering(aSpecOn,halfWidth,aSpecOnFitltered);
+      TMatrix<r_4> aSpecOnovOff(aSpecOn,false);
+      aSpecOnovOff.Div(aSpecOffFitltered);
+
+      TVector<r_4> meanInRange_1400a1420Freq_ON_noCalib(NUMBER_OF_CHANNELS);
+      meanInRange(aSpecOnovOff,ch1400,ch1420,meanInRange_1400a1420Freq_ON_noCalib);
+
+      xnt[23] = meanInRange_1400a1420Freq_ON_noCalib(0);
+      xnt[24] = meanInRange_1400a1420Freq_ON_noCalib(1);
       
       //store infos to Ntuple