Changeset 2347

Timestamp:

09/16/03 14:17:22 (21 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MCerPhotCalc.cc (modified) (4 diffs)
• manalysis/MCerPhotCalc.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+
+ 2003/09/16: Abelardo Moralejo
+
+   * manalysis MCerPhotCalc.[h,cc]:
+     - added the low gain treatment. It has first been implemented by
+       TB, and the version I submit is a slightly modified one. If any 
+       high gain FADC slice is saturated, we switch to low gain. If low 
+       gain is also saturated, the signal is nevertheless calculated 
+       ("truncated" of course), and a warning is displayed reporting 
+       the number of saturated pixels in the current event. 
+       Fixed also the calculation of the mean pixel pedestal (added 
+       variable fSumWeights), which previously would not work correctly 
+       in the case that one sets weights different from 0 or 1 in the 
+       array fWeight (which was anyway not done up to now, as far as I 
+       know). It would be necessary to add to the parameters of the 
+       analyzed events the number of saturated pixels in some way. 
+       In the MC files produced with camera versions 0.6 or earlier, no
+       low gain is simulated, and saturation of high gain is not 
+       correctly implemented, so this should not introduce any change
+       in the analysis of present or old MC files.
 
  2003/09/12: Thomas Bretz

trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc

@@ -116 +116 @@
         return kFALSE;
 
-    // Calculate quadratic sum of weights:
+    // Calculate sum and quadratic sum of weights:
+    fSumWeights = 0;
     fSumQuadWeights = 0;
     for (Int_t i=0; i<fWeight.GetSize(); i++)
-      fSumQuadWeights += fWeight[i]*fWeight[i];
+      {
+        fSumWeights += fWeight[i];
+        fSumQuadWeights += fWeight[i]*fWeight[i];
+      }
 
     fSumQuadWeights = sqrt(fSumQuadWeights);
@@ -182 +186 @@
         const Double_t offset = fEnableFix ? ped.GetPedestal()-0.5 : ped.GetPedestal();
 
-        ped.Set(offset*fSumQuadWeights*fSumQuadWeights,
+        ped.Set(offset*fSumWeights,
                 ped.GetPedestalRms()*fSumQuadWeights);
     }
@@ -202 +206 @@
 
     MRawEvtPixelIter pixel(fRawEvt);
+
+    Int_t SaturatedPixels = 0;
 
     while (pixel.Next())
@@ -222 +228 @@
         Byte_t *ptr = pixel.GetHiGainSamples();
 
-        Float_t nphot = 0;
-        for(Int_t i=0; i<fWeight.GetSize(); i++)
+        Int_t i;
+        Double_t nphot = 0;
+        for (i=0; i<fWeight.GetSize(); i++)
+        {
+            if (ptr[i]==0xff)
+                break;
             nphot += ptr[i]*fWeight[i];
-
-        nphot -= ped.GetPedestal();
+        }
+
+        Bool_t SaturatedLG = kFALSE;
+
+        if (i<fWeight.GetSize())
+        {
+            nphot = 0;
+
+            ptr = pixel.GetLoGainSamples();
+            if (ptr==NULL)
+            {
+                *fLog << warn << "WARNING - Pixel #" << idx << " saturated but has no lo gains.. skipping!" << endl;
+                return kCONTINUE;
+            }
+
+            for (i=0; i<fWeight.GetSize(); i++)
+            {
+              if (ptr[i]==0xff)
+                SaturatedLG = kTRUE;
+
+              nphot += ptr[i]*fWeight[i];
+            }
+
+            nphot -= ped.GetPedestal();
+            nphot *= 10;
+        }
+        else
+            nphot -= ped.GetPedestal();
 
         fCerPhotEvt->AddPixel(idx, nphot, 0);
 
-        // FIXME! Handling of Lo Gains is missing!
-    }
+        if (SaturatedLG)
+          SaturatedPixels ++;
+    }
+
+    if (SaturatedPixels > 0)
+      *fLog << warn << "WARNING " << SaturatedPixels << "pixels had saturating low gains..." << endl;
 
     fCerPhotEvt->FixSize();

trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.h

@@ -35 +35 @@
     TArrayF         fWeight;  // Weights for adding up the ADC slices
     Float_t         fSumQuadWeights;
+    Float_t         fSumWeights;
 
     void SetDefaultWeights();