Changeset 3883 in Sophya for trunk/AddOn/TAcq/branap.cc

Timestamp:

Sep 23, 2010, 7:59:29 PM (15 years ago)

Author:

ansari

Message:

1/ Correction bug de lecture ds BRMultiFitsReader et EthernetReader lorsque lecture avec SameFrameCounter etait demande
2/ Amelioration des impressions ds ces deux classes et ajout possibilite de controle du flag "SameFC" avec les classes de parametres BRParList et BRAnaParam
3/ Nouveaux datacard @ethrforcesamefc et @prtlev pour acquisition

Reza, 23/09/2010

File:

• trunk/AddOn/TAcq/branap.cc (modified) (7 diffs)

trunk/AddOn/TAcq/branap.cc

@@ -20 +20 @@
   imin_=imax_=0;
   istep_=1;
+  rdsamefc_=true;   // read paquets with same frame counter
   freqmin_=freqmax_=0;
   nbinfreq_=1;  
@@ -27 +28 @@
   fgdatafft_=false;  fgsinglechannel_=false;
   prtlevel_=0;
+  prtmodulo_=50000;
   nbcalgrp_=1;
   nthreads_=1;
@@ -69 +71 @@
       ka+=2;
     }
-    else if (strcmp(arg[ka],"-prtlev")==0) {
-      prtlevel_=atoi(arg[ka+1]);
+    else if (strcmp(arg[ka],"-prt")==0) {
+      sscanf(arg[ka+1],"%d,%ld",&prtlevel_,&prtmodulo_);
       ka+=2;
     }
@@ -80 +82 @@
       nbcalgrp_=atoi(arg[ka+1]);
       ka+=2;
+    }
+    else if (strcmp(arg[ka],"-nosfc")==0) {
+      rdsamefc_=false;
+      ka++;
     }
     else if (strcmp(arg[ka],"-in")==0) {
@@ -120 +126 @@
   cout << " Usage:  prgname [-act ACT] [-out OutPath] [-nmean NMean] [-zones NZones,nPaqinZone] \n" 
        << "                 [-nbloc NBloc] [-freq NumFreqMin,NumFreqMax,NBinFreq] \n" 
-       << "                 [-prtlev lev] [-nvcal n] [-nthr n] \n" 
+       << "                 [-prt lev,modulo] [-nvcal n] [-nthr n] [-nosfc] \n" 
        << "         -in Imin,Imax,Istep InPath FiberList [InPath2 FiberList2 InPath3 FiberList3 ...] \n" << endl; 
   if (fgshort) {
@@ -135 +141 @@
        << " -zones NZones,NbPaqinZone : Number of Zones and number of paquets in one zone \n" 
        << " -freq NumFreqMin,NumFreqMax,NBinFreq : Frequency zone and number of bins \n" 
-       << " -prtlev lev : Print level (0,1,2...) \n" 
+       << " -prt lev,modulo : Print level (0,1,2...) and print counter modulo (10000, 50000 ...) \n" 
        << " -nvcal n : number of BRVisibilityCalculator objects running in parallel in BRVisCalcGroup  (default=1) \n" 
        << " -nthr n : number of threads for parallel execution in BRVisibilityCalculator (default=1) \n" 
+       << " -nosfc : Don't force reading with SAME FrameCounter \n" 
        << " -in : input files/directory definition : \n"
        << "       Imin,Imax,Istep: fits files signalII.fits Imin<=II<=Imax Istep=increment \n" 
@@ -160 +167 @@
   for(size_t k=0; k< dirlist_.size(); k++) 
     cout << k+1 << " :  " << dirlist_[k] << endl;
-  cout << " IMin= " << imin_ << " IMax= " << imax_ << " IStep= " << istep_ << endl;
+  cout << " IMin= " << imin_ << " IMax= " << imax_ << " IStep= " << istep_ 
+       << ((rdsamefc_)?" SameFrameCounter read mode":" AllOKPaquets read mode ") << endl;
   cout << " OutPath= " << outpath_ << endl;
   cout << " Action=" << action_ << "  NMean=" << nmean_ << " NBloc=" << nbloc_ << endl;
   cout << " FreqMin= " << freqmin_ << " FreqMax= " << freqmax_ << " NBinFreq= " << nbinfreq_ << endl;
   cout << " PaqSize=" << paqsize_ << "  -  NZones=" << nzones_ << " NPaqZone=" << npaqinzone_ 
-       << " PrtLevel=" << prtlevel_ << endl;
+       << " PrtLevel=" << prtlevel_ << " PrtCntModulo=" <<  prtmodulo_ << endl;
   cout << " AcqMode: " << ((fgdatafft_)?" Data_FFT " : " Data_Raw " ) 
        << ((fgsinglechannel_)?" SingleChannel " : " TwoChannels " ) << endl;