Changeset 3938 in Sophya for trunk/AddOn/TAcq/brfitsrd.cc

Timestamp:

Jan 13, 2011, 11:42:21 AM (15 years ago)

Author:

ansari

Message:

modification provisoire pour lecture fichiers visibilites 2010, Reza 13/01/2011

File:

• trunk/AddOn/TAcq/brfitsrd.cc (modified) (3 diffs)

trunk/AddOn/TAcq/brfitsrd.cc

@@ -57 +57 @@
     // Extraction de qques parametres utiles depuis les fichiers FITS 
     string fkvs;
+    cpaqdeltatime_=0.;
     if (fib==0) {
       fkvs=mff_[fib].GetKeyValue("DATEOBS");
-      if (fkvs.length()>0) { 
-        cdateobs_.Set(fkvs);
-        cout << " BRMultiFitsReader/First file (for fiber 0) DATEOBS=" << fkvs << endl;
-      }
-    }
-    fkvs=mff_[fib].GetKeyValue("DATEOBS");
+      if (fkvs.length()>0)  cdateobs_.Set(fkvs);
+      fkvs=mff_[fib].GetKeyValue("TMSTART");
+      if (fkvs.length()>0) {
+        ctmstart_.Set(fkvs);
+        cout << " BRMultiFitsReader/First file (for fiber 0) TMSTART=" << fkvs << endl;
+        fkvs=mff_[fib].GetKeyValue("TMEND");
+        SOPHYA::TimeStamp tmend_=ctmstart_;
+        if (fkvs.length()>0) tmend_.Set(fkvs);
+        cpaqdeltatime_=((double)(tmend_.DaysPart()-cdateobs_.DaysPart())*86400.+
+                        (tmend_.SecondsPart()-cdateobs_.SecondsPart()))/(double)mff_[fib].NAxis2();
+      }
+    }
+    fkvs=mff_[fib].GetKeyValue("FIBERNUM");
     memgr_.FiberId(fib) = atoi( fkvs.c_str() );
 
@@ -222 +230 @@
         string fkvs=mff_[fib].GetKeyValue("DATEOBS");
         if (fkvs.length()>0)  cdateobs_.Set(fkvs);
+        fkvs=mff_[fib].GetKeyValue("TMSTART");
+        if (fkvs.length()>0) {
+          ctmstart_.Set(fkvs);
+          cout << " BRMultiFitsReader/First file (for fiber 0) TMSTART=" << fkvs << endl;
+          fkvs=mff_[fib].GetKeyValue("TMEND");
+          SOPHYA::TimeStamp tmend_=ctmstart_;
+          if (fkvs.length()>0) tmend_.Set(fkvs);
+          cpaqdeltatime_=((double)(tmend_.DaysPart()-cdateobs_.DaysPart())*86400.+
+                          (tmend_.SecondsPart()-cdateobs_.SecondsPart()))/(double)mff_[fib].NAxis2();
+        }
       } 
       vfpos_[fib]=0;
@@ -254 +272 @@
   for(size_t fib=0; fib<(size_t)memgr_.NbFibres(); fib++)
     mmbufib_[fib]=memgr_.GetMemZone(mid_,fib);
+  // Definition temps pour la zone a remplir 
+  memgr_.GetAuxData(mid_)->FillTime().Set(ctmstart_.ToDays()+cpaqdeltatime_*(double)vfpos_[0]/86400.);
   return false;
 }