Changeset 1404 for trunk/MagicSoft/Mars/manalysis

Timestamp:

07/15/02 20:35:15 (22 years ago)

Author:

bigongia

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MCerPhotCalc2.cc (modified) (5 diffs)
• MCerPhotCalc2.h (modified) (2 diffs)

trunk/MagicSoft/Mars/manalysis/MCerPhotCalc2.cc

@@ -33 +33 @@
 //                                                                          //
 //  Input Containers:                                                       //
-//   MRawEvtData, MPedesdtalCam                                             //
+//   MRawEvtData, MPedestalCam                                             //
 //                                                                          //
 //  Output Containers:                                                      //
@@ -58 +58 @@
 ClassImp(MCerPhotCalc2);
 
-const Float_t fWeight[15] ={0, 0.0809835, 0.289593, 0.366926, 0.211665, 0.0508328, 0., 0., 0., 0., 0., 0., 0., 0., 0.};
-
-Float_t SumQuadWeights, SumWeights;
-
-
 // --------------------------------------------------------------------------
 //
@@ -77 +72 @@
     AddToBranchList("MRawEvtData.fLoGainFadcSamples");
 
-    SumQuadWeights = SumWeights = 0.;
+    fSumQuadWeights = fSumWeights = 0.;
     for (Int_t i = 0; i < 15; i++)
       {
-        SumQuadWeights += pow(fWeight[i],2.);
-        SumWeights += fWeight[i];
+        fSumQuadWeights += fWeight[i]*fWeight[i];
+        fSumWeights += fWeight[i];
       }
-    SumQuadWeights = sqrt(SumQuadWeights);
+    fSumQuadWeights = sqrt(fSumQuadWeights);
 
 }
@@ -204 +199 @@
         //
         if (nphot!=0)
-          nphot -= mean*SumWeights;
-
-        Float_t nphoterr = ped.GetSigma()* SumQuadWeights;
+          nphot -= mean*fSumWeights;
+
+        Float_t nphoterr = ped.GetSigma()* fSumQuadWeights;
 
         fCerPhotEvt->AddPixel(pixid, nphot, nphoterr);
@@ -217 +212 @@
     return kTRUE;
 }
+
+Float_t MCerPhotCalc2::fWeight[15] = {0, 0.0809835, 0.289593, 0.366926, 0.211665, 0.0508328, 0., 0., 0., 0., 0., 0., 0., 0., 0.};

trunk/MagicSoft/Mars/manalysis/MCerPhotCalc2.h

@@ -22 +22 @@
 class MCerPhotCalc2 : public MTask
 {
-    MPedestalCam  *fPedestals;  // Pedestals of all pixels in the camera
-    MRawEvtData   *fRawEvt;     // raw event data (time slices)
-    MCerPhotEvt   *fCerPhotEvt; // Cerenkov Photon Event used for calculation
-    MRawRunHeader *fRunHeader;  //  RunHeader information
+    MPedestalCam   *fPedestals;  // Pedestals of all pixels in the camera
+    MRawEvtData    *fRawEvt;     // raw event data (time slices)
+    MCerPhotEvt    *fCerPhotEvt; // Cerenkov Photon Event used for calculation
+    MRawRunHeader  *fRunHeader;  //  RunHeader information
  
-    Bool_t         fEnableFix;  // fix for a bug in files from older camera versions (<=40)
+    Bool_t          fEnableFix;  // fix for a bug in files from older camera versions (<=40)
 
+    Float_t         fSumQuadWeights, fSumWeights;
+    static Float_t  fWeight[15];
 
 public:
@@ -41 +43 @@
 };
 
+
 #endif