Changeset 8988 for trunk/MagicSoft/Mars/mhcalib

Timestamp:

06/30/08 10:37:00 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhcalib

Files:

• HCalibLinkDef.h (modified) (1 diff)
• MHCalibrationCam.cc (modified) (1 diff)
• MHCalibrationChargeCam.cc (modified) (4 diffs)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mhcalib/HCalibLinkDef.h

@@ -13 +13 @@
 #pragma link C++ class MHCalibrationChargePINDiode+;
 #pragma link C++ class MHCalibrationRelTimeCam+;
-#pragma link C++ class MHCalibrationTestCam+;
-#pragma link C++ class MHCalibrationTestTimeCam+;
+//#pragma link C++ class MHCalibrationTestCam+;
+//#pragma link C++ class MHCalibrationTestTimeCam+;
 #pragma link C++ class MHCalibrationPulseTimeCam+;
 //#pragma link C++ class MHCalibrationHiLoCam+;

trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc

@@ -1472 +1472 @@
 //
 void MHCalibrationCam::DrawAverageSigma(Bool_t sat, Bool_t inner,
-                                              Float_t sigma, Float_t sigmavar,
-                                              Float_t relsigma, Float_t relsigmavar) const 
-{
-  
-  if (sigma != 0 && sigmavar >= 0 && relsigmavar >= 0.)
-    {
-      
-      TPad *newpad = new TPad("newpad","transparent",0,0,1,1);
-      newpad->SetFillStyle(4000);
-      newpad->Draw();
-      newpad->cd();
-      
+                                        Float_t sigma, Float_t sigmavar,
+                                        Float_t relsigma, Float_t relsigmavar) const
+{
+  
+    if (sigma==0 || sigmavar<0 || relsigmavar<0)
+        return;
+
       TPaveText *text = new TPaveText(sat? 0.1 : 0.35,0.7,sat ? 0.4 : 0.7,1.0);
       text->SetTextSize(0.05);
-      const TString line1 = Form("%s%s%s",inner ? "Outer" : "Inner",
-                                 " Pixels ", sat ? "Low Gain" : "High Gain");
-      TText *txt1 = text->AddText(line1.Data());
-      const TString line2 = Form("#sigma per pix: %2.2f #pm %2.2f",sigma,TMath::Sqrt(sigmavar));
-      TText *txt2 = text->AddText(line2.Data());
-      const TString line3 = Form("Rel. #sigma per pix: %2.2f #pm %2.2f",relsigma,TMath::Sqrt(relsigmavar));
-      TText *txt3 = text->AddText(line3.Data());
+      text->SetBit(kCanDelete);
       text->Draw("");
-      
-      text->SetBit(kCanDelete);
-      txt1->SetBit(kCanDelete);
-      txt2->SetBit(kCanDelete);
-      txt3->SetBit(kCanDelete);
-      newpad->SetBit(kCanDelete);
-    }
+
+      const TString line1 = Form("%s Pixels %s Gain",
+                                 inner?"Outer" : "Inner", sat?"Low":"High");
+      const TString line2 = Form("#sigma per pix: %2.2f #pm %2.2f", sigma, TMath::Sqrt(sigmavar));
+      const TString line3 = Form("Rel. #sigma per pix: %2.2f #pm %2.2f", relsigma, TMath::Sqrt(relsigmavar));
+
+      text->AddText(line1.Data());
+      text->AddText(line2.Data());
+      text->AddText(line3.Data());
 }
 

trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.61 2008-06-14 15:55:53 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.62 2008-06-30 09:36:36 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -1286 +1286 @@
             break;
         case MCalibrationCam::kUV:
-            fit->SetLineColor(106);
+            fit->SetLineColor(51);
             break;
         case MCalibrationCam::kCT1:
-            fit->SetLineColor(006);
+            fit->SetLineColor(6);
             break;
         default:
@@ -1337 +1337 @@
 {
     TLine *line = new TLine(refline, 0, refline, hist->GetMaximum());
-    line->SetLineColor(106);
+    line->SetLineColor(51);
     line->SetLineStyle(2);
     line->SetLineWidth(3);
@@ -1343 +1343 @@
     line->Draw();
 
-    TLegend *leg = new TLegend(0.8,0.01,0.99,0.45);
+    TLegend *leg = new TLegend(0.8,0.01,0.99,0.15);
     leg->AddEntry(line, "10 Leds UV", "l");
     leg->SetBit(kCanDelete);

trunk/MagicSoft/Mars/mhcalib/Makefile

@@ -40 +40 @@
            MHCalibrationChargePINDiode.cc \
            MHCalibrationRelTimeCam.cc \
-           MHCalibrationTestCam.cc \
            MHCalibrationPulseTimeCam.cc \
-           MHCalibrationTestTimeCam.cc \
            MHGausEvents.cc