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

Timestamp:

May 4, 2011, 9:18:09 AM (14 years ago)

Author:

ansari

Message:

Ajout definition de fenetre en temps de traitement (appel a Process()) ds BRBaseProcessor et BRAnaParam, FileSequenceNumber (numero signalXXX.fits) pour chaque zone memoire dans RAcqMZAuxData / RAcqMemZoneMgr, Reza 04/05/2011

File:

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

trunk/AddOn/TAcq/branap.cc

@@ -45 +45 @@
 
   gainfile_="";
+
+  proctimeduration_=9.e9;
+  fgtimeselect_=false;
 }
 
@@ -137 +140 @@
       ka++;
     }    
+    //-tmproc hh:mm:ss,nseconds
+    else if (strcmp(arg[ka],"-tmproc")==0) {
+      int ah=0,am=0;
+      double as=0, als=0;
+      sscanf(arg[ka+1],"%d:%d:%lg,%lg",&ah,&am,&as,&als);
+      fgtimeselect_=true;  proctimeduration_=als;  
+      proctimestart_.SetHour(ah,am,as); 
+      ka+=2;
+    }
     else if (strcmp(arg[ka],"-gain")==0) {
       gainfile_=arg[ka+1];
@@ -190 +202 @@
        << "                 [-singlechan] [-twochan] [-fftdata] [-rawdata] \n"
        << "                 [-freqfilter] [-gain filename] [-varcut min,max] [-nband nband,first,last] \n"
-       << "                 [-filldt] [-tspwin wsz,extsz,nfiles] \n" 
+       << "                 [-tmproc hh:mm:ss,nseconds] [-filldt] [-tspwin wsz,extsz,nfiles] \n" 
        << "         -in Imin,Imax,Istep InPath FiberList [InPath2 FiberList2 InPath3 FiberList3 ...] \n" << endl; 
   if (fgshort) {
@@ -218 +230 @@
        << " -varcut min,max : min-max cut on variance \n" 
        << " -nband nband,first,last: numbers of freq. bands and first and last bands used for cuts \n"
+       << " -tmproc hh:mm:ss,nseconds : processing time window definition \n"
        << " -filldt : force data table filling \n"
        << " -freqfilter : force median filtering on the frequencies \n"
@@ -238 +251 @@
   bool fgdatafft_in_fits=false;
   bool fgsinglechan_in_fits=false;
-  int rc = DecodeMiniFitsHeader(flnm,paqsize_, npaqinfile_,fgdatafft_in_fits, fgsinglechan_in_fits); 
+  SOPHYA::TimeStamp tmstart;
+  int rc = DecodeMiniFitsHeader(flnm,paqsize_, npaqinfile_,fgdatafft_in_fits, fgsinglechan_in_fits,tmstart); 
   if (!fgforcesingleortwochan_) fgsinglechannel_=fgsinglechan_in_fits;
   if (!fgforceraworfft_) fgdatafft_=fgdatafft_in_fits;
+  if (fgtimeselect_) {
+    int year,month,day; 
+    tmstart.GetDate(year,month,day);
+    proctimestart_.SetDate(year,month,day);
+    proctimeend_.Set(proctimestart_.ToDays()+proctimeduration_/86400.);
+  }
   return rc;
 }
@@ -252 +272 @@
   cout << " IMin= " << imin_ << " IMax= " << imax_ << " IStep= " << istep_ 
        << ((rdsamefc_)?" SameFrameCounter read mode":" AllOKPaquets read mode ") << endl;
+  if (fgtimeselect_) {
+     cout << " Processing time window, StartTime=" << proctimestart_ << " duration= " << proctimeduration_ 
+              << " EndTime=" << proctimeend_ << endl;
+  }
   cout << " OutPath= " << outpath_ << (fgfitsout_?" force FITS output":" PPF output") << endl;
   cout << " Action=" << action_ << "  NMean=" << nmean_ << " NBloc=" << nbloc_ << endl;
@@ -274 +298 @@
 /* --Fonction-- */
 int BRAnaParam::DecodeMiniFitsHeader(const char* filename, uint_4& paqsz, uint_4& npaq, 
-                                     bool& fgdatafft, bool& fgsinglechannel) 
+                                     bool& fgdatafft, bool& fgsinglechannel, SOPHYA::TimeStamp& tmstart) 
 {
   cout << " DecodeMiniFitsHeader - Opening file: " << filename << endl;
@@ -285 +309 @@
   if (acqmode.substr(0,3)=="fft") fgdatafft=true;
   if (acqmode.find("1c") < acqmode.length()) fgsinglechannel=true;
+  string fkvs=mff.GetKeyValue("DATEOBS");
+  if (fkvs.length()>0)  tmstart.Set(fkvs);
+  fkvs=mff.GetKeyValue("TMSTART");
+  if (fkvs.length()>0) tmstart.Set(fkvs);
   return 0;
 }