Changeset 19753

Timestamp:

10/10/19 19:56:28 (5 years ago)

Author:

tbretz

Message:

Allow setting SurfaceRoughness (note that this is DANGEROUS to use) and fixed some compiler warnings.

File:

• trunk/Mars/msimreflector/MFresnelLens.cc (modified) (5 diffs)

trunk/Mars/msimreflector/MFresnelLens.cc

@@ -205 +205 @@
     fGrooves.resize(num);
 
-    for (int i=0; i<num; i++)
+    for (uint32_t i=0; i<num; i++)
     {
         const double r0 = i*width;
@@ -326 +326 @@
 Int_t MFresnelLens::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
 {
+    Bool_t rc = kFALSE;
+
+    if (IsEnvDefined(env, prefix, "SurfaceRoughness", print))
+    {
+        rc = kTRUE;
+        if (!GetEnvValue(env, prefix, "SurfaceRoughness", fPSF))
+            return kERROR;
+    }
+
     const int correction  = GetEnvValue(env, prefix, "Transmission.FresnelCorrection", -1);
     const float thickness = GetEnvValue(env, prefix, "Transmission.Thickness", -1.0); // [cm]
@@ -335 +344 @@
 
     if (!correction_valid && !thickness_valid && !fname_valid)
-        return kFALSE;
+        return rc;
 
     if (correction_valid && thickness_valid && fname_valid)
-        return ReadTransmission(fname, thickness, correction) >= 0;
+        return ReadTransmission(fname, thickness, correction) >= 0 || rc;
 
     *fLog << err << "Reading transmission file required FileName, Thickness and FresnelCorrection." << endl;
@@ -1235 +1244 @@
 
     // Calculate the ordinal number of the groove correpsonding to rx
-    const int ix = TMath::FloorNint(rx/fW);
+    const uint32_t ix = TMath::FloorNint(rx/fW);
 
     // FIXME: The Z-coordinate (cone.h) is actually a line through two points!!!
@@ -1475 +1484 @@
         p.fVectorPart.SetZ(0);//fH/2); Found by try-and-error
 
-        return cnt>=fMinHits && (fMaxHits==0 || cnt<=fMaxHits) ? cnt : -1;;
+        return uint32_t(cnt)>=fMinHits && (fMaxHits==0 || uint32_t(cnt)<=fMaxHits) ? cnt : -1;;
     }
     catch (const raytrace_exception &e)