Changeset 6948 for trunk/MagicSoft/Mars/mimage

Timestamp:

04/18/05 10:17:03 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mimage

Files:

• MHHillas.cc (modified) (6 diffs)
• MHHillasExt.cc (modified) (3 diffs)
• MHHillasSrc.cc (modified) (4 diffs)
• MHImagePar.cc (modified) (5 diffs)
• MHNewImagePar.cc (modified) (3 diffs)
• MHVsSize.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mimage/MHHillas.cc

@@ -303 +303 @@
     else
     {
+        fLength->SetName("LengthSame");
+        fWidth->SetName("WidthSame");
+        fDistC->SetName("DistCSame");
+        fDelta->SetName("DeltaSame");
+        fSize->SetName("SizeSame");
+        fCenter->SetName("CenterSame");
+
         fDistC->SetLineColor(kGreen);
         fSize->SetLineColor(kGreen);
         fDelta->SetLineColor(kGreen);
-
         fWidth->SetLineColor(kMagenta);
         fLength->SetLineColor(kCyan);
@@ -313 +319 @@
     pad->cd(1);
     gPad->SetBorderMode(0);
+    RemoveFromPad("WidthSame");
+    RemoveFromPad("LengthSame");
     MH::DrawSame(*fWidth, *fLength, "Width'n'Length", same);
 
     pad->cd(2);
     gPad->SetBorderMode(0);
+    RemoveFromPad("DistCSame");
     fDistC->Draw(same?"same":"");
 
@@ -323 +332 @@
     gPad->SetLogx();
     gPad->SetLogy();
+    RemoveFromPad("SizeSame");
     fSize->Draw(same?"same":"");
 
@@ -339 +349 @@
                 h->SetMarkerColor(kBlack);
             }*/
+            RemoveFromPad("CenterSame");
             fCenter->SetMarkerColor(kGreen);
             fCenter->Draw("same");
@@ -357 +368 @@
     pad->cd(5);
     gPad->SetBorderMode(0);
+    RemoveFromPad("DeltaSame");
     fDelta->Draw(same?"same":"");
 
@@ -363 +375 @@
         delete gPad;
 
-    pad->Modified();
-    pad->Update();
+    //pad->Modified();
+    //pad->Update();
 }
 

trunk/MagicSoft/Mars/mimage/MHHillasExt.cc

@@ -83 +83 @@
 
     fHAsym.SetName("Asymmetry");
-    fHM3Long.SetName("3rd Mom Long");
-    fHM3Trans.SetName("3rd Mom Trans");
-    fHMaxDist.SetName("Max Dist");
+    fHM3Long.SetName("M3l");
+    fHM3Trans.SetName("M3t");
+    fHMaxDist.SetName("MaxDist");
 
     fHAsym.SetTitle("Asymmetry");
@@ -259 +259 @@
     else
     {
+        fHAsym.SetName("AsymmetrySame");
+        fHM3Long.SetName("M3lSame");
+        fHM3Trans.SetName("M3tSame");
+        fHMaxDist.SetName("MaxDistSame");
         fHM3Long.SetLineColor(kMagenta);
         fHM3Trans.SetLineColor(kCyan);
-
         fHAsym.SetLineColor(kBlue);
         fHMaxDist.SetLineColor(kBlue);
@@ -268 +271 @@
     pad->cd(1);
     gPad->SetBorderMode(0);
+    RemoveFromPad("M3lSame");
+    RemoveFromPad("M3tSame");
     MH::DrawSame(fHM3Long, fHM3Trans, "3^{rd} Moments", same);
 
     pad->cd(3);
     gPad->SetBorderMode(0);
+    RemoveFromPad("AsymmetrySame");
     fHAsym.Draw(same?"same":"");
 
     pad->cd(2);
     gPad->SetBorderMode(0);
+    RemoveFromPad("MaxDistSame");
     fHMaxDist.Draw(same?"same":"");
 

trunk/MagicSoft/Mars/mimage/MHHillasSrc.cc

@@ -156 +156 @@
     fCosDA->Fill(h.GetCosDeltaAlpha(), w);
     fDCA  ->Fill(fUseMmScale ? h.GetDCA() : fMm2Deg*h.GetDCA(), w);
-    fDCADelta ->Fill(h.GetDCADelta(), w);
+    fDCADelta->Fill(h.GetDCADelta(), w);
 
     return kTRUE;
@@ -231 +231 @@
     else
     {
+        fAlpha->SetName("AlphaSame");
+        fDist ->SetName("DistSame");
+        fCosDA->SetName("CosDASame");
+        fDCA  ->SetName("DCASame");
+        fDCADelta->SetName("DCADeltaSame");
         fAlpha->SetLineColor(kGreen);
         fDist->SetLineColor(kGreen);
@@ -240 +245 @@
     pad->cd(1);
     gPad->SetBorderMode(0);
+    RemoveFromPad("AlphaSame");
     fAlpha->Draw(same?"same":"");
 
     pad->cd(2);
     gPad->SetBorderMode(0);
+    RemoveFromPad("DistSame");
     fDist->Draw(same?"same":"");
 
     pad->cd(3);
     gPad->SetBorderMode(0);
+    RemoveFromPad("DCASame");
     fDCA->Draw(same?"same":"");
 
@@ -258 +266 @@
     p->cd(1);
     gPad->SetBorderMode(0);
+    RemoveFromPad("CosDASame");
     fCosDA->Draw(same?"same":"");
 
     p->cd(2);
     gPad->SetBorderMode(0);
+    RemoveFromPad("DCADeltaSame");
     fDCADelta->Draw(same?"same":"");
 }

trunk/MagicSoft/Mars/mimage/MHImagePar.cc

@@ -232 +232 @@
     else
     {
+        fHistSatHi.SetName("SatHiSame");
+        fHistSatLo.SetName("SatLoSame");
+        fHistIslands.SetName("IslandsSame");
+        fHistSizeSubIslands.SetName("SizeSubSame");
+        fHistSizeMainIsland.SetName("SizeMainSame");
+        fHistNumSP.SetName("NumSPSame");
+        fHistSizeSP.SetName("SizeSPSame");
+
         fHistSatHi.SetLineColor(kMagenta);
         fHistSatLo.SetLineColor(kCyan);
-
         fHistSizeMainIsland.SetLineColor(kMagenta);
         fHistSizeSubIslands.SetLineColor(kCyan);
-
         fHistIslands.SetLineColor(kGreen);
         fHistNumSP.SetLineColor(kGreen);
@@ -245 +251 @@
     pad->cd(1);
     gPad->SetBorderMode(0);
+    RemoveFromPad("SatHiSame");
+    RemoveFromPad("SatLoSame");
     MH::DrawSame(fHistSatHi, fHistSatLo, "Saturating Pixels", same);
     fHistSatHi.SetMinimum();    // switch off to allow log-scale
@@ -252 +260 @@
     pad->cd(4);
     gPad->SetBorderMode(0);
+    RemoveFromPad("SizeSubSame");
+    RemoveFromPad("SizeMainSame");
     MH::DrawSame(fHistSizeMainIsland, fHistSizeSubIslands, "Sizes...", same);
     fHistSizeMainIsland.SetMinimum();    // switch off to allow log-scale
@@ -265 +275 @@
         pad->GetPad(2)->cd(1);
         gPad->SetBorderMode(0);
+        RemoveFromPad("NumSPSame");
         fHistNumSP.Draw(same?"same":"");
         pad->GetPad(2)->cd(2);
         gPad->SetBorderMode(0);
+        RemoveFromPad("SizeSPSame");
         fHistSizeSP.Draw(same?"same":"");
     }
@@ -273 +285 @@
     pad->cd(3);
     gPad->SetBorderMode(0);
+    RemoveFromPad("IslandsSame");
     fHistIslands.Draw(same?"same":"");
 }

