Changeset 19310

Timestamp:

10/25/18 21:17:10 (6 years ago)

Author:

tbretz

Message:

It was crashing if the camera had less than 1440 pixels connected - fixed.

File:

• trunk/Mars/manalysis/MSoftwareTriggerCalc.cc (modified) (3 diffs)

trunk/Mars/manalysis/MSoftwareTriggerCalc.cc

@@ -93 +93 @@
 Int_t MSoftwareTriggerCalc::Process()
 {
+    const UInt_t nch  = fRawEvt->GetNumPixels(); // HW Channels
+    const UInt_t npix = fSignal->GetNumPixels(); // Pixel in camera
+
     const UShort_t *ids = fRawEvt->GetPixelIds();
 
+    // FACT: Exclude time marker, FAMOUS take the whole range
     const int beg =  10;
-    const int end = std::min(UInt_t(200), fSignal->GetNumSamples());
+    const int end = npix==1440 ? std::min(UInt_t(200), fSignal->GetNumSamples()) : fSignal->GetNumSamples()-10;
     const int num = end-beg;
 
@@ -103 +107 @@
     double avg = 0;
 
-    for (int hw=0; hw<1440; hw++)
-    {
-        // dead pixels
-        if (hw==927 || hw==80 || hw==873)                   // 3
+    for (int hw=0; hw<nch; hw++)
+    {
+        // The FAMOUS camera has less pixels than
+        // what is stored as channels in the file
+        if (ids[hw]>=npix)
             continue;
-        // crazy pixels
-        if (hw==863 || hw==297 || hw==868)                  // 3
-            continue;
-        // broken DRS board
-        if (hw>=720 && hw<=728)                             // 9
-            continue;
-        // broken/suspicious bias channels
-        if ((hw>=171 && hw<=174) || (hw>=184 && hw<=188))   // 9
-            continue;
+
+        if (npix==1440) // FACT[1440] else FAMOUS[64]
+        {
+            // dead pixels
+            if (hw==927 || hw==80 || hw==873)                   // 3
+                continue;
+            // crazy pixels
+            if (hw==863 || hw==297 || hw==868)                  // 3
+                continue;
+            // broken DRS board
+            if (hw>=720 && hw<=728)                             // 9
+                continue;
+            // broken/suspicious bias channels
+            if ((hw>=171 && hw<=174) || (hw>=184 && hw<=188))   // 9
+                continue;
+        }
 
         const Float_t *raw = fSignal->GetSamples(ids[hw]);
@@ -176 +188 @@
     }
 
-    // Question: Should we also keep position and patch id?
-
-    avg /= (num-15)*(1440-24);
+    avg /= num-15;
+    avg /= npix==1440 ? 1440-24 : npix;
 
     fTrigger->SetData(patch, avg, pos, max);