Changeset 6169 for trunk/MagicSoft


Ignore:
Timestamp:
02/01/05 15:22:00 (20 years ago)
Author:
mazin
Message:
*** empty log message ***
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/mpointing/MPointingPosInterpolate.cc

    r6048 r6169  
    322322                      << *fEvtTime << " outside range of drive reports  ("
    323323                      << fFirstDriveTime << ", "<< fLastDriveTime << ")" << endl;
     324               }               
     325
     326            if ( *fEvtTime < (fFirstDriveTime) )   time = fFirstDriveTime.GetTime();
     327            else                                   time = fLastDriveTime.GetTime();
    324328               
    325                 if ( *fEvtTime<fFirstDriveTime )  time = fFirstDriveTime.GetTime();
    326                 if ( *fEvtTime>fLastDriveTime )   time = fLastDriveTime.GetTime();
    327                
     329            if (fDebug)
     330              {
    328331                *fLog << " PointingPos: time = " << time << " (" << *fEvtTime << ")  (zd, az) = ("
    329332                      << fSplineZd->Eval( time )<< ", "  <<fSplineAz->Eval( time )<< ")" << endl;
     
    350353    if(TMath::Abs(zd)>90 || TMath::Abs(az)>360)
    351354      {
    352         *fLog << err << GetDescriptor() << ": Wrong Interpolated Pointing Position." << endl;
     355        *fLog << warn << GetDescriptor() << ": Wrong Interpolated Pointing Position." << endl;
    353356        *fLog << " PointingPos: time = " << time << " (" << *fEvtTime << ")  (zd, az, ra, dec) = ("
    354357              << zd << ", "  << az << "," << fRa << "," << fDec << ")" << endl;
     
    356359   
    357360    fPointingPos->SetLocalPosition( zd, az );
    358     fPointingPos->SetSkyPosition( fRa*TMath::DegToRad()/15, fDec*TMath::DegToRad());
     361    //fPointingPos->SetSkyPosition( fRa*TMath::DegToRad()/15, fDec*TMath::DegToRad());
     362    fPointingPos->SetSkyPosition( fRa, fDec);
    359363
    360364    return kTRUE;
Note: See TracChangeset for help on using the changeset viewer.