Changeset 1966 for trunk/MagicSoft/Mars/mimage

Timestamp:

04/20/03 12:51:47 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mimage

Files:

• MHNewImagePar.cc (modified) (5 diffs)
• MHNewImagePar.h (modified) (2 diffs)
• MNewImagePar.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mimage/MHNewImagePar.cc

@@ -55 +55 @@
 //
 MHNewImagePar::MHNewImagePar(const char *name, const char *title)
-    : fUseMmScale(kTRUE)
 {
     fName  = name  ? name  : "MHNewImagePar";
-    fTitle = title ? title : "Container for histograms of new image parameters";
+    fTitle = title ? title : "Histograms of new image parameters";
 
-    fLeakage1 = new TH1F("Leakage1", "Leakage1", 100, 0.0, 1.0);
+    fLeakage1 = new TH1F("Leakage1", "Leakage_{1}", 100, 0.0, 1.0);
     fLeakage1->SetDirectory(NULL);
-    fLeakage1->SetXTitle("Leakage1");
+    fLeakage1->SetXTitle("Leakage");
     fLeakage1->SetYTitle("Counts");
 
-    fLeakage2 = new TH1F("Leakage2", "Leakage2", 100, 0.0, 1.0);
+    fLeakage2 = new TH1F("Leakage2", "Leakage_{2}", 100, 0.0, 1.0);
     fLeakage2->SetDirectory(NULL);
-    fLeakage2->SetXTitle("Leakage2");
+    fLeakage2->SetXTitle("Leakage");
     fLeakage2->SetYTitle("Counts");
+    fLeakage2->SetLineColor(kBlue);
 }
 
@@ -79 +79 @@
     delete fLeakage1;
     delete fLeakage2;
-}
-
-// --------------------------------------------------------------------------
-//
-// Setup the Binning for the histograms automatically if the correct
-// instances of MBinning (with the names 'BinningAlpha' and 'BinningDist')
-// are found in the parameter list
-// Use this function if you want to set the conversion factor which
-// is used to convert the mm-scale in the camera plain into the deg-scale
-// used for histogram presentations. The conversion factor is part of
-// the camera geometry. Please create a corresponding MGeomCam container.
-//
-Bool_t MHNewImagePar::SetupFill(const MParList *plist)
-{
-    const MGeomCam *geom = (MGeomCam*)plist->FindObject("MGeomCam");
-    if (!geom)
-        *fLog << warn << dbginf << "No Camera Geometry available. Using mm-scale for histograms." << endl;
-    else
-    {
-        fMm2Deg = geom->GetConvMm2Deg();
-        SetMmScale(kFALSE);
-    }
-
-    //ApplyBinning(*plist, "Alpha",    fAlpha);
-    //ApplyBinning(*plist, "Dist",     fDist);
-    //ApplyBinning(*plist, "HeadTail", fHeadTail);
-
-    return kTRUE;
 }
 
@@ -125 +97 @@
 // --------------------------------------------------------------------------
 //
