Changeset 9525 for trunk/MagicSoft/Mars/mjobs

Timestamp:

12/10/09 10:08:55 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mjobs/MJSimulation.cc

@@ -368 +368 @@
     MParSpline splinemirror("MirrorReflectivity");
     MParSpline splinecones("ConesAngularAcceptance");
+    MParSpline splinecones2("ConesTransmission");
     plist.AddToList(&splinepde);
     plist.AddToList(&splinemirror);
     plist.AddToList(&splinecones);
+    plist.AddToList(&splinecones2);
 
     const TString sin2 = "sin(MCorsikaEvtHeader.fZd)*sin(MCorsikaRunHeader.fZdMin*TMath::DegToRad())";
@@ -385 +387 @@
     MSimAbsorption absmir("SimMirrorReflectivity");
     MSimAbsorption cones("SimConesAngularAcceptance");
+    MSimAbsorption cones2("SimConesTransmission");
     absapd.SetParName("PhotonDetectionEfficiency");
     absmir.SetParName("MirrorReflectivity");
     cones.SetParName("ConesAngularAcceptance");
     cones.SetUseTheta();
-
+    cones2.SetParName("ConesTransmission");
+ 
     MSimPointingPos pointing;
 
@@ -666 +670 @@
         }
         tasks.AddToList(&cones);
+        tasks.AddToList(&cones2);
         //if (header.IsPointRun())
         //    tasks.AddToList(&fillP);
@@ -834 +839 @@
 
         TCanvas &d = fDisplay->AddTab("Info2");
-        d.Divide(2,2);
+        d.Divide(2,3);
 
         d.cd(1);
@@ -844 +849 @@
         splinepde.DrawClone()->SetBit(kCanDelete);
 
+        d.cd(3);
+        gPad->SetBorderMode(0);
+        gPad->SetFrameBorderMode(0);
+        gPad->SetGridx();
+        gPad->SetGridy();
+        gROOT->SetSelectedPad(0);
+        splinecones2.DrawClone()->SetBit(kCanDelete);
+
+        d.cd(5);
+        gPad->SetBorderMode(0);
+        gPad->SetFrameBorderMode(0);
+        gPad->SetGridx();
+        gPad->SetGridy();
+        gROOT->SetSelectedPad(0);
+        splinemirror.DrawClone()->SetBit(kCanDelete);
+
         d.cd(2);
         gPad->SetBorderMode(0);
@@ -850 +871 @@
         gPad->SetGridy();
         gROOT->SetSelectedPad(0);
-        splinemirror.DrawClone()->SetBit(kCanDelete);
-
-        d.cd(3);
-        gPad->SetBorderMode(0);
-        gPad->SetFrameBorderMode(0);
-        gPad->SetGridx();
-        gPad->SetGridy();
-        gROOT->SetSelectedPad(0);
         splinecones.DrawClone()->SetBit(kCanDelete);
-
-        d.cd(4);
+        //splinecones2.DrawClone("same")->SetBit(kCanDelete);
+
+        d.cd(6);
         gPad->SetBorderMode(0);
         gPad->SetFrameBorderMode(0);
@@ -869 +883 @@
         //all->SetTitle("Combined acceptance");
         all->SetBit(kCanDelete);
-        all->Multiply(*splinemirror.GetSpline());
+        if (splinemirror.GetSpline())
+            all->Multiply(*splinemirror.GetSpline());
+        if (splinecones2.GetSpline())
+            all->Multiply(*splinecones2.GetSpline());
     }