Changeset 7364

Timestamp:

09/22/05 14:06:38 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mreport/MReportStarguider.cc (modified) (1 diff)
• msignal/MSignalCam.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mreport/MReportStarguider.cc

@@ -129 +129 @@
     str = str.Strip(TString::kBoth);
 
+    if (ver >= 200508290)
+    {
+        // For the momment this are only placeholders....
+        Float_t dx, dy;
+        n=sscanf(str.Data(), "%f %f %n", &dx, &dy, &len);
+        if (n!=2)
+        {
+            *fLog << warn << "WARNING - Not enough arguments." << endl;
+            return kCONTINUE;
+        }
+
+        str.Remove(0, len);
+        str = str.Strip(TString::kBoth);
+    }
+
     return str.IsNull() ? kTRUE : kCONTINUE;
+
 }
 

trunk/MagicSoft/Mars/msignal/MSignalCam.cc

@@ -599 +599 @@
 {
     MSignalPix *pix = GetPixById(idx);
-
-    if ((!pix || !pix->IsPixelUsed()) && (type<6 || type==8))
+    if (!pix)
+        return kFALSE;
+
+    // Used inlcudes status unampped
+    if (!pix->IsPixelUsed() && (type<6 || type==8))
         return kFALSE;
 
@@ -625 +628 @@
         break;
     case 6:
+        if (pix->IsPixelUnmapped())
+            return kFALSE;
         val = pix->GetArrivalTime();
         break;
     case 7:
-        if (pix->GetNumPhotons()*ratio<15) // maybe 15 as static data member?
+        if (pix->IsPixelUnmapped() || pix->GetNumPhotons()*ratio<15) // maybe 15 as static data member?
             return kFALSE;
         val = pix->GetArrivalTime();