Changeset 6169 for trunk/MagicSoft/Mars

Timestamp:

02/01/05 15:22:00 (20 years ago)

Author:

mazin

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mpointing/MPointingPosInterpolate.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mpointing/MPointingPosInterpolate.cc

@@ -322 +322 @@
                       << *fEvtTime << " outside range of drive reports  ("
                       << fFirstDriveTime << ", "<< fLastDriveTime << ")" << endl;
+               }                
+
+            if ( *fEvtTime < (fFirstDriveTime) )   time = fFirstDriveTime.GetTime();
+            else                                   time = fLastDriveTime.GetTime();
                 
-                if ( *fEvtTime<fFirstDriveTime )  time = fFirstDriveTime.GetTime();
-                if ( *fEvtTime>fLastDriveTime )   time = fLastDriveTime.GetTime();
-                
+            if (fDebug)
+              {
                 *fLog << " PointingPos: time = " << time << " (" << *fEvtTime << ")  (zd, az) = (" 
                       << fSplineZd->Eval( time )<< ", "  <<fSplineAz->Eval( time )<< ")" << endl;
@@ -350 +353 @@
     if(TMath::Abs(zd)>90 || TMath::Abs(az)>360)
       {
-        *fLog << err << GetDescriptor() << ": Wrong Interpolated Pointing Position." << endl;
+        *fLog << warn << GetDescriptor() << ": Wrong Interpolated Pointing Position." << endl;
         *fLog << " PointingPos: time = " << time << " (" << *fEvtTime << ")  (zd, az, ra, dec) = (" 
               << zd << ", "  << az << "," << fRa << "," << fDec << ")" << endl;
@@ -356 +359 @@
     
     fPointingPos->SetLocalPosition( zd, az );
-    fPointingPos->SetSkyPosition( fRa*TMath::DegToRad()/15, fDec*TMath::DegToRad());
+    //fPointingPos->SetSkyPosition( fRa*TMath::DegToRad()/15, fDec*TMath::DegToRad());
+    fPointingPos->SetSkyPosition( fRa, fDec);
 
     return kTRUE;