Changeset 9356 for trunk/MagicSoft/Mars/mjobs

Timestamp:

02/19/09 22:59:24 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJSimulation.cc (modified) (8 diffs)

trunk/MagicSoft/Mars/mjobs/MJSimulation.cc

@@ -189 +189 @@
     hist.InitName("Impact;Impact;Impact");
     hist.InitTitle("Impact;West <--> East [m];South <--> North [m]");
+    hist.SetAutoRange();
 
     hist.AddHist("MCorsikaEvtHeader.fFirstInteractionHeight/100000");
@@ -198 +199 @@
     hist.InitTitle("Sky Origin;Az [deg];Zd [deg]");
     hist.SetDrawOption("colz");
+    hist.SetAutoRange();
 
     TString sin2 = "sin(MCorsikaEvtHeader.fZd)*sin(MCorsikaRunHeader.fZdMin*TMath::DegToRad())";
@@ -346 +348 @@
     MBinning binse( 100,     1,   100000, "BinningEnergy", "log");
     MBinning binss( 100,     1, 10000000, "BinningSize",   "log");
-    MBinning binsi(  50,  -250,      250, "BinningImpact");
+    MBinning binsi( 100,  -500,      500, "BinningImpact");
     MBinning binsh( 150,     0,       50, "BinningHeight");
     MBinning binsaz(720,  -360,      360, "BinningAz");
@@ -352 +354 @@
     MBinning binsvc( 45,     0,        9, "BinningViewCone");
     MBinning binsew(150,     0,       50, "BinningEvtWidth");
+    MBinning binsd("BinningDistC");
+    MBinning binsd0("BinningDist");
     MBinning binstr("BinningTrigPos");
 
@@ -363 +367 @@
     plist.AddToList(&binsew);
     plist.AddToList(&binstr);
+    plist.AddToList(&binsd);
+    plist.AddToList(&binsd0);
 
     MHn mhn1, mhn2, mhn3;
@@ -660 +666 @@
     //-------------------------------------------
 
+    MGeomCam *cam = static_cast<MGeomCam*>(env2.GetCont());
+
     if (binstr.IsDefault())
         binstr.SetEdgesLin(150, -shape.GetPulseWidth(),
                            header.GetFreqSampling()/1000.*header.GetNumSamples()+shape.GetPulseWidth());
+
+    if (binsd.IsDefault() && cam)
+        binsd.SetEdgesLin(100, 0, cam->GetMaxRadius()*cam->GetConvMm2Deg());
+
+    if (binsd0.IsDefault() && cam)
+        binsd0.SetEdgesLin(100, 0, cam->GetMaxRadius()*cam->GetConvMm2Deg());
+
 
     header.Print();
@@ -711 +726 @@
             }
 
-            if (env2.GetCont())
+            if (cam)
             {
                 c.cd(4);
@@ -719 +734 @@
                 gPad->SetGridy();
                 gROOT->SetSelectedPad(0);
-                MHCamera *c = new MHCamera(static_cast<MGeomCam&>(*env2.GetCont()));
+                MHCamera *c = new MHCamera(*cam);
                 c->SetStats(kFALSE);
                 c->SetBit(MHCamera::kNoLegend);