Changeset 604 for BAORadio

Timestamp:

Nov 16, 2011, 12:02:10 PM (13 years ago)

Author:

campagne

Message:

add the ON/Filtered_OFF and OFF/Filetred_OFF (jec)

Location:

BAORadio/AmasNancay/trunk

Files:

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

BAORadio/AmasNancay/trunk/etude_mergeAna.pic

@@ -1 @@
-
 
 set source  $1
@@ -438 +437 @@
 #
 
+graphicatt ""
+del sonovoff0 sonovoff1
+objaoper meanOnovOffNoCalib row 0 sonovoff0
+objaoper meanOnovOffNoCalib row 1 sonovoff1
+del soffovoff0 soffovoff1
+objaoper meanOffovOffNoCalib row 0 soffovoff0
+objaoper meanOffovOffNoCalib row 1 soffovoff1
+newwin 1 2
+plot2d sonovoff0 (n/8192)*250+1250 val n>0 "blue cpts notit nsta"
+plot2d sonovoff1 (n/8192)*250+1250 val n>0 "same red cpts notit nsta"
+settitle "Raw ON/OFF ${source} Ch 0 (blue) Ch 1 (red) ${ncycles}cycles" ' ' $defatt
+setaxelabels "Freq. (MHz)" "I (a.u)" $axedefatt
+plot2d soffovoff0 (n/8192)*250+1250 val n>0 "blue cpts notit nsta"
+plot2d soffovoff1 (n/8192)*250+1250 val n>0 "same red cpts notit nsta"
+settitle "Raw OFF/OFF ${source} Ch 0 (blue) Ch 1 (red) ${ncycles}cycles" ' ' $defatt
+setaxelabels "Freq. (MHz)" "I (a.u)" $axedefatt
+
+
 graphicatt "xylimits=1250,1500,-0.01,0.01"
 del sonoffovoff0 sonoffovoff1

BAORadio/AmasNancay/trunk/mergeAnaFiles.cc

@@ -844 +844 @@
   TMatrix<r_4> meanDiffONOFF_noCalib(NUMBER_OF_CHANNELS,NUMBER_OF_FREQ);      //(ON-OFF)/GAIN
   TMatrix<r_4> meanDiffONOFFovOFF_noCalib(NUMBER_OF_CHANNELS,NUMBER_OF_FREQ); //(ON-OFF)/Filtered_OFF
+  TMatrix<r_4> meanONovOFF_noCalib(NUMBER_OF_CHANNELS,NUMBER_OF_FREQ); //  ON/Filtered_OFF
+  TMatrix<r_4> meanOFFovOFF_noCalib(NUMBER_OF_CHANNELS,NUMBER_OF_FREQ); // OFF/Filtered_OFF
 
   int totalNumberCycles=0; //total number of cycles
@@ -934 +936 @@
       meanDiffONOFFovOFF_noCalib += diffOnOffOvOff_noCalib;
 
+
+      //JEC 15/11/11 add ON/OFF and OFF/OFF
+      TMatrix<r_4> onOvOff(aSpecOn,false);
+      onOvOff.Div(aSpecOffFitltered);
+      meanONovOFF_noCalib += onOvOff;
+      
+      TMatrix<r_4> offOvOff(aSpecOff,false);
+      offOvOff.Div(aSpecOffFitltered);
+      meanOFFovOFF_noCalib += offOvOff;
+
       totalNumberCycles++;
 
@@ -948 +960 @@
     meanDiffONOFFovOFF_noCalib  /= (r_4)totalNumberCycles;
     meanDiffONOFF_noCalib       /= (r_4)totalNumberCycles;
+    meanONovOFF_noCalib         /= (r_4)totalNumberCycles;
+    meanOFFovOFF_noCalib        /= (r_4)totalNumberCycles;
   }  
 
@@ -963 +977 @@
     tag = "meanOvOffNoCalib";
     fos << PPFNameTag(tag) << meanDiffONOFFovOFF_noCalib;
-   
+    
+    tag = "meanOnovOffNoCalib";
+    fos << PPFNameTag(tag) << meanONovOFF_noCalib;
+
+    tag = "meanOffovOffNoCalib";
+    fos << PPFNameTag(tag) << meanOFFovOFF_noCalib;
+
   }//end save
 }