Changeset 607 for BAORadio/AmasNancay/trunk/mergeAnaFiles.cc

Timestamp:

Nov 21, 2011, 3:35:31 PM (13 years ago)

Author:

campagne

Message:

improve ON et OFF sur OFF filtre (jec)

File:

• BAORadio/AmasNancay/trunk/mergeAnaFiles.cc (modified) (4 diffs)

BAORadio/AmasNancay/trunk/mergeAnaFiles.cc

@@ -304 +304 @@
                               ,"onoffRun01420side","onoffRun11420side"
                               ,"onoffCycle01420side","onoffCycle11420side"
-                              ,"onoffRaw0f14001420","onoffRaw1f14001420"
-                              ,"offRaw0f14001420","offRaw1f14001420"
-                              ,"onRaw0f14001420","onRaw1f14001420"
+                              ,"onoffRaw0f14101415","onoffRaw1f14101415"
+                              ,"offRaw0f14101415","offRaw1f14101415"
+                              ,"onRaw0f14101415","onRaw1f14101415"
   };
   NTuple onoffevolution(NINFO,onffTupleName);
@@ -327 +327 @@
   sa_size_t ch1400 = freqToChan(1400);
   sa_size_t ch1405 = freqToChan(1400);
+  sa_size_t ch1410 = freqToChan(1410);
   sa_size_t ch1415 = freqToChan(1415);
   sa_size_t ch1420 = freqToChan(1420);
@@ -758 +759 @@
       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);
+      TVector<r_4> meanInRange_1410a1415Freq_OFF_noCalib(NUMBER_OF_CHANNELS);
+      meanInRange(aSpecOffovOff,ch1410,ch1415,meanInRange_1410a1415Freq_OFF_noCalib);
+
+      xnt[21] = meanInRange_1410a1415Freq_OFF_noCalib(0);
+      xnt[22] = meanInRange_1410a1415Freq_OFF_noCalib(1);
+
       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);
+      TVector<r_4> meanInRange_1410a1415Freq_ON_noCalib(NUMBER_OF_CHANNELS);
+      meanInRange(aSpecOnovOff,ch1410,ch1415,meanInRange_1410a1415Freq_ON_noCalib);
+
+      xnt[23] = meanInRange_1410a1415Freq_ON_noCalib(0);
+      xnt[24] = meanInRange_1410a1415Freq_ON_noCalib(1);
       
       //store infos to Ntuple
@@ -852 +851 @@
 //Used like:
 //
-void meanRawDiffOnOffCycles() throw(string) {
+void 
+meanRawDiffOnOffCycles() throw(string) {
   list<string> listOfFiles;
   string directoryName;