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

Timestamp:

Nov 28, 2011, 9:56:39 AM (13 years ago)

Author:

campagne

Message:

cleaning

File:

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

BAORadio/AmasNancay/trunk/mergeAnaFiles.cc

@@ -63 +63 @@
 //--------------------------------------------------------------
 //Utility functions
+// template <class T>
+// void MeanSigma(TArray<T> const & a, T & mean, T & sig){
+//   if (a.NbDimensions() < 1) 
+//     throw RangeCheckError("MathArray<T>::MeanSigma(TArray<T> const & a..) Not Allocated Array a !");
+//   const T * pe;
+//   sa_size_t j,k;
+//   mean=0.;
+//   sig = 0.;
+//   T valok;
+//   if (a.AvgStep() > 0)   {  // regularly spaced elements
+//     sa_size_t step = a.AvgStep(); 
+//     sa_size_t maxx = a.Size()*step;
+//     pe = a.Data();
+//     for(k=0; k<maxx; k+=step )  { 
+//       valok = pe[k]; 
+//       mean += valok;  sig += valok*valok;
+//     }
+//   }
+//   else {    // Non regular data spacing ...
+//     int_4 ka = a.MaxSizeKA();
+//     sa_size_t step = a.Step(ka);
+//     sa_size_t gpas = a.Size(ka)*step;
+//     sa_size_t naxa = a.Size()/a.Size(ka);
+//     for(j=0; j<naxa; j++)  {
+//       pe = a.DataBlock().Begin()+a.Offset(ka,j);
+//       for(k=0; k<gpas; k+=step) { 
+//      valok = pe[k]; 
+//      mean += valok;  sig += valok*valok;
+//       }
+//     }
+//   }
+//   T dsz = (T)(a.Size());
+//   mean /= dsz;
+//   if (dsz > 1.5) {
+//     sig = sig/dsz - mean*mean;
+//     sig *= (dsz/(dsz-1));
+//     if (sig >= 0.) sig = sqrt(sig);
+//   }
+//   else sig = 0.;
+// }
+
 
 sa_size_t freqToChan(r_4 f){
@@ -79 +120 @@
   for (sa_size_t ir=0; ir<nr; ir++){
     TVector<r_4> tmp(mtx(Range(ir),Range(chLow,chHigh)),false);
-    double mean, sigma;
+    r_8 mean, sigma;
     MeanSigma(tmp,mean,sigma);
     vec(ir) = mean;
@@ -573 +614 @@
     nr = calibBAOfactors_Off_Run_Ch0.NRows();
     for (sa_size_t ir=0; ir<nr; ++ir){
-//       cout << "Calib. Off Run Ch0 cycle ["<< calibBAOfactors_Off_Run_Ch0(ir,0)<<"], val "
-//         << calibBAOfactors_Off_Run_Ch0(ir,1) << endl;
+      cout << "Calib. Off Run Ch0 cycle ["<< calibBAOfactors_Off_Run_Ch0(ir,0)<<"], val "
+           << calibBAOfactors_Off_Run_Ch0(ir,1) << endl;
 
       calibBAO_Off_Run_Ch0[(int)calibBAOfactors_Off_Run_Ch0(ir,0)]
@@ -625 +666 @@
                << "Ch1 " << calibBAO_On_Cycle_Ch1[*ic] << endl;
         } else {
-          cout << "Cycle NOT calibrated " << endl;
+          cout << "Cycle << " << *ic <<" NOT calibrated for file " << *iFile << endl;
         }
       }//debug
@@ -760 +801 @@
 
       TVector<r_4> meanInRange_1410a1415Freq_OFF_noCalib(NUMBER_OF_CHANNELS);
+      //      meanInRange(aSpecOff,ch1410,ch1415,meanInRange_1410a1415Freq_OFF_noCalib);
       meanInRange(aSpecOffovOff,ch1410,ch1415,meanInRange_1410a1415Freq_OFF_noCalib);
 
@@ -769 +811 @@
 
       TVector<r_4> meanInRange_1410a1415Freq_ON_noCalib(NUMBER_OF_CHANNELS);
+      //meanInRange(aSpecOn,ch1410,ch1415,meanInRange_1410a1415Freq_ON_noCalib);
       meanInRange(aSpecOnovOff,ch1410,ch1415,meanInRange_1410a1415Freq_ON_noCalib);
 
@@ -845 +888 @@
     fos << PPFNameTag(tag) << onoffevolution;    
   }//end of save
+
+
 }
 //JEC 14/11/11 New meanRawDiffOnOffCycles START
@@ -851 +896 @@
 //Used like:
 //
-void 
-meanRawDiffOnOffCycles() throw(string) {
+void meanRawDiffOnOffCycles() throw(string) {
   list<string> listOfFiles;
   string directoryName;
@@ -1095 +1139 @@
 
   }//end save
+
+
 }
 //JEC 14/11/11 New meanRawDiffOnOffCycles END