Changeset 3140 for trunk/MagicSoft/Mars/mhist

Timestamp:

02/13/04 15:28:02 (21 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MHBlindPixels.cc (modified) (4 diffs)
• MHBlindPixels.h (modified) (2 diffs)
• MHSigmaTheta.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mhist/MHBlindPixels.cc

@@ -35 +35 @@
 #include "MMcEvt.hxx"
 #include "MBlindPixels.h"
-#include "MPedestalCam.h"
+#include "MPedPhotCam.h"
 #include "MParList.h"
 #include "MBinning.h"
@@ -85 +85 @@
     }
 
-    fPed = (MPedestalCam*)plist->FindObject("MPedestalCam");
-    if (!fPed)
+    
+    fPedPhot = (MPedPhotCam*)plist->FindObject("MPedPhotCam");
+    if (!fPedPhot)
     {
-        *fLog << err << "MPedestalCam not found... aborting." << endl;
+        *fLog << err << "MPedPhotCam not found... aborting." << endl;
         return kFALSE;
     }
-
+    
 
     // Get Theta Binning
@@ -102 +103 @@
 
     // Get binning for pixel number
-    const UInt_t npix1 = fPed->GetSize()+1;
+    const UInt_t npix1 = fPedPhot->GetSize()+1;
 
     MBinning binspix("BinningPixel");
@@ -166 +167 @@
 
     // FIXME: Slow.
-    const UInt_t npix = fPed->GetSize();
+    const UInt_t npix = fPedPhot->GetSize();
 
     UInt_t nb = 0;

trunk/MagicSoft/Mars/mhist/MHBlindPixels.h

@@ -9 +9 @@
 #endif
 
-class MPedestalCam;
+class MPedPhotCam;
 class MMcEvt;
 class MParList;
@@ -17 +17 @@
 {
 private:
-    MPedestalCam  *fPed;      //!
+    MPedPhotCam   *fPedPhot;      //!
     MMcEvt        *fMcEvt;    //!
 

trunk/MagicSoft/Mars/mhist/MHSigmaTheta.cc

@@ -95 +95 @@
     MBinning binst;
     MBinning binsd;
-    binsd.SetEdges(100, -5, 20);
-    binsb.SetEdges(100, 0, 5);
+    binsd.SetEdges(100, -10, 20);
+    binsb.SetEdges(100, 0, 10);
     binst.SetEdgesCos(10, 0, 90);
 
@@ -166 +166 @@
 
     // Get binning for pixel number
-    const UInt_t npix1 = fPed->GetSize()+1;
-
+    //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 :
     MBinning binspix("BinningPixel");
-    binspix.SetEdges(npix1, -0.5, npix1-0.5);
+    binspix.SetEdges(578, -0.5, 577.5);
 
     // Set binnings in histograms
@@ -191 +194 @@
 {
     Double_t theta = fMcEvt ? fMcEvt->GetTelescopeTheta()*kRad2Deg : 0;
-    Double_t mysig = fSigmabar->Calc(*fCam, *fPed, *fEvt);
+    fSigmabar->Calc(*fCam, *fPed, *fEvt);
+    Double_t mysig = fSigmabar->GetSigmabarInner();
+
+    //*fLog << "theta, mysig = " << theta << ",  " << mysig << endl;
 
     fSigmaTheta.Fill(theta, mysig);
@@ -211 +217 @@
         const Double_t sigma = pix.GetRms();
 
-        fSigmaPixTheta.Fill(theta, (Double_t)id, sigma);
+        fSigmaPixTheta.Fill(theta, (Double_t)id, sigma*sqrt(ratio));
 
         const Double_t diff = sigma*sigma*ratio - mysig*mysig;