Changeset 2377 for trunk/MagicSoft/Mars/manalysis

Timestamp:

10/04/03 12:47:13 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• AnalysisLinkDef.h (modified) (1 diff)
• MBlindPixelCalc.cc (modified) (1 diff)
• MBlindPixels.h (modified) (1 diff)
• MCerPhotCalc.cc (modified) (9 diffs)
• MMcPedestalCopy.cc (modified) (1 diff)
• MMcPedestalNSBAdd.cc (modified) (1 diff)
• MPedestalCam.cc (modified) (1 diff)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h

@@ -19 +19 @@
 #pragma link C++ class MMcPedestalCopy+;
 #pragma link C++ class MMcPedestalNSBAdd+;
+#pragma link C++ class MGeomApply+;
 
 #pragma link C++ class MHadronness+;

trunk/MagicSoft/Mars/manalysis/MBlindPixelCalc.cc

@@ -303 +303 @@
     fPixels->Clear();
 
+    if (!fGeomCam->InheritsFrom("MGeomCamMagic"))
+    {
+        *fLog << warn << "MBlindPixelCalc::ReInit: Warning - Starfield only implemented for Magic standard Camera... no action." << endl;
+        return kTRUE;
+    }
+
     //
     // Set as blind some particular pixels because of a particular

trunk/MagicSoft/Mars/manalysis/MBlindPixels.h

@@ -21 +21 @@
     void AdoptPixels(Char_t pixels[577]) { fPixels.Adopt(577, pixels); }
 
+    void AdoptPixels(const TArrayC &pixels) { fPixels = pixels; }
+
     void Clear(Option_t *o="")  { fPixels.Reset(); }
 
     Bool_t IsBlind(UShort_t id) const { return fPixels.GetSize() && ((TArrayC)fPixels)[id]; }
+
+    void InitSize(UShort_t i) { fPixels.Set(i); }
 
     ClassDef(MBlindPixels, 1) // container to store blind pixels

trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc

@@ -48 +48 @@
 #include "MLogManip.h"
 
+#include "MGeomCam.h"
 #include "MMcRunHeader.hxx"
 
@@ -174 +175 @@
 void MCerPhotCalc::ScalePedestals()
 {
-    Int_t n = 577; //FIXME: fPedestals->GetNumPixel();
+    const Int_t n = fPedestals->GetSize();
 
     for (int idx=0; idx<n; idx++)
@@ -186 +187 @@
         const Double_t offset = fEnableFix ? ped.GetPedestal()-0.5 : ped.GetPedestal();
 
-        ped.Set(offset*fSumWeights,
-                ped.GetPedestalRms()*fSumQuadWeights);
+        ped.Set(offset*fSumWeights, ped.GetPedestalRms()*fSumQuadWeights);
     }
 
@@ -205 +205 @@
 //        ScalePedestals();
 
+    const Int_t n = fWeight.GetSize();
+
     MRawEvtPixelIter pixel(fRawEvt);
 
-    Int_t SaturatedPixels = 0;
+    Int_t saturatedpixels = 0;
 
     while (pixel.Next())
     {
         const UInt_t idx = pixel.GetPixelId();
-        MPedestalPix &ped = (*fPedestals)[idx];
-
         //
         // sanity check (old MC files sometimes have pixids>577)
@@ -219 +219 @@
         if (!fPedestals->CheckBounds(idx))
         {
-            *fLog << inf << "Pixel Index larger than camera... skipping event." << endl;
+            *fLog << inf << "Pixel Index out of MPedestalCam bounds... skipping event." << endl;
             return kCONTINUE;
-        }
+        }
+
+        MPedestalPix &ped = (*fPedestals)[idx];
 
         //
@@ -230 +232 @@
         Int_t i;
         Double_t nphot = 0;
-        for (i=0; i<fWeight.GetSize(); i++)
+        for (i=0; i<n; i++)
         {
             if (ptr[i]==0xff)
@@ -237 +239 @@
         }
 
-        Bool_t SaturatedLG = kFALSE;
-
-        if (i<fWeight.GetSize())
+        Bool_t saturatedlg = kFALSE;
+
+        if (i<n)
         {
             nphot = 0;
@@ -250 +252 @@
             }
 
-            for (i=0; i<fWeight.GetSize(); i++)
+            for (i=0; i<n; i++)
             {
-              if (ptr[i]==0xff)
-                SaturatedLG = kTRUE;
-
-              nphot += ptr[i]*fWeight[i];
+                if (ptr[i]==0xff)
+                    saturatedlg = kTRUE;
+
+                nphot += ptr[i]*fWeight[i];
             }
 
@@ -266 +268 @@
         fCerPhotEvt->AddPixel(idx, nphot, 0);
 
-        if (SaturatedLG)
-          SaturatedPixels ++;
-    }
-
-    switch(SaturatedPixels)
-      {
-      case 0:
-        break;
-      case 1:
-        *fLog << warn << "WARNING: 1 pixel had saturating low gains..." << endl;
-        break;
-      default:
-        *fLog << warn << "WARNING: " << SaturatedPixels << " pixels had saturating low gains..." << endl;
-        break;
-      }
-
+        if (saturatedlg)
+          saturatedpixels++;
+    }
+
+    if (saturatedpixels>0)
+        *fLog << warn << "WARNING: " << saturatedpixels << " pixel(s) had saturating low gains..." << endl;
 
     fCerPhotEvt->FixSize();

trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc

@@ -126 +126 @@
         return kFALSE;
 
-    const int num = fMcPed->GetNumPixel();
-
-    fPedCam->InitSize(num);
+    const int num = fPedCam->GetSize();
 
     for (int i=0; i<num; i++)

trunk/MagicSoft/Mars/manalysis/MMcPedestalNSBAdd.cc

@@ -207 +207 @@
         return kFALSE;
 
-    const int num = fFadc->GetNumPixel();
-    
-    fPedCam->InitSize(num);
+    const int num = fPedCam->GetSize();
 
     for (int i=0; i<num; i++)

trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc

@@ -53 +53 @@
     fTitle = title ? title : "Storage container for all Pedestal Information in the camera";
 
-    fArray = new TClonesArray("MPedestalPix", 577);
+    fArray = new TClonesArray("MPedestalPix", 1);
 
-    for (int i=0; i<577; i++)
-        new ((*fArray)[i]) MPedestalPix;
+//    for (int i=0; i<577; i++)
+//        new ((*fArray)[i]) MPedestalPix;
 }
 

trunk/MagicSoft/Mars/manalysis/Makefile

@@ -35 +35 @@
            MMcPedestalCopy.cc \
            MMcPedestalNSBAdd.cc \
+           MGeomApply.cc \
            MCurrents.cc \
            MEnergyEst.cc \