Changeset 4304 for trunk

Timestamp:

06/17/04 20:13:02 (20 years ago)

Author:

reyes

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MHCalibrationChargeCam.cc (modified) (2 diffs)
• mcalib/MHCalibrationChargeCam.h (modified) (1 diff)
• mcalib/MHCalibrationChargePix.cc (modified) (2 diffs)
• mjobs/MJCalibration.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -23 +23 @@
   * mjobs/MJPedestal.[h,cc]
     - adapted display for the datacheck
+
+  * mcalib/MHCalibrationChargeCam.[h,cc]
+    - new function Draw for the datacheck
 
 

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc

@@ -138 +138 @@
 #include "MExtractedSignalPix.h"
 
+#include <TPad.h>
+#include <TVirtualPad.h>
+#include <TCanvas.h>
+
 ClassImp(MHCalibrationChargeCam);
 
@@ -794 +798 @@
 }
 
+
+// -----------------------------------------------------------------------------
+// 
+// Default draw:
+//
+// Displays the averaged areas, both High Gain and Low Gain 
+//
+// Calls the Draw of the fAverageHiGainAreas and fAverageLoGainAreas objects with options
+//
+void MHCalibrationChargeCam::Draw(const Option_t *opt)
+{
+
+  const Int_t nareas = fAverageHiGainAreas->GetEntries();
+  if (nareas == 0)
+    return;
+
+  TString option(opt);
+  option.ToLower();
+
+  if (!option.Contains("datacheck"))
+    {
+      MHCalibrationCam::Draw(opt);
+      return;
+    }
+
+  TVirtualPad *pad = gPad ? gPad : MH::MakeDefCanvas(this);  
+  pad->SetBorderMode(0);
+
+  pad->Divide(2,nareas);
+
+  for (Int_t i=0; i<nareas;i++) 
+    {
+
+      pad->cd(2*(i+1)-1);
+      GetAverageHiGainArea(i).Draw("datacheck");
+      pad->cd(2*(i+1));
+      GetAverageLoGainArea(i).Draw("datacheck");
+    }      
+}

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.h

@@ -49 +49 @@
   void   DrawPixelContent( Int_t num )  const;    
 
+  // Draw
+  void   Draw(const Option_t *opt);
+
   ClassDef(MHCalibrationChargeCam, 1)   // Histogram class for Charge Camera Calibration 
 };

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePix.cc

@@ -263 +263 @@
       pad->cd(1);
   }
-  else
+  else if (option.Contains("datacheck"))
+    {
+      MHGausEvents::Draw("events");
+      return;
+    }
+  else 
   {
       pad = oldpad;
@@ -269 +274 @@
       pad->cd(1);
   }
-
+  /*
+  else
+    {
+      option.ReplaceAll("time","");
+      pad = oldpad;
+      pad->Divide(1,2);
+      pad->cd(1);
+    }
+  */
   if (!IsEmpty())
       gPad->SetLogy();

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -442 +442 @@
         // Defects
         TCanvas &c4 = fDisplay->AddTab("Defect");
-        //        c4.Divide(3,2);
         c4.Divide(2,2);
-        
-        //        CamDraw(c4, 1, 3, disp23, 0);
-        //        CamDraw(c4, 2, 3, disp24, 0);
-        //        CamDraw(c4, 3, 3, disp25, 0);
+
         disp24.CamDraw(c4, 1, 2, 0);
         disp25.CamDraw(c4, 2, 2, 0);
@@ -1027 +1023 @@
   filltme.SetNameTab("RelTimes");
 
+  if (fDataCheck)
+    {
+      fillcam.SetDrawOption("datacheck");
+      fillbnd.SetDrawOption("datacheck");
+      fillpin.SetDrawOption("datacheck");
+      filltme.SetDrawOption("datacheck");
+    }
+
   if (fDisplayType == kFullDisplay)
     {