Changeset 3683 in Sophya for trunk/AddOn/TAcq/racqurw.cc

Timestamp:

Nov 27, 2009, 11:32:46 AM (16 years ago)

Author:

ansari

Message:

Mise a jour et ajout de fichier pour taritement multifibres apres

prise de donnees de Nov2009 a Pittsburgh

• Introduction des classes BRMultiFitsReader et BRBaseProcessor Reza, 27/11/2009

File:

• trunk/AddOn/TAcq/racqurw.cc (modified) (4 diffs)

trunk/AddOn/TAcq/racqurw.cc

@@ -813 +813 @@
         // Sans TRAILER de paquet mff.setDTypeNaxis(MF_Byte, paq0.DataSize()+paq0.HeaderSize(), npaqperfile); 
         }
+        AddFitsKWStart(mff,bpar);
         fnum++;   fgfirstfctt=true;
       }
@@ -870 +871 @@
           framecnt_last_[fib] = pcheck[fib].LastFrameNum(); 
 
-        AddFitsKW(mff,bpar);
+        AddFitsKWEnd(mff,bpar);
         for(uint_4 fib=0; fib<memgr.NbFibres(); fib++) {
           header[fib].close();
@@ -906 +907 @@
 
 /* --Methode-- */
-int MultiDataSaver::AddFitsKW(MiniFITSFile* mff, BRAcqConfig& acpar)
+int MultiDataSaver::AddFitsKWStart(MiniFITSFile* mff, BRAcqConfig& acpar)
 { 
   TimeStamp ts;
@@ -913 +914 @@
   bool hassrc=false;
   if (skysrc.length()>0)  hassrc=true;
+  bool fgredpsz = acpar.GetParams().fgreducpsize;
   for(uint_4 fib=0; fib<memgr.NbFibres(); fib++) {
-    mff[fib].AddKeyS("DATE", cdtu.c_str(), " File Creation time(YYYY-MM-DDThh:mm:ss UT) ");       
     mff[fib].AddKeyS("DATEOBS", cdtu.c_str(), " Observation Time (YYYY-MM-DDThh:mm:ss UT) ");
+    mff[fib].AddKeyS("TMSTART", cdtu.c_str(), " File Acqu. Start Time/Date  ");   
     mff[fib].AddKeyD("ACQVER", acpar.AcqVersion(), " BAORadio Acq Software version ") ;
     mff[fib].AddKeyS("ACQMODE", acpar.GetParams().AcqMode, " BAORadio Acq run  mode" );
+    mff[fib].AddKeyS("BRPAQCFMT", BRPaquet::FmtConvToString(acpar.GetParams().GetDataConvFg()), 
+                         " BAORadio BRPaquet DataFormatConversion" );
     mff[fib].AddKeyI("FIBERNUM", acpar.GetParams().FiberNum[fib], " Fiber number/id") ;
     if (hassrc) 
       mff[fib].AddKeyS("SKYSOURC", skysrc, " Source identification" );
+    if (fgredpsz) {
+      mff[fib].AddKeyS("REDPSZMOD", BRPaquet::ReducActionToString(acpar.GetParams().pqreducmode),
+                          "PaquetSize Reduction Mode") ; 
+      mff[fib].AddKeyI("REDPSZOF", acpar.GetParams().reducoffset," PaquetSize Reduction Offset") ; 
+    }
+  }
+  return 0;
+}
+
+/* --Methode-- */
+int MultiDataSaver::AddFitsKWEnd(MiniFITSFile* mff, BRAcqConfig& acpar)
+{ 
+  TimeStamp ts;
+  string cdtu=ts.ToString();
+  for(uint_4 fib=0; fib<memgr.NbFibres(); fib++) {
+    mff[fib].AddKeyS("TMEND", cdtu.c_str(), " File Acqu. End Time/Date  ");       
     mff[fib].AddKeyI("FCFIRST", framecnt_first_[fib], " First valid frame counter in file") ;
     mff[fib].AddKeyI("FCLAST", framecnt_last_[fib], " Last valid frame counter in file") ;