Changeset 19129 for trunk/Mars

Timestamp:

08/03/18 13:51:26 (6 years ago)

Author:

tbretz

Message:

Secure the algorithm for the case when the output container (64) is smaller than the input container (1440).

File:

• trunk/Mars/mdrs/MDrsCalibApply.cc (modified) (4 diffs)

trunk/Mars/mdrs/MDrsCalibApply.cc

@@ -171 +171 @@
     fSignal->InitSamples(roi);
 
-    if (!fDrsCalib)  // FIXME: Do a fake (none) calibration
+    if (!fDrsCalib)  // Do a fake (none) calibration
+    {
+        /*
+        const int16_t *val = reinterpret_cast<int16_t*>(fRawEvt->GetSamples());
+        const uint32_t num = fRawEvt->GetNumPixels()*roi;
+
+        std::copy(val, val+num, fSignal->GetSamples(0));
+        */
+        /*
+            const int16_t *val = reinterpret_cast<int16_t*>(fRawEvt->GetSamples());
+            Float_t *vec = fSignal->GetSamples(0);
+
+            const UShort_t *idx = fRawEvt->GetPixelIds();
+            for (size_t ch=0; ch<fRawEvt->GetNumPixels(); ch++)
+            {
+                const size_t hw  = ch*roi;
+                const size_t sw  = ch*roi;//idx[ch]*roi;
+                std::copy(val+hw, val+hw+roi, vec+sw);
+            }
+        */
         return kTRUE;
+    }
 
     const int16_t *val = reinterpret_cast<int16_t*>(fRawEvt->GetSamples());
@@ -191 +211 @@
     for (size_t ch=0; ch<fRawEvt->GetNumPixels(); ch++)
     {
+        if (idx[ch]>=fSignal->GetNumPixels())
+            continue;
+
         const size_t drs = ch*1024;
         const size_t hw  = ch*roi;
@@ -208 +231 @@
         for (auto it=fPrevStart.begin(); it!=fPrevStart.end(); it++)
         {
-            fResult->fData[i++] = DrsCalibrate::CorrectStep(vec, fRawEvt->GetNumPixels(), roi, it->data(), start, roi+10, idx);
-            fResult->fData[i++] = DrsCalibrate::CorrectStep(vec, fRawEvt->GetNumPixels(), roi, it->data(), start, 3,      idx);
+            fResult->fData[i++] = DrsCalibrate::CorrectStep(vec, fSignal->GetNumPixels(), roi, it->data(), start, roi+10, idx);
+            fResult->fData[i++] = DrsCalibrate::CorrectStep(vec, fSignal->GetNumPixels(), roi, it->data(), start, 3,      idx);
         }
 
@@ -220 +243 @@
     {
     case 1:
-        for (size_t ch=0; ch<fRawEvt->GetNumPixels(); ch++)
+        for (size_t ch=0; ch<fSignal->GetNumPixels(); ch++)
             DrsCalibrate::RemoveSpikes(vec+ch*roi, roi);
         break;
     case 2:
-        for (size_t ch=0; ch<fRawEvt->GetNumPixels(); ch++)
+        for (size_t ch=0; ch<fSignal->GetNumPixels(); ch++)
             DrsCalibrate::RemoveSpikes2(vec+ch*roi, roi);
         break;
     case 3:
-        for (size_t ch=0; ch<fRawEvt->GetNumPixels(); ch++)
+        for (size_t ch=0; ch<fSignal->GetNumPixels(); ch++)
             DrsCalibrate::RemoveSpikes3(vec+ch*roi, roi);
         break;
     case 4:
-        for (size_t ch=0; ch<fRawEvt->GetNumPixels(); ch++)
+        for (size_t ch=0; ch<fSignal->GetNumPixels(); ch++)
             DrsCalibrate::RemoveSpikes4(vec+ch*roi, roi);
         break;
     }
-
 
     if (fSlidingAverage)