Changeset 2386 for trunk/MagicSoft/Mars/manalysis

Timestamp:

10/15/03 19:15:13 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/manalysis/MCerPhotAnal2.cc

@@ -24 +24 @@
 
 //////////////////////////////////////////////////////////////////////////////
-//                                                                          //
-//   MCerPhotAnal2                                                           //
-//                                                                          //
-//   This is a task which calculates the number of photons from the FADC    //
-//   time slices. At the moment it integrates simply the FADC values.       //
-//                                                                          //
-//  Input Containers:                                                       //
-//   MRawEvtData, MPedesdtalCam                                             //
-//                                                                          //
-//  Output Containers:                                                      //
-//   MCerPhotEvt                                                            //
-//                                                                          //
+//
+//   MCerPhotAnal2
+//
+//   This is a task which calculates the number of photons from the FADC
+//   time slices. At the moment it integrates simply the FADC values.
+//
+//  Input Containers:
+//   MRawEvtData, MPedestalCam
+//
+//  Output Containers:
+//   MCerPhotEvt
+//
 //////////////////////////////////////////////////////////////////////////////
 
@@ -134 +134 @@
     while (pixel.Next())
     {
-        Byte_t max = pixel.GetNumMaxHiGainSample();
-        Byte_t num = fRawEvt->GetNumHiGainSamples();
-
-        Byte_t *ptr = pixel.GetHiGainSamples();
+        Byte_t *ptr   = pixel.GetHiGainSamples();
+        Byte_t *max   = ptr+pixel.GetIdxMaxHiGainSample();
+        Byte_t *end   = ptr+fRawEvt->GetNumHiGainSamples();
+        Byte_t *first = max-fBefore;
+        Byte_t *last  = max+fAfter;
 
         ULong_t sumb  = 0;   // sum background
@@ -147 +148 @@
         Int_t nb  = 0;
         Int_t nsb = 0;
-        for (int i=0; i<num; i++)
+
+        if (*max==255)
+            sat++;
+
+        while (ptr<end)
         {
-            if (ptr[i]==255)
-                sat++;
-
-            //if (sat>1)
-            //    continue;
-
-            if (i<max-fBefore || i>max+fAfter)
-            {
-                sumb += ptr[i];
-                sqb  += ptr[i]*ptr[i];
+            if (ptr<first || ptr>last)
+            {
+                sumb += *ptr;
+                sqb  += *ptr* *ptr;
                 nb++;
             }
             else
             {
-                sumsb += ptr[i];
-                sqsb  += ptr[i]*ptr[i];
+                sumsb += *ptr;
+                sqsb  += *ptr* *ptr;
                 nsb++;
             }
+            ptr++;
         }
 
@@ -172 +172 @@
         {
             // Area: x9
-            max = pixel.GetNumMaxLoGainSample();
-            num = fRawEvt->GetNumLoGainSamples();
-
             ptr = pixel.GetLoGainSamples();
+            max = ptr+pixel.GetIdxMaxLoGainSample();
+
+            if (*max>250)
+            {
+                fSkip++;
+                return kCONTINUE;
+            }
+
+            end   = ptr+fRawEvt->GetNumLoGainSamples();
+            first = max-fBefore;
+            last  = max+fAfter;
 
             sumsb = 0;   // sum signal+background
@@ -184 +192 @@
             //nb = 0;
             nsb = 0;
-            for (int i=0; i<num; i++)
-            {
-                if (ptr[i]>250)
-                {
-                    fSkip++;
-                    return kCONTINUE;
-                }
-                if (i<max-fBefore || i>max+fAfter)
+            while (ptr<end)
+            {
+                if (ptr<first || ptr>last)
                 {
                     /*
+                     // Background already calced from hi-gains!
                     sumb += ptr[i];
                     sqb  += ptr[i]*ptr[i];
@@ -200 +204 @@
                 else
                 {
-                    sumsb += ptr[i];
-                    sqsb  += ptr[i]*ptr[i];
+                    sumsb += *ptr;
+                    sqsb  += *ptr* *ptr;
                     nsb++;
                 }
+                ptr++;
             }
         }