Changeset 6956

Timestamp:

04/19/05 13:53:46 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mimage/MHVsSize.cc (modified) (18 diffs)
• mimage/MHVsSize.h (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -26 +26 @@
    * mjobs/MJCut.cc:
      - fixed a problem when not enabling "--res"
+
+   * mimage/MHVsSize.[h,cc]:
+     - added more displayed variables
 
 

trunk/MagicSoft/Mars/mimage/MHVsSize.cc

@@ -45 +45 @@
 #include "MHillas.h"
 #include "MHillasSrc.h"
+#include "MHillasExt.h"
 #include "MNewImagePar.h"
 #include "MGeomCam.h"
@@ -58 +59 @@
 //
 MHVsSize::MHVsSize(const char *name, const char *title)
-    : fHillas(NULL), fNewImagePar(NULL), fMm2Deg(1), fUseMmScale(kTRUE)
+    : fHillas(NULL), fHillasExt(NULL), fNewImagePar(NULL), fMm2Deg(1), fUseMmScale(kTRUE)
 {
     //
@@ -70 +71 @@
     fDist.SetNameTitle(  "Dist",   "Dist vs. Size");
     fConc1.SetNameTitle( "Conc1",  "Conc1 vs. Size");
+    fArea.SetNameTitle(  "Area",   "Area vs. Size");
+    fM3Long.SetNameTitle("M3Long", "M3Long vs. Size");
 
     fLength.SetDirectory(NULL);
@@ -75 +78 @@
     fDist.SetDirectory(NULL);
     fConc1.SetDirectory(NULL);
+    fArea.SetDirectory(NULL);
+    fM3Long.SetDirectory(NULL);
 
     fLength.SetXTitle("Size [phe]");
@@ -80 +85 @@
     fDist.SetXTitle("Size [phe]");
     fConc1.SetXTitle("Size [phe]");
+    fArea.SetXTitle("Size [phe]");
+    fM3Long.SetXTitle("Size [phe]");
 
     fLength.SetYTitle("Length [mm]");
@@ -85 +92 @@
     fDist.SetYTitle("Distance [mm]");
     fConc1.SetYTitle("Conc1 [ratio]");
-
-    MBinning binse, binsl, binsd, binsc;
-    binse.SetEdgesLog(50, 10, 1e5);
-    binsl.SetEdges(100,  0, 296.7/2);
-    binsd.SetEdges(100,  0, 445);
-    binsc.SetEdgesLog(100,  1e-5, 5e-3);
+    fArea.SetYTitle("Conc1 [mm^{2}]");
+    fM3Long.SetYTitle("M3Long [mm]");
+
+    MBinning binse, binsl, binsd, binsc, binsa, binsm;
+    binse.SetEdgesLog( 50,   10, 1e5);
+    binsl.SetEdges(   100,    0, 296.7/2);
+    binsd.SetEdges(   100,    0, 600);
+    binsc.SetEdgesLog(100, 1e-5, 5e-3);
+    binsa.SetEdges(   100,    0, 445*45);
+    binsm.SetEdges(   100, -445, 445);
 
     MH::SetBinning(&fLength, &binse, &binsl);
@@ -96 +107 @@
     MH::SetBinning(&fDist,   &binse, &binsd);
     MH::SetBinning(&fConc1,  &binse, &binsc);
+    MH::SetBinning(&fArea,   &binse, &binsa);
+    MH::SetBinning(&fM3Long, &binse, &binsm);
 
     fLength.UseCurrentStyle();
@@ -101 +114 @@
     fDist.UseCurrentStyle();
     fConc1.UseCurrentStyle();
+    fArea.UseCurrentStyle();
+    fM3Long.UseCurrentStyle();
 }
 
@@ -131 +146 @@
     }
 
+    fHillasExt = (MHillasExt*)plist->FindObject("MHillasExt");
+    if (!fHillasExt)
+    {
+        *fLog << err << "MHillasExt not found... abort." << endl;
+        return kFALSE;
+    }
+
     fNewImagePar = (MNewImagePar*)plist->FindObject("MNewImagePar");
     if (!fNewImagePar)
