Changeset 6016 for trunk

Timestamp:

01/26/05 09:09:09 (20 years ago)

Author:

mazin

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp/mmpi

Files:

• MInterpolatePointingPos.cc (modified) (11 diffs)
• MJCalibrateSignal.cc (added)
• MJCalibrateSignal.h (added)

trunk/MagicSoft/Mars/mtemp/mmpi/MInterpolatePointingPos.cc

@@ -63 +63 @@
 using namespace std;
 
-const Int_t MInterpolatePointingPos::fgNumStartEvents = 10000;
+const Int_t MInterpolatePointingPos::fgNumStartEvents = 1;
 // --------------------------------------------------------------------------
 //
@@ -150 +150 @@
     TArrayD dec(fNumStartEvents);
     
-    Int_t n=0;
+    Int_t n=1;
     while (tlist.Process())
     { 
@@ -156 +156 @@
         MTime* reporttime = (MTime*)plist.FindObject("MTimeDrive");
         
-        if(n==0)
+        if(n==1)
           fFirstDriveTime = *reporttime;
         else 
           fLastDriveTime = *reporttime;
 
+        //
+        // Update the number of entries
+        //
+        if (n>fNumStartEvents)
+          {
+            reportTime.Set(n);
+            currentZd.Set(n);
+            currentAz.Set(n); 
+            nominalZd.Set(n);
+            nominalAz.Set(n);
+            ra.Set(n);
+            dec.Set(n);
+          }
         //
         // Sometimes there are two reports with the same time
@@ -171 +184 @@
         }
 
-        reportTime[n] = reporttime->GetTime();
-        currentZd[n] = report->GetCurrentZd();
-        currentAz[n] = report->GetCurrentAz();
-        nominalZd[n] = report->GetNominalZd();
-        nominalAz[n] = report->GetNominalAz();
-        ra[n] = report->GetRa();
-        dec[n] = report->GetDec();
-
-//cout << " GetTime(): " << reporttime->GetTime() << endl;
-//cout << " GetCurrentZd(): " << report->GetCurrentZd() << endl;
+        reportTime[n-1] = reporttime->GetTime();
+        currentZd [n-1] = report->GetCurrentZd();
+        currentAz [n-1] = report->GetCurrentAz();
+        nominalZd [n-1] = report->GetNominalZd();
+        nominalAz [n-1] = report->GetNominalAz();
+        ra        [n-1] = report->GetRa();
+        dec       [n-1] = report->GetDec();
+
+        if (fDebug)
+          {
+            *fLog << " GetTime(): " << reporttime->GetTime() << endl;
+            *fLog << " GetCurrentZd(): " << report->GetCurrentZd() << endl;
+          }
         n++;
     }
@@ -186 +202 @@
     tlist.PrintStatistics();
 
-    *fLog << "["<< GetName() << "]: loaded " << n << " ReportDrive from " 
+    *fLog << "["<< GetName() << "]: loaded " << n-1 << " ReportDrive from " 
           << fFirstDriveTime << " to " << fLastDriveTime << endl << endl;
 
-    //
-    // Update the number of entries
-    //
-    reportTime.Set(n);
-    currentZd.Set(n);
-    currentAz.Set(n); 
-    nominalZd.Set(n);
-    nominalAz.Set(n);
-    ra.Set(n);
-    dec.Set(n);
-     
     if (fDebug)
         {
@@ -210 +215 @@
 
     fSplineZd = new TSpline3("zenith",
-                             reportTime.GetArray(), nominalZd.GetArray(), n);
+                             reportTime.GetArray(), nominalZd.GetArray(), n-1);
     fSplineAz = new TSpline3("azimuth",
-                             reportTime.GetArray(), nominalAz.GetArray(), n);
+                             reportTime.GetArray(), nominalAz.GetArray(), n-1);
     fSplineRa = new TSpline3("RA",
-                             reportTime.GetArray(), ra.GetArray(), n);
+                             reportTime.GetArray(), ra.GetArray(), n-1);
     fSplineDec = new TSpline3("DEC",
-                             reportTime.GetArray(), dec.GetArray(), n);
+                             reportTime.GetArray(), dec.GetArray(), n-1);
     
     if (fDebug)
@@ -232 +237 @@
         c->Modified();
         c->Update();
+        c->SaveAs("pointing.root");
     }
     return kTRUE;
@@ -290 +296 @@
     //const Int_t run = fRunHeader->GetRunNumber();
   const MTime* StartRunTime = &fRunHeader->GetRunStart();
-  Double_t time = StartRunTime->GetTime();
+  Int_t time = StartRunTime->GetTime();
 
    switch(fTimeMode)
@@ -305 +311 @@
                    << " outside range of drive reports  (" << fFirstDriveTime
                    << ", " << fLastDriveTime << ")" << endl;
+
+            if ( *fEvtTime<fFirstDriveTime )  time = fFirstDriveTime.GetTime();
+            if ( *fEvtTime>fLastDriveTime )   time = fLastDriveTime.GetTime();
 
              *fLog << " PointingPos: time = " << time << " (" << *fEvtTime << ")  (zd, az, ra, dec) = (" << fSplineZd->Eval( time )<< ", "  <<fSplineAz
@@ -328 +337 @@
         if( *fEvtTime<fFirstDriveTime || *fEvtTime>fLastDriveTime)
         {
-            *fLog << err << GetDescriptor() << ": Run time = "
-                  << *fEvtTime << " outside range of drive reports  ("
-                  << fFirstDriveTime << ", "<< fLastDriveTime << ")" << endl;
-
-            *fLog << " PointingPos: time = " << time << " (" << *fEvtTime << ")  (zd, az, ra, dec) = (" << fSplineZd->Eval( time )<< ", "  <<fSplineAz->Eval( time )<< ", " <<fSplineRa->Eval( time ) << ", "  <<fSplineDec->Eval( time )<< ")" << endl;
-
-            if ( *fEvtTime<fFirstDriveTime )  time = fFirstDriveTime.GetTime();
-            if ( *fEvtTime>fLastDriveTime )   time = fLastDriveTime.GetTime();
+            if (fDebug)
+                {
+                   *fLog << err << GetDescriptor() << ": Run time = "
+                          << *fEvtTime << " outside range of drive reports  ("
+                      << fFirstDriveTime << ", "<< fLastDriveTime << ")" << endl;
+
+                    if ( *fEvtTime<fFirstDriveTime )  time = fFirstDriveTime.GetTime();
+                    if ( *fEvtTime>fLastDriveTime )   time = fLastDriveTime.GetTime();
+
+                    *fLog << " PointingPos: time = " << time << " (" << *fEvtTime << ")  (zd, az, ra, dec) = (" << fSplineZd->Eval( time )<< ", "  <<fSplineAz->Eval( time )<< ", " <<fSplineRa->Eval( time ) << ", "  <<fSplineDec->Eval( time )<< ")" << endl;
+                }
+
             //fError = kTRUE;
             //return kFALSE;
@@ -349 +362 @@
     // Check that we have drive report for this time
     //
-    if( *StartRunTime<fFirstDriveTime || *StartRunTime>fLastDriveTime)
+    //if( *StartRunTime<fFirstDriveTime || *StartRunTime>fLastDriveTime)
+    if( *StartRunTime>fLastDriveTime)
     {
         *fLog << err << GetDescriptor() << ": Run time " << *StartRunTime