Changeset 610

Timestamp:

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

Author:

campagne

Message:

cleaning

Location:

BAORadio/AmasNancay/trunk

Files:

• analysis-scriptsAndprg-description.txt (modified) (7 diffs)
• etude_data.pic (deleted)
• etude_onoff.pic (deleted)
• etude_rawonoff.pic (deleted)
• mergeAnaFiles.cc (modified) (9 diffs)
• mergeRawOnOff.pic (deleted)
• plotDiffOnOff.pic (deleted)
• plotRawDiffOnOff.pic (modified) (1 diff)
• proc_script.sh (deleted)

BAORadio/AmasNancay/trunk/analysis-scriptsAndprg-description.txt

@@ -1 +1 @@
 Title: Status of the programs and scripts used for Amas@Nancay analysis at CCIN2P3
-Revision: 11/10/11 (JEC)
+Revision: 28/11/11 (JEC+AST)
 Author: J.E Campagne 22/7/11
 ----------------------------
@@ -21 +21 @@
         - comments
                 . the STANDARD usage since end september 11 is GAIN + ON-OFF wo calibration
+
+
+
                 
 -----------------------------------------------------------
@@ -71 +74 @@
                 . scan Irods directories to look at sca<>.sum files to count the number of cycles per run
 
-B) Utilitary scripts to send to BQS system high level task
+B) Utilitary scripts to send to GE system high level task (note old BQS batch is obsolete now)
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++              
-o submit2bqs-hdrfitsextractor.sh
+o submit2ge-hdrfitsextractor.sh
 --------------------------------
         - SHOULD BE DONE BEFORE gain/calib/analysis
-        - send the hdrfitsextractor.sh script to BQS system     
-        - Todo list
-                - TO MIGRATE TO NEW BATCH 
-
-o submit2bqs-scaextractor.sh
---------------------------------
-        - SHOULD BE DONE BEFORE gain/calib/analysis
-        - send the scaextractor.sh script to BQS system
-                although this script is called by getscafiles lower level script
-        - Todo list
-                - TO MIGRATE TO NEW BATCH 
-
-o submit2bqs-procspecmfib.sh
+        - send the hdrfitsextractor.sh script to GE system      
+
+
+o submit2ge-procspecmfib.sh
 -----------------------------
         - SHOULD BE DONE for processing signals for FFT/paquet median filtering
         - GAIN/CALIB/ON, OFF... 
-        - prepare and send in batch the proc_specmfib.sh to BQS
+        - prepare and send in batch the proc_specmfib.sh to GE
         - exemple
-        ./submit2bqs-procspecmfib.sh -src Abell85 -date 20110422 -type CALIBOFF -fcycle 8 -lcycle 14
-        - Todo list
-                - TO MIGRATE TO NEW BATCH 
-
-o submit2bqs-anagainmaker.sh
+        ./submit2ge-procspecmfib.sh -src Abell85 -date 20110422 -type CALIBOFF -fcycle 8 -lcycle 14
+
+o submit2ge-anagainmaker.sh
 ----------------------------
         - done after proc_specmfib
         - prepare and send the analyse.cc prg for gain computation
         - exemple
-        - Todo list
-                - TO MIGRATE TO NEW BATCH 
-
-o submit2bqs-anacalibmaker.sh
+
+o submit2ge-anacalibmaker.sh
 ----------------------------
         - done after proc_specmfib
         - prepare and send the analyse.cc prg for calibration computation
         - exemples: 
-        > $./submit2bqs-anacalibmaker.sh -src Abell85 -date 20110410
-
+        > $./submit2ge-anacalibmaker.sh -src Abell85 -date 20110410
+
+o submit2ge-scaextractor.sh
+--------------------------------
+        - SHOULD BE DONE BEFORE gain/calib/analysis
+        - send the scaextractor.sh script to GE system
+                although this script is called by getscafiles lower level script
         