-// Use this function to setup your own conversion factor between degrees
-// and millimeters. The conversion factor should be the one calculated in
-// MGeomCam. Use this function with Caution: You could create wrong values
-// by setting up your own scale factor.
-//
-void MHNewImagePar::SetMm2Deg(Float_t mmdeg)
-{
-    if (mmdeg<=0)
-    {
-        *fLog << warn << dbginf << "Warning - Conversion factor <= 0 - nonsense. Ignored." << endl;
-        return;
-    }
-
-    if (fMm2Deg>0)
-        *fLog << warn << dbginf << "Warning - Conversion factor already set. Overwriting" << endl;
-
-    fMm2Deg = mmdeg;
-}
-
-// --------------------------------------------------------------------------
-//
-// With this function you can convert the histogram ('on the fly') between
-// degrees and millimeters.
-//
-void MHNewImagePar::SetMmScale(Bool_t mmscale)
-{
-    if (fUseMmScale == mmscale)
-        return;
-
-    if (fMm2Deg<0)
-    {
-        *fLog << warn << GetDescriptor() << ": Warning - Sorry, no conversion factor for conversion available." << endl;
-        return;
-    }
-
-    //const Double_t scale = mmscale ? 1./fMm2Deg : fMm2Deg;
-    //MH::ScaleAxis(fDist,     scale);
-    //MH::ScaleAxis(fHeadTail, scale);
-
-    if (mmscale)
-    {
-      //    fDist->SetXTitle("Dist [mm]");
-      //    fHeadTail->SetXTitle("Head-Tail [mm]");
-    }
-    else
-    {
-      //    fDist->SetXTitle("Dist [\\circ]");
-      //    fHeadTail->SetXTitle("Head-Tail [\\circ]");
-    }
-
-    fUseMmScale = mmscale;
-}
-
-// --------------------------------------------------------------------------
-//
-// Draw clones of all two histograms. So that the object can be deleted
-// and the histograms are still visible in the canvas.
-// The cloned object are deleted together with the canvas if the canvas is
-// destroyed. If you want to handle dostroying the canvas you can get a
-// pointer to it from this function
-//
-TObject *MHNewImagePar::DrawClone(Option_t *opt) const
-{
-    return MH::DrawClone(opt, 300, 600);
-}
-
-// --------------------------------------------------------------------------
-//
 // Creates a new canvas and draws the two histograms into it.
 // Be careful: The histograms belongs to this object and won't get deleted
@@ -199 +103 @@
 void MHNewImagePar::Draw(Option_t *)
 {
-    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(this, 300, 600);
+    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(this);
     pad->SetBorderMode(0);
 
     AppendPad("");
 
-    pad->Divide(1, 2);
-
-    pad->cd(1);
-    pad->SetBorderMode(0);
-    fLeakage1->Draw();
-
-    pad->cd(2);
-    pad->SetBorderMode(0);
-    fLeakage2->Draw();
+    MH::Draw(*fLeakage1, *fLeakage2, "Leakage1 and Leakage2");
 
     pad->Modified();
@@ -228 +124 @@
     return NULL;
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

trunk/MagicSoft/Mars/mimage/MHNewImagePar.h

@@ -15 +15 @@
     TH1F *fLeakage2;     //->
 
-    Float_t fMm2Deg;
-    Bool_t  fUseMmScale;
-
 public:
     MHNewImagePar(const char *name=NULL, const char *title=NULL);
     ~MHNewImagePar();
 
-    void SetMmScale(Bool_t mmscale=kTRUE);
-    void SetMm2Deg(Float_t mmdeg);
-
-    Bool_t SetupFill(const MParList *pList);
     Bool_t Fill(const MParContainer *par);
 
@@ -34 +27 @@
 
     void Draw(Option_t *opt=NULL);
-    TObject *DrawClone(Option_t *opt=NULL) const;
 
-    ClassDef(MHNewImagePar, 1) // Container which holds histograms for the new image parameters
+    ClassDef(MHNewImagePar, 1) // Histograms of new image parameters
 };
 

trunk/MagicSoft/Mars/mimage/MNewImagePar.cc

@@ -72 +72 @@
                           const MHillas *hillas)
 {
-    //fHillas = (MHillas*)hillas;
-
     const UInt_t npixevt = evt.GetNumPixels();
 
-    Double_t edgepix1 = 0.0;
-    Double_t edgepix2 = 0.0;
+    Double_t edgepix1 = 0;
+    Double_t edgepix2 = 0;
 
     for (UInt_t i=0; i<npixevt; i++)
@@ -87 +85 @@
         const MGeomPix &gpix = geom[pix.GetPixId()];
 
-        Double_t nphot = pix.GetNumPhotons();                        
+        const Double_t nphot = pix.GetNumPhotons();
 
         // count photons in outer rings of camera