Changeset 2490 for trunk/MagicSoft/Mars/mhist

Timestamp:

11/10/03 11:14:35 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MHCamEvent.cc (modified) (3 diffs)
• MHCamera.cc (modified) (2 diffs)
• MHEvent.cc (modified) (1 diff)
• MHTriggerLvl0.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mhist/MHCamEvent.cc

@@ -144 +144 @@
     *fLog << all << underline << GetDescriptor() << ": Mean=" << mean << ", Rms=" << rms << endl;
 
-    for (unsigned int i=0; i<fSum->GetNumPixels(); i++)
+    for (UInt_t i=0; i<fSum->GetNumPixels(); i++)
     {
         if (!fSum->IsUsed(i))
@@ -151 +151 @@
         if ((*fSum)[i+1]>mean+s*rms)
             *fLog << "Contents of Pixel-Index #" << i << ": " << (*fSum)[i+1] << " > " << s << "*rms" << endl;
-        // if ((*fSum)[i+1]==0)
-        //     *fLog << "Contents of Pixel-Index #" << i << ": " << (*fSum)[i+1] << " == 0" << endl;
-        // if ((*fSum)[i+1]<fSum->GetMean()-s*fSum->GetRMS())
-        //     *fLog << "Contents of Pixel-Index #" << i << ": " << (*fSum)[i+1] << " < " << s << "*rms" << endl;
     }
 }
@@ -175 +171 @@
 
     pad->cd(1);
-    gPad->SetBorderMode(0);
-    gPad->Divide(1,1);
-    gPad->cd(1);
-    gPad->SetBorderMode(0);
     fSum->Draw();
 

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -359 +359 @@
 // To draw a camera into its own pad do something like:
 //
+// MGeomCamMagic m;
+// MHCamera *d=new MHCamera(m);
+//
 // TCanvas *c = new TCanvas;
 // c->Divide(2,1);
-// MGeomCamMagic m;
-// MHCamera *d=new MHCamera(&m);
+// c->cd(1);
+//
 // d->FillRandom();
-// c->cd(1);
-// gPad->SetBorderMode(0);
-// gPad->Divide(1,1);
-// gPad->cd(1);
 // d->Draw();
 // d->SetBit(kCanDelete);
@@ -375 +374 @@
     // root 3.02:
     // gPad->SetFixedAspectRatio()
-    Int_t col = 16;
-
-    if (gPad)
-        col = gPad->GetFillColor();
-
-    TVirtualPad *pad = gPad ? gPad : MH::MakeDefCanvas("CamDisplay", "Mars Camera Display", 656, 600);
+    const Color_t col = gPad ? gPad->GetFillColor() : 16;
+    TVirtualPad  *pad = gPad ? gPad : MH::MakeDefCanvas("CamDisplay", "Mars Camera Display", 656, 600);
     pad->SetBorderMode(0);
     pad->SetFillColor(col);
 
+    //
+    // Create an own pad for the MHCamera-Object which can be
+    // resized in paint to keep the correct aspect ratio
+    //
+    pad->Divide(1, 1, 0, 0, col);
+    pad->cd(1);
+    gPad->SetBorderMode(0);
+
     AppendPad(option);
+
+    //
+    // Do not change gPad. The user should not see, that Draw
+    // changes gPad...
+    //
+    pad->cd();
 }
 

trunk/MagicSoft/Mars/mhist/MHEvent.cc

@@ -256 +256 @@
     }
 
-    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(this);
-    pad->SetBorderMode(0);
-
-    pad->Divide(1,1);
-
-    pad->cd(1);
-    gPad->SetBorderMode(0);
-    gPad->Divide(1,1);
-    gPad->cd(1);
-    gPad->SetBorderMode(0);
+    if (!gPad)
+        MakeDefCanvas(this);
     fHist->Draw();
 }

trunk/MagicSoft/Mars/mhist/MHTriggerLvl0.cc

@@ -179 +179 @@
 
     pad->cd(1);
-    gPad->SetBorderMode(0);
-    gPad->Divide(1,1);
-    gPad->cd(1);
-    gPad->SetBorderMode(0);
+    /*
+     gPad->SetBorderMode(0);
+     gPad->Divide(1,1);
+     gPad->cd(1);
+     gPad->SetBorderMode(0);
+     */
     fSum->Draw();