Changeset 5921


Ignore:
Timestamp:
01/21/05 10:54:30 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r5917 r5921  
    2121                                                 -*-*- END OF LINE -*-*-
    2222
     23 2005/01/20 Thomas Bretz
     24
     25   * mpointing/MSrcPosFromModel.cc:
     26     - fixed crash in Process if no pointing model available
     27
     28
     29
    2330 2005/01/20 Markus Gaug
    2431
    2532   * mcalib/MCalibrationIntensityChargeCam.[h,cc]
    26      - added function to display fluyctuations of a variable
     33     - added function to display fluctuations of a variable
    2734
    2835   * mcalib/MCalibrationPix.cc
     
    3138   * msignal/MExtractTimeAndCharge.[h,cc]
    3239     - introduced high-gain maximum limit before extracting the low-gain
     40
     41
    3342
    3443 2005/01/20 Thomas Bretz
  • trunk/MagicSoft/Mars/mpointing/MSrcPosFromModel.cc

    r4966 r5921  
    130130        conv = fPoint0405;
    131131
    132     MVector3 sky;
    133     sky.SetRaDec(fPointPos->GetRaRad(), fPointPos->GetDecRad());
     132    TVector2 d;
    134133
    135     // Get current star position (off center)
    136     MVector3 vl2 = MAstroSky2Local(*fTime, *fObservatory)*sky;
    137     // Get corrected position camera center)
    138     TVector3 vl1 = conv->Correct(vl2);
     134    if (conv)
     135    {
     136        MVector3 sky;
     137        sky.SetRaDec(fPointPos->GetRaRad(), fPointPos->GetDecRad());
    139138
    140     // Calculate x,y of za2
    141     TVector2 d = MAstro::GetDistOnPlain(vl1, vl2, fGeom->GetCameraDist()*1000);
     139        // Get current star position (off center)
     140        MVector3 vl2 = MAstroSky2Local(*fTime, *fObservatory)*sky;
     141        // Get corrected position camera center)
     142        TVector3 vl1 = conv->Correct(vl2);
     143
     144        // Calculate x,y of za2
     145        d = MAstro::GetDistOnPlain(vl1, vl2, fGeom->GetCameraDist()*1000);
     146    }
    142147
    143148    // Set Source position
Note: See TracChangeset for help on using the changeset viewer.