Changeset 18565 for trunk/Mars/mpointing

Timestamp:

09/03/16 14:40:46 (8 years ago)

Author:

tbretz

Message:

Ceres fits files do not provide (yet?) MMcRunHeader, ignore it.

File:

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

trunk/Mars/mpointing/MSrcPosCalc.cc

@@ -336 +336 @@
 
     fMcHeader = (const MMcRunHeader*)plist->FindObject("MMcRunHeader");
+    /*
     if (!fMcHeader)
     {
         *fLog << err << "MMcRunHeader not found... aborting." << endl;
         return kFALSE;
-    }
+    }*/
 
     fMcCorsika = 0;
-    if (fMcHeader->IsCeres())
+    if (!fMcHeader || fMcHeader->IsCeres())
         return kTRUE;
 
@@ -404 +405 @@
         // If the reflector version is too old take source position
         // from the WobbleMode in the header
-        if (fMcHeader->GetReflVersion()<=600)
+        if (fMcHeader && fMcHeader->GetReflVersion()<=600)
         {
             SetSrcPos(fFixedPos/fGeom->GetConvMm2Deg());
@@ -429 +430 @@
         // If it was not ceres due to a bug in the MAGIC MCs
         // we have to fix the sign of X
-        if (!fMcHeader->IsCeres())
+        if (fMcHeader && !fMcHeader->IsCeres())
             SetSrcPos(TVector2(-fSrcPosCam->GetX(), fSrcPosCam->GetY()));