Changeset 6289 for trunk/MagicSoft

Timestamp:

02/08/05 11:56:02 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mpointing/MPointingPosInterpolate.cc (modified) (10 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -20 +20 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/02/08 Thomas Bretz
+
+   * mpointing/MPointingPosInterpolate.cc:
+     - use debug option in addition to switch off output from internal
+       eventloop. It is confusing having this output inside another
+       eventloop.
+     - updated missing connections in class description
+
+
 
  2005/02/07 Thomas Bretz

trunk/MagicSoft/Mars/mpointing/MPointingPosInterpolate.cc

@@ -32 +32 @@
 // 
 //  Input Containers:
-//   MRawEvtData
+//    MRawEvtData
+//    MReportDrive
+//    MTimeDrive
+//    MTime
 //
 //  Output Containers:
-//   MPointingPos
+//    MPointingPos
 //
 //
@@ -104 +107 @@
 {
 
-    *fLog << endl << "["<< GetName() 
-          << "]: Loading report file \"" << fFilename << "\" into TSpline..." << endl;
+    *fLog << inf << "Loading report file \"" << fFilename << "\" into TSpline..." << endl;
+
+    if (!fDebug)
+        gLog.SetNullOutput();
 
     //
@@ -136 +141 @@
 
     if (!evtloop.PreProcess())
+    {
+        gLog.SetNullOutput(kFALSE);
         return kFALSE;
+    }
 
     TArrayD reportTime(fNumStartEvents);
@@ -172 +180 @@
         { 
             *fLog << warn <<"["<< GetName() 
-                 << "]: Warning: this report has the same time that the previous one...skipping it " << endl;
+                << "]: Warning: this report has the same time that the previous one...skipping it " << endl;
             continue;
         }
@@ -194 +202 @@
     tlist.PrintStatistics();
 
-    *fLog << "["<< GetName() << "]: loaded " << n-1 << " ReportDrive from " 
-          << fFirstDriveTime << " to " << fLastDriveTime << endl << endl;
+    gLog.SetNullOutput(kFALSE);
+
+    *fLog << inf << GetDescriptor() << ": loaded " << n-1 << " ReportDrive from "
+          << fFirstDriveTime << " to " << fLastDriveTime << endl;
 
     if (fDebug)
@@ -222 +232 @@
         c->SaveAs("pointing.root");
     }
+
     return kTRUE;
 }
@@ -278 +289 @@
 
     //const Int_t run = fRunHeader->GetRunNumber();
-  const MTime* StartRunTime = &fRunHeader->GetRunStart();
-  Int_t time = StartRunTime->GetTime();
+  const MTime &StartRunTime = fRunHeader->GetRunStart();
+  Int_t time = StartRunTime.GetTime();
 
    switch(fTimeMode)
     {
      case kRunTime:
-         time = StartRunTime->GetTime();
-
          //
          // Check that we have drive report for this time
          //
-         if( *StartRunTime<fFirstDriveTime || *StartRunTime>fLastDriveTime)
+         if( StartRunTime<fFirstDriveTime || StartRunTime>fLastDriveTime)
          {
-             *fLog << err << GetDescriptor() << ": Run time " << *StartRunTime
+             *fLog << err << GetDescriptor() << ": Run time " << StartRunTime
                    << " outside range of drive reports  (" << fFirstDriveTime
                    << ", " << fLastDriveTime << ")" << endl;
@@ -301 +310 @@
                    << fSplineZd->Eval( time )<< ", "  <<fSplineAz->Eval( time )<< ")" << endl;
          }
-    break;
+         break;
 
     case kEventTime:
-        time = fEvtTime->GetTime();
-
         if (fDebug)
           {
@@ -333 +340 @@
               }
         }
-    break;
+        break;
     }
 
@@ -340 +347 @@
     //
     //if( *StartRunTime<fFirstDriveTime || *StartRunTime>fLastDriveTime)
-    if( *StartRunTime>fLastDriveTime)
-    {
-        *fLog << err << GetDescriptor() << ": Run time " << *StartRunTime
+    if( StartRunTime>fLastDriveTime)
+    {
+        *fLog << err << GetDescriptor() << ": Run time " << StartRunTime
               << " outside range of drive reports  (" << fFirstDriveTime 
               << ", " << fLastDriveTime << ")" << endl;