Changeset 3339 for trunk/MagicSoft/Mars/mhist

Timestamp:

02/27/04 06:52:39 (21 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MHBlindPixels.cc (modified) (3 diffs)
• MHBlindPixels.h (modified) (1 diff)
• MHSigmaTheta.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mhist/MHBlindPixels.cc

@@ -35 +35 @@
 #include "MMcEvt.hxx"
 #include "MBlindPixels.h"
+#include "MGeomCam.h"
 #include "MPedPhotCam.h"
 #include "MParList.h"
@@ -78 +79 @@
 Bool_t MHBlindPixels::SetupFill(const MParList *plist)
 {
+    MGeomCam *fCam = (MGeomCam*)plist->FindObject(AddSerialNumber("MGeomCam"));
+    if (!fCam)    
+    {
+        *fLog << err << "MHBlindPixels::SetupFill; MGeomCam not found... aborting." << endl;
+        return kFALSE;
+    }
+
     fMcEvt = (MMcEvt*)plist->FindObject("MMcEvt");
     if (!fMcEvt)
@@ -92 +100 @@
         return kFALSE;
     }
+    fPedPhot->InitSize(fCam->GetNumPixels());
     
 

trunk/MagicSoft/Mars/mhist/MHBlindPixels.h

@@ -12 +12 @@
 class MMcEvt;
 class MParList;
-
+class MGeomCam;
 
 class MHBlindPixels : public MH
 {
 private:
-    MPedPhotCam   *fPedPhot;      //!
+    MGeomCam      *fCam;      //!
+    MPedPhotCam   *fPedPhot;  //!
     MMcEvt        *fMcEvt;    //!
 

trunk/MagicSoft/Mars/mhist/MHSigmaTheta.cc

@@ -113 +113 @@
 Bool_t MHSigmaTheta::SetupFill(const MParList *plist)
 {
+    fCam = (MGeomCam*)plist->FindObject("MGeomCam");
+    if (!fCam)
+    {
+        *fLog << err << "MGeomCam not found (no geometry information available)... aborting." << endl;
+        return kFALSE;
+    }
+
     fMcEvt = (MMcEvt*)plist->FindObject("MMcEvt");
     if (!fMcEvt)
         *fLog << warn << "MMcEvt not found... aborting." << endl;
 
+
     fPed = (MPedPhotCam*)plist->FindObject("MPedPhotCam");
     if (!fPed)
@@ -123 +131 @@
         return kFALSE;
     }
-
-    fCam = (MGeomCam*)plist->FindObject("MGeomCam");
-    if (!fCam)
-    {
-        *fLog << err << "MGeomCam not found (no geometry information available)... aborting." << endl;
-        return kFALSE;
-    }
+    fPed->InitSize(fCam->GetNumPixels());
+
 
     fEvt = (MCerPhotEvt*)plist->FindObject("MCerPhotEvt");
@@ -166 +169 @@
 
     // Get binning for pixel number
-    //const UInt_t npix1 = fPed->GetSize()+1;
-    //*fLog << "npix1 = " << npix1 << endl;
-    //MBinning binspix("BinningPixel");
-    //binspix.SetEdges(npix1, -0.5, npix1-0.5);
-    // the above gives npix1 = 1; therefore :
+    const UInt_t npix1 = fPed->GetSize()+1;
+    *fLog << "npix1 = " << npix1 << endl;
     MBinning binspix("BinningPixel");
-    binspix.SetEdges(578, -0.5, 577.5);
+    binspix.SetEdges(npix1, -0.5, npix1-0.5);
 
     // Set binnings in histograms