Changeset 6508 for trunk

Timestamp:

02/15/05 19:41:20 (20 years ago)

Author:

mazin

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• callisto.rc (modified) (2 diffs)
• mpointing/MPointingPosInterpolate.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/callisto.rc

@@ -1 @@
-# ==========================================================================
+# 
+==========================================================================
 #############################################################################
 # ==========================================================================
@@ -316 +317 @@
 
 # -------------------------------------------------------------------------
+# Use this if you want to change to time from run headers instead of event time
+# -------------------------------------------------------------------------
+#MJCalibrateSignal.MPointingPosInterpolate.TimeMode: eventtime, runtime
+
+# -------------------------------------------------------------------------
 # Use this if you want to change the signal extractor
 # -------------------------------------------------------------------------

trunk/MagicSoft/Mars/mpointing/MPointingPosInterpolate.cc

@@ -177 +177 @@
         // Sometimes there are two reports with the same time
         //
-        if (reporttime->GetTime() == reportTime[n-2])
-        { 
-            *fLog << warn <<"["<< GetName() 
-                << "]: Warning: this report has the same time that the previous one...skipping it " << endl;
-            continue;
-        }
+        if (n>1)
+          if (reporttime->GetTime() == reportTime[n-2])
+            { 
+              *fLog << warn <<"["<< GetName() 
+                    << "]: Warning: this report has the same time that the previous one...skipping it " << endl;
+              continue;
+            }
 
         reportTime[n-1] = reporttime->GetTime();
@@ -294 +295 @@
     //const Int_t run = fRunHeader->GetRunNumber();
   const MTime &StartRunTime = fRunHeader->GetRunStart();
+  const MTime &EndRunTime   = fRunHeader->GetRunEnd();
   Int_t time = StartRunTime.GetTime();
 
@@ -302 +304 @@
          // Check that we have drive report for this time
          //
+
+         time = (EndRunTime.GetTime() + StartRunTime.GetTime())/2;
+
          if( StartRunTime<fFirstDriveTime || StartRunTime>fLastDriveTime)
          {
@@ -317 +322 @@
 
     case kEventTime:
+      
         time = fEvtTime->GetTime();       
 
-        if (fDebug)
-          {
-            *fLog << " real time : " << time 
-                 << " first time: " << fFirstDriveTime.GetTime()
-                 << " last time: " << fLastDriveTime.GetTime() << endl;
-          }
         //
         // Check that we have drive report for this time
@@ -340 +340 @@
             else                                   time = fLastDriveTime.GetTime();
                 
-            if (fDebug)
-              {
-                *fLog << " PointingPos: time = " << time << " (" << *fEvtTime << ")  (zd, az) = (" 
-                      << fSplineZd->Eval( time )<< ", "  <<fSplineAz->Eval( time )<< ")" << endl;
-              }
         }
         break;
     }
 
+   if (fDebug)
+     {
+       *fLog << " real time : " << time 
+             << " first time: " << fFirstDriveTime.GetTime()
+             << " last time: " << fLastDriveTime.GetTime() << endl;
+       *fLog << " PointingPos: time = " << time << " (" << *fEvtTime << ")  (zd, az) = (" 
+             << fSplineZd->Eval( time )<< ", "  <<fSplineAz->Eval( time )<< ")" << endl;
+     }
     //
     // Check that we have drive report for this time
@@ -389 +392 @@
         rc = kTRUE;
       }
+
+    if (IsEnvDefined(env, prefix, "TimeMode", print))
+      {
+
+        TString dat(GetEnvValue(env, prefix, "TimeMode", ""));
+        dat.ToLower();
+
+        rc = kTRUE;
+
+        if (dat.Contains("eventtime"))
+          SetTimeMode(kEventTime);
+        else if (dat.Contains("runtime"))
+          SetTimeMode(kRunTime);
+        else
+          rc = kFALSE;
+      }
     return rc;
 }
+