trunk/MagicSoft/Mars/mimage/MHNewImagePar.cc

@@ -309 +309 @@
     else
     {
+        fHistLeakage1.SetName("Leakage1Same");
+        fHistLeakage2.SetName("Leakage2Same");
+        fHistUsedPix.SetName("UsedPixSame");
+        fHistCorePix.SetName("CorePixSame");
+        fHistUsedArea.SetName("UsedAreaSame");
+        fHistCoreArea.SetName("CoreAreaSame");
+        fHistConc1.SetName("Conc1Same");
+        fHistConc.SetName("Conc2Same");
+
         fHistLeakage1.SetLineColor(kMagenta);
         fHistLeakage1.SetLineColor(kCyan);
-
         fHistCorePix.SetLineColor(kMagenta);
         fHistUsedPix.SetLineColor(kCyan);
-
         fHistConc1.SetLineColor(kMagenta);
         fHistConc.SetLineColor(kCyan);
-
         fHistCoreArea.SetLineColor(kMagenta);
         fHistUsedArea.SetLineColor(kCyan);
@@ -326 +332 @@
     TAxis &x = *fHistLeakage1.GetXaxis();
     x.SetRangeUser(0.0, x.GetXmax());
+    RemoveFromPad("Leakage1Same");
+    RemoveFromPad("Leakage2Same");
     MH::DrawSame(fHistLeakage1, fHistLeakage2, "Leakage1 and Leakage2", same);
     fHistLeakage1.SetMinimum();
@@ -333 +341 @@
     pad->cd(2);
     gPad->SetBorderMode(0);
+    RemoveFromPad("UsedPixSame");
+    RemoveFromPad("CorePixSame");
     MH::DrawSame(fHistCorePix, fHistUsedPix, "Number of core/used Pixels", same);
 
     pad->cd(3);
     gPad->SetBorderMode(0);
+    RemoveFromPad("Conc1Same");
+    RemoveFromPad("Conc2Same");
     MH::DrawSame(fHistConc1, fHistConc, "Concentrations", same);
 
     pad->cd(4);
     gPad->SetBorderMode(0);
+    RemoveFromPad("CoreAreaSame");
+    RemoveFromPad("UsedAreaSame");
     MH::DrawSame(fHistCoreArea, fHistUsedArea, "Area of core/used Pixels", same);
 }

trunk/MagicSoft/Mars/mimage/MHVsSize.cc

@@ -269 +269 @@
     else
     {
+        fLength.SetName("LengthSame");
+        fWidth.SetName("WidthSame");
+        fDist.SetName("DistSame");
+        fConc1.SetName("Conc1Same");
         fDist.SetMarkerColor(kBlue);
         fConc1.SetMarkerColor(kBlue);
@@ -278 +282 @@
     gPad->SetBorderMode(0);
     gPad->SetLogx();
+    RemoveFromPad("LengthSame");
     fLength.Draw(same?"same":"");
 
@@ -283 +288 @@
     gPad->SetBorderMode(0);
     gPad->SetLogx();
+    RemoveFromPad("WidthSame");
     fWidth.Draw(same?"same":"");
 
@@ -288 +294 @@
     gPad->SetBorderMode(0);
     gPad->SetLogx();
+    RemoveFromPad("DistSame");
     fDist.Draw(same?"same":"");
 
@@ -294 +301 @@
     gPad->SetLogx();
     gPad->SetLogy();
+    RemoveFromPad("Conc1Same");
     fConc1.Draw(same?"same":"");
 }