Changeset 1557 for trunk/MagicSoft/Mars/manalysis/MCerPhotAnal.cc

Timestamp:

10/29/02 13:58:25 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/manalysis/MCerPhotAnal.cc

@@ -123 +123 @@
 
     while (pixel.Next())
-      {
+    {
         Byte_t *ptr = pixel.GetHiGainSamples();
         const Byte_t *end = ptr + fRawEvt->GetNumHiGainSamples();
@@ -134 +134 @@
         Int_t slicelocal=0;
 
-        Float_t nphot;
-        Float_t pedes, sigmaped;
-
-        do 
-          {
-            sumlocal = 0;
-            for(Int_t i = 0; i<5;i++)
-              sumlocal+=*(ptr+i);
-            if (sumpeak < sumlocal){
-              slice=slicelocal;
-              sumpeak = sumlocal;
-            }
-            slicelocal++;
+        do
+        {
+            sumlocal = 0;
+            for (Int_t i = 0; i<5;i++)
+                sumlocal += *(ptr+i);
+
+            if (sumpeak < sumlocal)
+            {
+                slice=slicelocal;
+                sumpeak = sumlocal;
+            }
+
+            slicelocal++;
             sum += *ptr;
-          }
-        while (++ptr != limit);
-
-        do sum += *ptr;
-        while (++ptr != end);
-
-        pedes = (Float_t)(sum-sumpeak)/(fRawEvt->GetNumHiGainSamples()-5);
-        nphot=(Float_t)sumpeak - 5.0*pedes;
-        sigmaped=0;
-        sumlocal=0;
-        slicelocal=0;
+        } while (++ptr != limit);
+
+        do sum += *ptr;
+        while (++ptr != end);
+
+        Float_t pedes = (Float_t)(sum-sumpeak)/(fRawEvt->GetNumHiGainSamples()-5);
+        Float_t nphot = (Float_t)sumpeak - 5.0*pedes;
+
+        Float_t sigmaped=0;
+
+        slicelocal=0;
+        sumlocal = 0;
 
         ptr = pixel.GetHiGainSamples();
-        do {
-          if (slicelocal==slice)
-            ptr+=4;
-          else{
-            sumlocal=*ptr;
-            sigmaped+=((Float_t)sumlocal-pedes)*((Float_t)sumlocal-pedes);
-          }
-          slicelocal++;
+        do
+        {
+            if (slicelocal==slice)
+                ptr += 4;
+            else
+            {
+                sumlocal = *ptr;
+
+                const Float_t d = (Float_t)sumlocal-pedes;
+                sigmaped += d*d;
+            }
+            slicelocal++;
         }
-        while(++ptr != end);
-        sigmaped/=(fRawEvt->GetNumHiGainSamples()-5);
-        sigmaped=sqrt(sumlocal);
+        while (++ptr != end);
+
+        sigmaped /= (fRawEvt->GetNumHiGainSamples()-5);
+        sigmaped = sqrt(sumlocal);
 
         const UInt_t pixid = pixel.GetPixelId();
@@ -188 +194 @@
 
         fCerPhotEvt->AddPixel(pixid, nphot, sigmaped/2.236);
-        ped.SetPedestal(pedes,sigmaped);
+        ped.SetPedestal(pedes, sigmaped);
         ped.SetPedestalRms(sigmaped/sqrt(fRawEvt->GetNumHiGainSamples()-5),
                            sigmaped/sqrt(2*(fRawEvt->GetNumHiGainSamples()-5)));