-        - Todo list
-                - TO MIGRATE TO NEW BATCH 
-        
-o submit2qs-onoffmaker.sh (OBSOLETE ???)
---------------------------
-        - send the onoffmaker.sh script to BQS system
-        - Todo list
-                - TO MIGRATE TO NEW BATCH 
-
-o submit2bqs-rawonoffmaker.sh (OBSOLETE ???) 
------------------------------
-        - used after the anagainmaker 
-        - prepare and send in batch the proc_rawonoff.sh to BQS system
-        - exemple submit2bqs-rawonoffmaker.sh -src Abell85 -date 20110417 -fcycle 8 -lcycle 23 -type ON 
-        - Todo list
-                - TO MIGRATE TO NEW BATCH
-
-o submit2qs-gainmaker.sh (OBSOLETE)
--------------------------
-        - send the gainmaker.sh script to BQS system 
-        - Todo list
-                - TO MIGRATE TO NEW BATCH
-
-o submit2qs-calibmaker.sh (OBSOLETE)
---------------------------
-        - send the calibmaker.sh script to BQS system
-        - Todo list
-                - TO MIGRATE TO NEW BATCH 
-
                 
 C) High level scripts 
@@ -158 +124 @@
 -----------------
         - perform 
-          . the analysis of the above fits files to determine the 
+          . the analysis to determine the 
                         gains of each channel: produce gain_* files (monitoring + gain files)
           . put the results into Irods
@@ -168 +134 @@
 ------------------
         - perfom
-          . prepare the analysis of the above fits files
+          . prepare the analysis
           . put calib_* files (monitoring +  calibration files) into Irods
         - use 
@@ -175 +141 @@
 
 
-o gainmaker.sh (OBOLETE)
----------------
-        - perform 
-                1) the extraction of signalXYZ.fits files 
-                        concerned by the OFF-calibration time window
-                        of the cycle located at the middle of the run
-                2) . the analysis of the above fits files to determine the 
-                        gains of each channel: produce gain_* files (monitoring + gain files)
-                        . put the results into Irods
-        - use 
-                - statusdaq.sh, proc_script.sh, getscafiles.sh
-                - analysis.cc   
-        
-o calibmaker.sh (OBSOLETE)
----------------
-        - perfom
-                1) several x-checks to see at which stage of the analysis process we are
-                2) trig the proc_script.sh script if necessary to create the spectra fits files via specmfib.cc prg 
-                3) . prepare the analysis of the above fits files
-                   . put calib_* files (monitoring +  calibration files) into Irods
-        - use 
-                - statusdaq.sh, proc_script.sh, getscafiles.sh
-                - analysis.cc   
-
-o onoffmaker.sh (preliminary)
-----------------------------
-        - perform
-                1) several x-checks to see at which stage of the analysis process we are
-                2) trig the proc_script.sh script if necessary to create the spectra fits files via specmfib.cc prg 
-                3) prepare the analysis of the above fits files
-                4) put dataRaw_*        (raw spectra), 
-                       dataBAOCalib_*   (after BAO calibration), 
-                       dataBAORTCalib_* (after BAO & RT calibration), 
-                       diffOnOff_*      (ON-OFF spectra) 
+
+o anarawonoffmaker.sh
+---------------------
+        - perform
+                . prepare the analysis
+                . put dataRaw_*        (raw spectra), 
+                      diffOnOffRaw_*   (ON-OFF spectra although not used by final analysis) 
 
 D) Lower level scripts
@@ -225 +164 @@
 
 
-o proc_rawonoff.sh (OBSOLETE)
-------------------
-        - this is the script to use to perform the "datacycle" contents
-        - perform all the preparation work to send in batch the "specmfib" program 
-                        which perform the FFT and median/mean spectra for the ON-OFF task
-        - use
-          - getscafiles.sh, select.sh, statusdaq.sh, getsignalfiles.sh
-        - comments
-          - contrary to proc_script (below) specmfib is activated in the same thread
-
-o proc_script.sh (OBSOLETE)
------------------
-        - VERY BUSY script
-        - perform 
-                1) all the preparation work to send in batch the "specmfib" program 
-                        which perform the FFT and median/mean spectra for GAIN, CALIBRATION, ON-OFF task
-                2) the script that is sent in batch put the results into Irods  
-        - use
-                - getscafiles.sh, select.sh, getsignalfiles.sh
-        - Todo list
-                - TO MIGRATE TO NEW BATCH 
-                
-
 o scaextractor.sh
 -----------------

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

BAORadio/AmasNancay/trunk/plotRawDiffOnOff.pic

@@ -22 +22 @@
 
 openppf rawOnOffDiff_${source}-${ncycles}Cycles.ppf
+
 
 clearscript evolAt1420Freq