@@ -205 +227 @@
     MH::ScaleAxis(&fWidth,  1, scale);
     MH::ScaleAxis(&fDist,   1, scale);
+    MH::ScaleAxis(&fM3Long, 1, scale);
+    MH::ScaleAxis(&fArea,   1, scale*scale);
 
     if (mmscale)
@@ -211 +235 @@
         fWidth.SetYTitle("Width [mm]");
         fDist.SetYTitle("Distance [mm]");
+        fArea.SetYTitle("Area [mm^{2}]");
+        fM3Long.SetYTitle("M3Long [mm]");
     }
     else
@@ -217 +243 @@
         fWidth.SetYTitle("Width [\\circ]");
         fDist.SetYTitle("Distance [\\circ]");
+        fArea.SetYTitle("Area [\\circ^{2}]");
+        fM3Long.SetYTitle("M3Long [\\circ]");
     }
 
@@ -232 +260 @@
     if (!src)
     {
-        *fLog << err << "MHVsSize::Fill: Pointer (!=NULL) expected." << endl;
+        *fLog << err << "MHVsSize::Fill: Wrong argument... abort." << endl;
         return kFALSE;
     }
@@ -242 +270 @@
     fDist.Fill(  fHillas->GetSize(), scale*src->GetDist(),           w);
     fConc1.Fill( fHillas->GetSize(), scale*fNewImagePar->GetConc1(), w);
+    fArea.Fill(  fHillas->GetSize(), scale*scale*fHillas->GetArea(), w);
+    fM3Long.Fill(fHillas->GetSize(), scale*fHillasExt->GetM3Long()*TMath::Sign(src->GetCosDeltaAlpha(),1.0f), w);
 
     return kTRUE;
@@ -266 +296 @@
 
     if (!same)
-        pad->Divide(2,2);
+        pad->Divide(3,2);
     else
     {
@@ -273 +303 @@
         fDist.SetName("DistSame");
         fConc1.SetName("Conc1Same");
+        fArea.SetName("AreaSame");
+        fM3Long.SetName("M3LongSame");
         fDist.SetMarkerColor(kBlue);
         fConc1.SetMarkerColor(kBlue);
         fWidth.SetMarkerColor(kBlue);
         fLength.SetMarkerColor(kBlue);
+        fArea.SetMarkerColor(kBlue);
+        fM3Long.SetMarkerColor(kBlue);
     }
 
@@ -298 +332 @@
 
     pad->cd(4);
+    gPad->SetBorderMode(0);
+    gPad->SetLogx();
+    RemoveFromPad("AreaSame");
+    fArea.Draw(same?"same":"");
+
+    pad->cd(5);
+    gPad->SetBorderMode(0);
+    gPad->SetLogx();
+    RemoveFromPad("M3LongSame");
+    fM3Long.Draw(same?"same":"");
+
+    pad->cd(6);
     gPad->SetBorderMode(0);
     gPad->SetLogx();
@@ -304 +350 @@
     fConc1.Draw(same?"same":"");
 }
-
-void MHVsSize::Paint(Option_t *opt)
-{
-    //SetColors();
-    //MH::Paint();
-}

trunk/MagicSoft/Mars/mimage/MHVsSize.h

@@ -11 +11 @@
 
 class MHillas;
+class MHillasExt;
 class MNewImagePar;
 
@@ -16 +17 @@
 {
 private:
-    MHillas      *fHillas;  //!
+    MHillas      *fHillas;      //!
+    MHillasExt   *fHillasExt;   //!
     MNewImagePar *fNewImagePar; //!
 
@@ -25 +27 @@
     TH2F fConc1;   // Angle between Length axis and x-axis
 
+    TH2F fM3Long;  // 
+    TH2F fArea;    // 
+
     Float_t fMm2Deg;
     Bool_t  fUseMmScale;
-
-    void Paint(Option_t *opt="");
 
 public: