Changeset 19542

Timestamp:

06/04/19 10:25:32 (5 years ago)

Author:

tbretz

Message:

Allow to turn some checks off for testing purposes (only\!), replaces MReflector by the new base class MOptics

Location:

trunk/Mars/msimcamera

Files:

• MSimRandomPhotons.cc (modified) (7 diffs)
• MSimRandomPhotons.h (modified) (1 diff)

trunk/Mars/msimcamera/MSimRandomPhotons.cc

@@ -131 +131 @@
 #include "MSpline3.h"
 #include "MParSpline.h"
-#include "MReflector.h"
+#include "MOptics.h"
 
 ClassImp(MSimRandomPhotons);
@@ -144 +144 @@
     : fGeom(0), fEvt(0), fStat(0), /*fEvtHeader(0),*/ fRunHeader(0),
     fRates(0), fSimulateWavelength(kFALSE), fNameGeomCam("MGeomCam"),
-    fFileNameNSB("resmc/night-sky-la-palma.txt")
+    fFileNameNSB("resmc/night-sky-la-palma.txt"), fForce(kFALSE)
 {
     fName  = name  ? name  : "MSimRandomPhotons";
@@ -202 +202 @@
     }
 
-    MReflector *r = (MReflector*)pList->FindObject("Reflector", "MReflector");
+    MOptics *r = (MOptics*)pList->FindObject("Reflector", "MOptics");
     if (!r)
     {
-        *fLog << err << "Reflector [MReflector] not found... aborting." << endl;
+        *fLog << err << "Reflector [MOptics] not found... aborting." << endl;
         return kFALSE;
     }
@@ -349 +349 @@
     if (eff.GetSpline()->Eval(wmin)>1e-5)
     {
-        *fLog << err << "ERROR - Total transmission efficiency at ";
+        *fLog << (fForce?warn:err) << "ERROR - Total transmission efficiency at ";
         *fLog << wmin << "nm is not zero... abort." << endl;
         *fLog << "        PhotonDetectionEfficency: " << s1->GetSpline()->Eval(wmin) << endl;
@@ -355 +355 @@
         *fLog << "        MirrorReflectivity:       " << s3->GetSpline()->Eval(wmin) << endl;
         *fLog << "        TotalEfficiency:          " << eff.GetSpline()->Eval(wmin) << endl;
-        return kFALSE;
+        if (!fForce)
+            return kFALSE;
     }
     if (eff.GetSpline()->Eval(wmax)>1e-5)
     {
-        *fLog << err << "ERROR - Total transmission efficiency at ";
+        *fLog << (fForce?warn:err) << "ERROR - Total transmission efficiency at ";
         *fLog << wmax << "nm is not zero... abort." << endl;
         *fLog << "        PhotonDetectionEfficency: " << s1->GetSpline()->Eval(wmax) << endl;
@@ -365 +366 @@
         *fLog << "        MirrorReflectivity:       " << s3->GetSpline()->Eval(wmax) << endl;
         *fLog << "        TotalEfficiency:          " << eff.GetSpline()->Eval(wmax) << endl;
-        return kFALSE;
+        if (!fForce)
+            return kFALSE;
     }
 
@@ -526 +528 @@
 {
     Bool_t rc = kFALSE;
+    if (IsEnvDefined(env, prefix, "Force", print))
+    {
+        rc = kTRUE;
+        fForce = GetEnvValue(env, prefix, "Force", fForce);
+    }
+
     if (IsEnvDefined(env, prefix, "FrequencyFixed", print))
     {

trunk/Mars/msimcamera/MSimRandomPhotons.h

@@ -35 +35 @@
     TString fFileNameNSB;
 
+    Bool_t fForce;
+
     // MTask
     Int_t  PreProcess(MParList *pList);