Changeset 19916 for trunk/Mars

Timestamp:

12/17/19 17:19:01 (5 years ago)

Author:

tbretz

Message:

Added cone transmission and updated efficiencies.

File:

• trunk/Mars/hawc/fresnellens_image.C (modified) (5 diffs)

trunk/Mars/hawc/fresnellens_image.C

@@ -6 +6 @@
  Mars/build where you have built your Mars environment) you have to do
 
-    root ../hawc/fresnellens_image.C
+    root hawc/fresnellens_image.C
 
  or from within root
 
-    [0] .x ../hawc/fresnellens_image.C
+    [0] .x hawc/fresnellens_image.C
 
 ******************************************************************/
@@ -39 +39 @@
 
     MParSpline pde("PhotonDetectionEfficiency");
-    MParSpline acc("ConesAngularAcceptance");
+    MParSpline con("ConeTransmission");
+    MParSpline acc("ConeAngularAcceptance");
 
-    pde.ReadFile("resmc/hawcseye/pde.txt");
-    acc.ReadFile("resmc/hawcseye/cones-angular-acceptance.txt");
+    pde.ReadFile("resmc/hawcseye/pde_SensL.txt");
+    con.ReadFile("resmc/hawcseye/transmittance_cone.txt");
+    acc.ReadFile("resmc/hawcseye/angular_acceptance_cone.txt");
 
     MGeomCamFAMOUS geom(F);
@@ -71 +73 @@
     plist.AddToList(&geom);
     plist.AddToList(&pde);
+    plist.AddToList(&con);
     plist.AddToList(&acc);
 
@@ -102 +105 @@
 
     MSimAbsorption absapd("SimPhotonDetectionEfficiency");
+    MSimAbsorption abscon("SimConeTransmission");
     MSimAbsorption cones("SimConesAngularAcceptance");
     absapd.SetParName("PhotonDetectionEfficiency");
-    cones.SetParName("ConesAngularAcceptance");
+    abscon.SetParName("ConeTransmission");
+    cones.SetParName("ConeAngularAcceptance");
     cones.SetUseTheta();
     cones.SetForce();
+    abscon.SetForce();
     absapd.SetForce();
     // We loose another 4% at the cone surface!
@@ -124 +130 @@
     tlist.AddToList(&fillC);
     tlist.AddToList(&cones);
+    tlist.AddToList(&abscon);
     tlist.AddToList(&fillS);