Changeset 4553

Timestamp:

08/10/04 09:46:01 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MHCalibrationChargeBlindCam.cc (modified) (5 diffs)
• MHCalibrationChargeBlindCam.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindCam.cc

@@ -67 +67 @@
 {
 
+  fName  = name  ? name  : "MHCalibrationChargeBlindCam";
+  fTitle = title ? title : "Class to fille the blind pixel histograms";
+
   fBlindPixelsArray = new TObjArray;
   fBlindPixelsArray->SetOwner();
@@ -107 +110 @@
 // Deletes the TObjArray's and Clones them individually
 //
-TObject *MHCalibrationChargeBlindCam::Clone(const char *) const
+TObject *MHCalibrationChargeBlindCam::Clone(const char *name) const
 {
 
@@ -275 +278 @@
 // Calls the Draw of the fAverageHiGainAreas and fAverageLoGainAreas objects with options
 //
-void MHCalibrationChargeBlindCam::Draw(const Option_t *opt)
+void MHCalibrationChargeBlindCam::Draw(Option_t *opt)
 {
 
   const Int_t size = fBlindPixelsArray->GetEntries();
+
   if (size == 0)
     return;
@@ -287 +291 @@
   TVirtualPad *pad = gPad ? gPad : MH::MakeDefCanvas(this);  
   pad->SetBorderMode(0);
-  pad->Divide(size/2+1,size/2+1);
+
+  switch (size)
+    {
+    case 1: 
+      break;
+    case 2:
+      pad->Divide(2,1);
+      break;
+    case 3:
+    case 4:
+      pad->Divide(2,2);
+      break;
+    default:
+      pad->Divide(size/2+1,size/2+1);
+      break;
+    }
 
   for (Int_t i=0; i<size;i++) 
@@ -294 +313 @@
       (*this)[i].Draw(option);
     }
-}
+
+  pad->Modified();
+  pad->Update();
+
+}

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindCam.h

@@ -29 +29 @@
   MRawRunHeader              *fRunHeader;  //!  Run Header
   
-  TObjArray *fBlindPixelsArray;          //-> Array of calibration pixels, one per pixel
+  TObjArray *fBlindPixelsArray;            //-> Array of calibration pixels, one per pixel
 
 public:
@@ -42 +42 @@
 
   // Clone
-  TObject *Clone(const char *) const;
+  TObject *Clone(const char *name="") const;
   
   // Draw
-  void   Draw(const Option_t *opt);
+  void   Draw(Option_t *opt="");
   
-  const Int_t    GetSize       ()    const  { return fBlindPixelsArray->GetSize(); }
+  const Int_t GetSize() const  { return fBlindPixelsArray->GetSize(); }
   
-      MHCalibrationChargeBlindPix  &operator[]            (UInt_t i);
-  const MHCalibrationChargeBlindPix  &operator[]            (UInt_t i)  const;
+        MHCalibrationChargeBlindPix &operator[] (UInt_t i);
+  const MHCalibrationChargeBlindPix &operator[] (UInt_t i)  const;
   
-  ClassDef(MHCalibrationChargeBlindCam, 0)      // Histogram class for Blind Pixel Calibration
+  ClassDef(MHCalibrationChargeBlindCam, 1)      // Histogram class for Blind Pixel Calibration
 };