Changeset 3232 for trunk/MagicSoft/Mars

Timestamp:

02/18/04 16:50:18 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MArrivalTimeCalc2.cc (modified) (13 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -45 +45 @@
    * mraw/MRawFileRead.cc:
      - don't print warning in case of none executions
+
+   * manalysis/MArrivalTimeCalc2.cc:
+     - added some const-qualifiers
 
 

trunk/MagicSoft/Mars/manalysis/MArrivalTimeCalc2.cc

@@ -77 +77 @@
 void MArrivalTimeCalc2::SetRange(Byte_t hifirst, Byte_t hilast, Byte_t lofirst, Byte_t lolast, Byte_t windowsize)
 {
-
     fNumHiGainSamples = hilast-hifirst+1;
     fNumLoGainSamples = lolast-lofirst+1;
@@ -84 +83 @@
     fLoGainFirst = lofirst;
 
-   
     fWindowSize = windowsize & ~1;
 
     if (fWindowSize != windowsize)
       *fLog << warn << "MArrivalTimeCalc2::SetRange - window size has to be even, set to: " << int(fWindowSize) << " samples " << endl;
-    
+
     if (fWindowSize<2) 
     {
@@ -95 +93 @@
       *fLog << warn << "MArrivalTimeCalc2::SetRange - window size set to two samples" << endl;
     }
-    
+
     if (fWindowSize > fNumHiGainSamples)
     {
@@ -101 +99 @@
       *fLog << warn << "MArrivalTimeCalc2::SetRange - window size set to " << int(fWindowSize) << " samples " << endl;
     }
-    
+
     if (fWindowSize > fNumLoGainSamples)
     {
@@ -109 +107 @@
 
     fWindowSizeSqrt = TMath::Sqrt((Float_t)fWindowSize);
-
-}
-
-
+}
 
 // --------------------------------------------------------------------------
@@ -134 +129 @@
     }
 
-
-   
-
     fPedestals = (MPedestalCam*)pList->FindObject(AddSerialNumber("MPedestalCam"));
     if (!fPedestals)
@@ -147 +139 @@
     if (!fArrivalTime)
         return kFALSE;
- 
+
     return kTRUE;
 }
@@ -157 +149 @@
     Int_t sum=0;    // integral content of the actual window
     Int_t max = 0;  // highest integral content of all windows
-      
+
     //
     // Calculate the sum of the first fWindowSize slices
@@ -163 +155 @@
     sat = 0;
     Byte_t *p = ptr;
-  
 
     while (p<ptr+fWindowSize)
@@ -198 +189 @@
     }
 
-
     // now calculate the time for the maximum window
-
-
-    Int_t timesignalsum = 0;  
+    Int_t timesignalsum = 0;
     Int_t timesquaredsum =0;
-    Int_t timesum =0;    
-   
-   
+    Int_t timesum =0;
+
     for (p=ptrmax; p < ptrmax + fWindowSize; p++)
     {
-      timesignalsum += *p*(p-ptr);
-      timesum += p-ptr;
-      timesquaredsum  += (p-ptr)*(p-ptr);
-    }
-    
-
-    float pedsubsum = max - fWindowSize*pedes;
-
-    float pedsubtimesignalsum = timesignalsum - timesum*pedes;
-
-    time = pedsubsum != 0 ? pedsubtimesignalsum / pedsubsum : 1;
-
+        timesignalsum += *p*(p-ptr);
+        timesum += p-ptr;
+        timesquaredsum  += (p-ptr)*(p-ptr);
+    }
+
+    const Float_t pedsubsum = max - fWindowSize*pedes;
+    const Float_t pedsubtimesignalsum = timesignalsum - timesum*pedes;
+
+    time      = pedsubsum != 0 ? pedsubtimesignalsum / pedsubsum : 1;
     deltatime = pedsubsum != 0 ? pedrms / pedsubsum * sqrt(timesquaredsum - fWindowSize*time) : 1;
 }
@@ -232 +216 @@
 {
     MRawEvtPixelIter pixel(fRawEvt);
-   
 
     Int_t sat=0;
@@ -251 +234 @@
 
         MArrivalTimePix &pix = (*fArrivalTime)[pixid];
-     
+
         const Float_t pedes  = ped.GetPedestal();
         const Float_t pedrms = ped.GetPedestalRms();
 
-
         FindSignalTime(pixel.GetHiGainSamples()+fHiGainFirst, fNumHiGainSamples, timehi, deltatimehi, sathi, pedes, pedrms);
         FindSignalTime(pixel.GetLoGainSamples()+fLoGainFirst, fNumLoGainSamples, timelo, deltatimelo, satlo, pedes, pedrms);
-        
-        if (satlo)
+
+        if (satlo)
             sat++;
-     
-        pix.SetArrivalTime(timehi, deltatimehi,
-                           timelo, deltatimelo);        
-        
+
+        pix.SetArrivalTime(timehi, deltatimehi, timelo, deltatimelo);
         pix.SetGainSaturation(sathi, sathi, satlo);
-
-
-    } /* while (pixel.Next()) */
+    }
 
     fArrivalTime->SetReadyToSave();
@@ -278 +256 @@
         *fLog << warn << "WARNING - Lo Gain saturated in " << sat << " pixels." << endl;
 
- 
     return kTRUE;
 }