Changeset 4301

Timestamp:

06/17/04 10:49:08 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/Makefile (modified) (1 diff)
• mhist/MHCamera.cc (modified) (6 diffs)
• mjobs/MJPedestal.cc (modified) (4 diffs)
• mjobs/MJPedestal.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -27 +27 @@
       Previously, only a Fill(x,y,w) was public, with x and y positions 
       in the camera. 
+
+  * mjobs/MJPedestal.[h,cc]
+    - updated the data-check display
 
 

trunk/MagicSoft/Mars/mcalib/Makefile

@@ -20 +20 @@
 #
 INCLUDES = -I. -I../mbase -I../mhbase -I../mgui -I../mgeom \
-           -I../manalysis -I../mraw -I../mtools -I../mmc   \
+           -I../manalysis -I../mraw -I../mtools -I../mmc -I../mhist  \
            -I../mimage -I../msignal -I../mbadpixels -I../mpedestal
 

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -69 +69 @@
 #include <TF1.h>
 #include <TCanvas.h>
+#include <TLegend.h>
 
 #include "MLog.h"
@@ -1664 +1665 @@
 // 6: Fit Inner and Outer pixels separately by a single Gaussian and display 
 //                 additionally the two camera halfs separately (for MAGIC camera)
+// 7: Single Gauss with TLegend to show the meaning of the colours
 //
 //
@@ -1708 +1710 @@
           inout[0]->SetDirectory(NULL);
           inout[1]->SetDirectory(NULL);
-          
+
           for (int i=0; i<2; i++)
             {
@@ -1716 +1718 @@
               inout[i]->Draw();
               inout[i]->Fit("gaus","Q");
-              /*
-              gPad->Modified();
-              gPad->Update();
-              gPad->SaveAs(Form("%s%s%i%s",GetName(),"AreaIdx",i,".eps"));
-              */
+              
+              
               if (fit == 6)
                 {
@@ -1778 +1777 @@
       halfInOut[2] = ProjectionS(s0, outer, "Sector 6-1-2 Outer");
       halfInOut[3] = ProjectionS(s1, outer, "Sector 3-4-5 Outer");
+
+      TLegend *leg = new TLegend(0.05,0.65,0.35,0.9);
       
       for (int i=0; i<4; i++)
@@ -1785 +1786 @@
           halfInOut[i]->SetBit(kCanDelete);
           halfInOut[i]->Draw("same");
+          leg->AddEntry(halfInOut[i],halfInOut[i]->GetTitle(),"l");
         }
+
+      if (fit==7)
+        leg->Draw();
+      
+      gPad->Modified();
+      gPad->Update();
     }
   

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -63 +63 @@
 
 using namespace std;
+
+const Double_t MJPedestal::fgPedestalMin = 4.;
+const Double_t MJPedestal::fgPedestalMax = 16.;
+const Double_t MJPedestal::fgPedRmsMin   = 0.;
+const Double_t MJPedestal::fgPedRmsMax   = 20.;
 // --------------------------------------------------------------------------
 //
@@ -147 +152 @@
     // Create container to display
     //
-    MHCamera disp0(geomcam, "MPedestalCam;ped", "Pedestal");
-    MHCamera disp1(geomcam, "MPedestalCam;RMS", "Ped. RMS");
+    MHCamera disp0(geomcam, "MPedestalCam;ped", "Mean Pedestal");
+    MHCamera disp1(geomcam, "MPedestalCam;RMS", "Pedestal RMS");
 
     disp0.SetCamContent(fPedestalCam, 0);
@@ -159 +164 @@
     disp1.SetYTitle("\\sigma_{P} [fadc/slice]");
 
+
     //
     // Display data
@@ -165 +171 @@
     c3.Divide(2,3);
 
-    disp0.CamDraw(c3, 1, 2, 1);
-    disp1.CamDraw(c3, 2, 2, 6);
+    if (fDataCheck)
+      {
+        c3.cd(1);
+        gPad->SetBorderMode(0);
+        gPad->SetTicks();
+        MHCamera *obj1=(MHCamera*)disp0.DrawCopy("hist");
+        obj1->SetDirectory(NULL);
+        obj1->SetMinimum(fgPedestalMin);
+        obj1->SetMaximum(fgPedestalMax);
+        gPad->Modified();
+        gPad->Update();
+
+        c3.cd(3);
+        gPad->SetBorderMode(0);
+        obj1->SetPrettyPalette();
+        obj1->Draw();
+        
+        c3.cd(5);
+        gPad->SetBorderMode(0);
+        gPad->SetTicks();
+        disp0.DrawProjection(7);
+        gPad->Modified();
+        gPad->Update();
+
+        c3.cd(2);
+        gPad->SetBorderMode(0);
+        gPad->SetTicks();
+        MHCamera *obj2=(MHCamera*)disp1.DrawCopy("hist");
+        obj2->SetDirectory(NULL);
+        obj2->SetMinimum(fgPedRmsMin);
+        obj2->SetMaximum(fgPedRmsMax);
+        gPad->Modified();
+        gPad->Update();
+
+        c3.cd(4);
+        gPad->SetBorderMode(0);
+        obj2->SetPrettyPalette();
+        obj2->Draw();
+        
+        c3.cd(6);
+        gPad->SetBorderMode(0);
+        gPad->SetTicks();
+        disp1.DrawProjection(6);
+
+      }
+    else
+      {
+        disp0.CamDraw(c3, 1, 2, 1);
+        disp1.CamDraw(c3, 2, 2, 6);
+      }
 }
 

trunk/MagicSoft/Mars/mjobs/MJPedestal.h

@@ -17 +17 @@
 {
 private:
+
+  static const Double_t fgPedestalMin;
+  static const Double_t fgPedestalMax;  
+  static const Double_t fgPedRmsMin;
+  static const Double_t fgPedRmsMax;  
 
   TString fOutputPath;
@@ -41 +46 @@
   
   const char* GetOutputFile() const;
+  const Bool_t IsDataCheck() const    { return fDataCheck;  }
   
   Bool_t Process();