Changeset 6961

Timestamp:

04/19/05 19:50:32 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mhflux/MHCollectionArea.cc (modified) (1 diff)
• mimage/MHHillas.cc (modified) (1 diff)
• mimage/MHHillasExt.cc (modified) (1 diff)
• mimage/MHHillasSrc.cc (modified) (1 diff)
• mimage/MHImagePar.cc (modified) (1 diff)
• mimage/MHNewImagePar.cc (modified) (1 diff)
• mimage/MHVsSize.cc (modified) (2 diffs)
• mjobs/MJSpectrum.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -59 +59 @@
        EnergyEst container is missing in summary file
 
+   * mhflux/MHCollectionArea.cc:
+     - draw efficiency into third pad
 
 
@@ -163 +165 @@
    * mhflux/MHEnergyEst.[h,cc]:
      - implemented GetWeights
+
+   * mimage/MHHillas.cc, mimage/MHHillasExt.cc, mimage/MHHillasSrc.cc,
+     mimage/MHImagePar.cc, mimage/MHNewImagePar.cc, mimage/MHVsSize.cc:
+     - remove histograms from global directory if name was changed
+       in Draw
+
+   * mimage/MHVsSize.cc:
+     - exhanged the arguments of TMath::Sign
 
 

trunk/MagicSoft/Mars/mhflux/MHCollectionArea.cc

@@ -299 +299 @@
     {
         h->Divide(h2, h1);
-        h->SetMaximum(1);
+        h->SetMinimum(0);
     }
 

trunk/MagicSoft/Mars/mimage/MHHillas.cc

@@ -309 +309 @@
         fSize->SetName("SizeSame");
         fCenter->SetName("CenterSame");
+
+        fLength->SetDirectory(0);
+        fWidth->SetDirectory(0);
+        fDistC->SetDirectory(0);
+        fDelta->SetDirectory(0);
+        fSize->SetDirectory(0);
+        fCenter->SetDirectory(0);
 
         fDistC->SetLineColor(kGreen);

trunk/MagicSoft/Mars/mimage/MHHillasExt.cc

@@ -263 +263 @@
         fHM3Trans.SetName("M3tSame");
         fHMaxDist.SetName("MaxDistSame");
+
+        fHAsym.SetDirectory(0);
+        fHM3Long.SetDirectory(0);
+        fHM3Trans.SetDirectory(0);
+        fHMaxDist.SetDirectory(0);
+
         fHM3Long.SetLineColor(kMagenta);
         fHM3Trans.SetLineColor(kCyan);

trunk/MagicSoft/Mars/mimage/MHHillasSrc.cc

@@ -236 +236 @@
         fDCA  ->SetName("DCASame");
         fDCADelta->SetName("DCADeltaSame");
+
+        fAlpha->SetDirectory(0);
+        fDist ->SetDirectory(0);
+        fCosDA->SetDirectory(0);
+        fDCA  ->SetDirectory(0);
+        fDCADelta->SetDirectory(0);
+
         fAlpha->SetLineColor(kGreen);
         fDist->SetLineColor(kGreen);

trunk/MagicSoft/Mars/mimage/MHImagePar.cc

@@ -240 +240 @@
         fHistSizeSP.SetName("SizeSPSame");
 
+        fHistSatHi.SetDirectory(0);
+        fHistSatLo.SetDirectory(0);
+        fHistIslands.SetDirectory(0);
+        fHistSizeSubIslands.SetDirectory(0);
+        fHistSizeMainIsland.SetDirectory(0);
+        fHistNumSP.SetDirectory(0);
+        fHistSizeSP.SetDirectory(0);
+
         fHistSatHi.SetLineColor(kMagenta);
         fHistSatLo.SetLineColor(kCyan);

trunk/MagicSoft/Mars/mimage/MHNewImagePar.cc

@@ -318 +318 @@
         fHistConc.SetName("Conc2Same");
 
+        fHistLeakage1.SetDirectory(0);
+        fHistLeakage2.SetDirectory(0);
+        fHistUsedPix.SetDirectory(0);
+        fHistCorePix.SetDirectory(0);
+        fHistUsedArea.SetDirectory(0);
+        fHistCoreArea.SetDirectory(0);
+        fHistConc1.SetDirectory(0);
+        fHistConc.SetDirectory(0);
+
         fHistLeakage1.SetLineColor(kMagenta);
         fHistLeakage1.SetLineColor(kCyan);

trunk/MagicSoft/Mars/mimage/MHVsSize.cc

@@ -271 +271 @@
     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);
+    fM3Long.Fill(fHillas->GetSize(), scale*fHillasExt->GetM3Long()*TMath::Sign(1.0f, src->GetCosDeltaAlpha()), w);
 
     return kTRUE;
@@ -305 +305 @@
         fArea.SetName("AreaSame");
         fM3Long.SetName("M3LongSame");
+
+        fLength.SetDirectory(0);
+        fWidth.SetDirectory(0);
+        fDist.SetDirectory(0);
+        fConc1.SetDirectory(0);
+        fArea.SetDirectory(0);
+        fM3Long.SetDirectory(0);
+
         fDist.SetMarkerColor(kBlue);
         fConc1.SetMarkerColor(kBlue);

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -582 +582 @@
     MHEnergyEst      hest;
 
-    MFillH fill3(&area);
-    MFillH fill4(&hest);
+    MFillH fill3(&area, "", "FillCollectionArea");
+    MFillH fill4(&hest, "", "FillEnergyEst");
 
     MFillH fill1a("MHHillasMCPre  [MHHillas]",      "MHillas",      "FillHillasPre");