Changeset 3487 for trunk/MagicSoft/Mars/manalysis/MCerPhotAnal2.cc

Timestamp:

03/12/04 16:07:58 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/manalysis/MCerPhotAnal2.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/manalysis/MCerPhotAnal2.cc

@@ -153 +153 @@
         ULong_t sqsb  = 0;   // sum sqares signal+background
 
-        Int_t sat = 0; // saturates?
-        Int_t nb  = 0;
-        Int_t nsb = 0;
+        Int_t sat  = 0; // saturates?
+        Int_t ishi = 0; // has a high content?
+        Int_t nb   = 0;
+        Int_t nsb  = 0;
 
         if (*max==255)
             sat++;
+
+        if (*max>80)
+            ishi++;
 
         while (ptr<end)
@@ -177 +181 @@
         }
 
-        if (sat>1)
+        if (sat==0 && ishi)
+        {
+            // Area: x9
+            ptr = pixel.GetLoGainSamples();
+            max = ptr+pixel.GetIdxMaxLoGainSample();
+            end = ptr+fRawEvt->GetNumLoGainSamples();
+
+            sumb = 0;   // sum background
+            sqb  = 0;   // sum sqares background
+            nb   = 0;
+
+            while (ptr<end)
+            {
+                // Background already calced from hi-gains!
+                sumb += *ptr;
+                sqb  += *ptr* *ptr;
+                nb++;
+            }
+        }
+
+        if (sat>1 && !ishi)
         {
             // Area: x9