Changeset 18271 for trunk/Mars

Timestamp:

07/26/15 16:42:59 (9 years ago)

Author:

Daniela Dorner

Message:

implemented case kEvtTimeSlopeCleaned

Location:

trunk/Mars

Files:

• mhist/MHEvent.cc (modified) (2 diffs)
• mhist/MHEvent.h (modified) (1 diff)
• msignal/MSignalCam.cc (modified) (2 diffs)

trunk/Mars/mhist/MHEvent.cc

@@ -197 +197 @@
         break;
      case kEvtTimeSlope:
+     case kEvtTimeSlopeCleaned:
         fHist->SetName("Time Slope");
         fHist->SetYTitle("delta_t [ns]");
@@ -301 +302 @@
         break;
     case kEvtTimeSlope:
-        fHist->SetCamContent(*event, 12);
+        fHist->SetCamContent(*event, 13);
+        break; 
+    case kEvtTimeSlopeCleaned:
+        fHist->SetCamContent(*event, 14);
         break; 
     default:

trunk/Mars/mhist/MHEvent.h

@@ -27 +27 @@
         kEvtCleaningLevels, kEvtCleaningData,
         kEvtIdxMax, kEvtArrTime, kEvtArrTimeCleaned,
-        kEvtTrigPix, kEvtIslandIndex, kEvtTimeSlope
+        kEvtTrigPix, kEvtIslandIndex, kEvtTimeSlope,
+        kEvtTimeSlopeCleaned
     };
 

trunk/Mars/msignal/MSignalCam.cc

@@ -594 +594 @@
 
     // Used inlcudes status unampped
-    if (!pix.IsPixelUsed() && (type<6 || type==8))
+    if (!pix.IsPixelUsed() && (type<6 || type==8 || type==14))
         return kFALSE;
 
@@ -669 +669 @@
         return pix.GetNumPhotons()>0;
 
-    case 12: // time slope
+    case 13: // time slope
+        val = pix.GetTimeSlope();
+        break;
+
+    case 14: // time slope
+        if (pix.IsPixelUnmapped())
+            return kFALSE;
         val = pix.GetTimeSlope();
         break;