Changeset 8990 for trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

Timestamp:

07/01/08 17:07:30 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJPedestal.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -19 +19 @@
 !   Author(s): Markus Gaug, 4/2004 <mailto:markus@ifae.es>
 !
-!   Copyright: MAGIC Software Development, 2000-2007
+!   Copyright: MAGIC Software Development, 2000-2008
 !
 !
@@ -89 +89 @@
 #include "MPedestalSubtract.h"
 
+// Display helpers
+#include "MJCalibration.h"
+
 ClassImp(MJPedestal);
 
@@ -393 +396 @@
         gPad->SetBorderMode(0);
         gPad->SetTicks();
-        TH1D *obj2 = (TH1D*)obj1->Projection(obj1->GetName());
+        TH1D *obj2 = (TH1D*)obj1->Projection();
         obj2->Draw();
         obj2->SetBit(kCanDelete);
@@ -431 +434 @@
 
         if (geomcam.InheritsFrom("MGeomCamMagic"))
-          {
-            TArrayI inner(1);
-            inner[0] = 0;
-
-            TArrayI outer(1);
-            outer[0] = 1;
-            
-            TArrayI s0(6);
-            s0[0] = 6;
-            s0[1] = 1;
-            s0[2] = 2;
-            s0[3] = 3;
-            s0[4] = 4;
-            s0[5] = 5;
-            
-            TArrayI s1(3);
-            s1[0] = 6;
-            s1[1] = 1;
-            s1[2] = 2;
-            
-            TArrayI s2(3);
-            s2[0] = 3;
-            s2[1] = 4;
-            s2[2] = 5;
-            
-            TVirtualPad *pad = gPad;
-            pad->Divide(2,1);
-            
-            TH1D *inout[2];
-            inout[0] = disp1.ProjectionS(s0, inner, "Inner");
-            inout[1] = disp1.ProjectionS(s0, outer, "Outer");
-            FixDataCheckHist(inout[0]);
-            FixDataCheckHist(inout[1]);
-            
-            inout[0]->SetTitle(Form("%s %s",disp1.GetTitle(),"Inner"));
-            inout[1]->SetTitle(Form("%s %s",disp1.GetTitle(),"Outer"));
-            
-            
-            for (int i=0; i<2; i++)
-              {
-                pad->cd(i+1);
-                gPad->SetBorderMode(0);
-                gPad->SetTicks();
-                
-                inout[i]->SetDirectory(NULL);
-                inout[i]->SetLineColor(kRed+i);
-                inout[i]->SetBit(kCanDelete);
-                inout[i]->Draw();
-                inout[i]->Fit("gaus", "Q");
-                
-                TLegend *leg2 = new TLegend(0.6,0.2,0.9,0.55);
-                leg2->SetHeader(inout[i]->GetName());
-                leg2->AddEntry(inout[i], inout[i]->GetName(), "l");
-                
-                //
-                // Display the outliers as dead and noisy pixels
-                //
-                DisplayOutliers(inout[i]);
-                
-                //
-                // Display the two half of the camera separately
-                //
-                TH1D *half[2];
-                half[0] = disp1.ProjectionS(s1, i==0 ? inner : outer , "Sector 6-1-2");
-                half[1] = disp1.ProjectionS(s2, i==0 ? inner : outer , "Sector 3-4-5");
-                
-                for (int j=0; j<2; j++)
-                  {
-                    half[j]->SetLineColor(kRed+i+2*j+1);
-                    half[j]->SetDirectory(NULL);
-                    half[j]->SetBit(kCanDelete);
-                    half[j]->Draw("same");
-                    leg2->AddEntry(half[j], half[j]->GetName(), "l");
-                  }
-                leg2->Draw();
-                delete leg2;
-              }
+        {
+            MJCalibration::DisplayDoubleProject(disp1);
             return;
-          }
+        }
       }
 
@@ -578 +506 @@
         line.DrawLine(398, fRefPedRmsGalacticOuter,
                       x2,  fRefPedRmsGalacticOuter);
-        
+
         line.SetLineColor(kYellow);
         line.DrawLine(398, fRefPedRmsExtraGalacticOuter,
                       x2,  fRefPedRmsExtraGalacticOuter);
-        
+
         line.SetLineColor(kMagenta);
         line.DrawLine(398, fRefPedRmsClosedLidsOuter,
@@ -595 +523 @@
 }
 
+/*
 void  MJPedestal::DisplayOutliers(TH1D *hist) const
 {
@@ -611 +540 @@
     noisytex.DrawLatex(0.1,hist->GetBinContent(hist->GetMaximumBin())/1.2,Form("%3i noisy pixels",(Int_t)noisy));
 }
+*/
 
 void MJPedestal::FixDataCheckHist(TH1D *hist) const