Changeset 3594 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
03/23/04 21:29:11 (21 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r3592 r3594  
    4343   * mhist/MHStarMap.cc, mpointing/MSrcPosCalc.cc:
    4444     - fixed: v.Roatete() must be v=v.Rotate()
     45     - MHStarMap no waorks also without MSrcPosCam, MPointingPos
     46       or MObservatory (leaving out the corresponding translations)
    4547
    4648
  • trunk/MagicSoft/Mars/mhist/MHStarMap.cc

    r3591 r3594  
    132132    }
    133133
    134    fPointPos = (MPointingPos*)plist->FindObject("MPointingPos");
    135    if (!fPointPos)
    136    {
    137        *fLog << err << "MPointingPos not found... aborting." << endl;
    138        return kFALSE;
    139    }
     134    fPointPos = (MPointingPos*)plist->FindObject("MPointingPos");
     135    if (!fPointPos)
     136        *fLog << warn << "MPointingPos not found... no derotation." << endl;
    140137
    141138    fSrcPos = (MSrcPosCam*)plist->FindObject(AddSerialNumber("MSrcPosCam"));
    142139    if (!fSrcPos)
    143     {
    144         *fLog << err << "MSrcPosCam not found...  aborting" << endl;
    145         return kFALSE;
    146     }
     140        *fLog << warn << "MSrcPosCam not found...  no source translation." << endl;
    147141
    148142
     
    181175    fObservatory = (MObservatory*)pList->FindObject(AddSerialNumber("MObservatory"));
    182176    if (!fObservatory)
    183     {
    184         *fLog << err << "MObservatory not found...  aborting" << endl;
    185         return kFALSE;
    186     }
     177        *fLog << err << "MObservatory not found... no derotation." << endl;
    187178
    188179    return kTRUE;
     
    207198    Float_t t = h.GetMeanY() - m*h.GetMeanX();
    208199
    209     TVector2 src(fSrcPos->GetXY());
     200    TVector2 src;
     201    if (fSrcPos)
     202        src = fSrcPos->GetXY();
    210203
    211204    if (!fUseMmScale)
     
    228221    //   - and perform a rotation to compensate the rotation of the
    229222    //     sky image in the camera
    230     const Double_t rho = fPointPos->RotationAngle(*fObservatory);
     223    const Double_t rho = fPointPos && fObservatory ?
     224        fPointPos->RotationAngle(*fObservatory) : 0;
    231225
    232226    if (m>-1 && m<1)
Note: See TracChangeset for help on using the changeset viewer.