Changeset 3594 for trunk

Timestamp:

03/23/04 21:29:11 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhist/MHStarMap.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -43 +43 @@
    * mhist/MHStarMap.cc, mpointing/MSrcPosCalc.cc:
      - fixed: v.Roatete() must be v=v.Rotate()
+     - MHStarMap no waorks also without MSrcPosCam, MPointingPos
+       or MObservatory (leaving out the corresponding translations)
 
 

trunk/MagicSoft/Mars/mhist/MHStarMap.cc

@@ -132 +132 @@
     }
 
-   fPointPos = (MPointingPos*)plist->FindObject("MPointingPos");
-   if (!fPointPos)
-   {
-       *fLog << err << "MPointingPos not found... aborting." << endl;
-       return kFALSE;
-   }
+    fPointPos = (MPointingPos*)plist->FindObject("MPointingPos");
+    if (!fPointPos)
+        *fLog << warn << "MPointingPos not found... no derotation." << endl;
 
     fSrcPos = (MSrcPosCam*)plist->FindObject(AddSerialNumber("MSrcPosCam"));
     if (!fSrcPos)
-    {
-        *fLog << err << "MSrcPosCam not found...  aborting" << endl;
-        return kFALSE;
-    }
+        *fLog << warn << "MSrcPosCam not found...  no source translation." << endl;
 
 
@@ -181 +175 @@
     fObservatory = (MObservatory*)pList->FindObject(AddSerialNumber("MObservatory"));
     if (!fObservatory)
-    {
-        *fLog << err << "MObservatory not found...  aborting" << endl;
-        return kFALSE;
-    }
+        *fLog << err << "MObservatory not found... no derotation." << endl;
 
     return kTRUE;
@@ -207 +198 @@
     Float_t t = h.GetMeanY() - m*h.GetMeanX();
 
-    TVector2 src(fSrcPos->GetXY());
+    TVector2 src;
+    if (fSrcPos)
+        src = fSrcPos->GetXY();
 
     if (!fUseMmScale)
@@ -228 +221 @@
     //   - and perform a rotation to compensate the rotation of the
     //     sky image in the camera
-    const Double_t rho = fPointPos->RotationAngle(*fObservatory);
+    const Double_t rho = fPointPos && fObservatory ?
+        fPointPos->RotationAngle(*fObservatory) : 0;
 
     if (m>-1 && m<1)