Changeset 9574 for trunk/MagicSoft/Mars/msimcamera/MSimRandomPhotons.cc

Timestamp:

04/21/10 16:46:18 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/msimcamera/MSimRandomPhotons.cc (modified) (1 diff)

trunk/MagicSoft/Mars/msimcamera/MSimRandomPhotons.cc

@@ -363 +363 @@
     // *fLog << 1.75e6/(600-300) * f2 * eff->GetSpline()->Integral() << " MHz" << endl;
 
-    *fLog << "Conversion factor Fnu:      " << f  << endl;
-    *fLog << "Total reflective area:      " << Form("%.2f", Ar) << " m" << UTF8::kSquare << endl;
-    *fLog << "Acceptance area of cone 0:  " << Form("%.2f", A0*1e6) << " mm" << UTF8::kSquare << " = ";
+    *fLog << "Conversion factor Fnu:         " << f  << endl;
+    *fLog << "Total reflective area:         " << Form("%.2f", Ar) << " m" << UTF8::kSquare << endl;
+    *fLog << "Acceptance area of cone 0:     " << Form("%.2f", A0*1e6) << " mm" << UTF8::kSquare << " = ";
     *fLog << A0*conv*conv << " sr" << endl;
-    *fLog << "Cones angular acceptance:   " << sr << " sr" << endl;
-    *fLog << "ConeArea*MirrorAngle (f1):  " << f1 << " m^2 sr" << endl;
-    *fLog << "MirrorArea*ConeAngle (f2):  " << f2 << " m^2 sr" << endl;
-    *fLog << "Effective. transmission:    " << Form("%.1f", nm) << " nm" << endl;
+    *fLog << "Cones angular acceptance:      " << sr << " sr" << endl;
+    *fLog << "ConeArea*ConeSolidAngle (f1):  " << f1 << " m^2 sr" << endl;
+    *fLog << "MirrorArea*ConeSkyAngle (f2):  " << f2 << " m^2 sr" << endl;
+    *fLog << "Effective. transmission:       " << Form("%.1f", nm) << " nm" << endl;
     *fLog << "NSB freq. in " << fNameGeomCam << "[0] (f1): " << Form("%.2f", rate * f1) << " MHz" << endl;
     *fLog << "NSB freq. in " << fNameGeomCam << "[0] (f2): " << Form("%.2f", rate * f2) << " MHz" << endl;
-    *fLog << "Using f1." << endl;
+    *fLog << "Using f2." << endl;
 
     // Scale the rate per mm^2 and to GHz
-    fScale = rate * f1 / (*fGeom)[0].GetA() / 1000;
+    fScale = rate * f2 / (*fGeom)[0].GetA() / 1000;
 
     // FIXME: Scale with the number of pixels
-    if (rate*f1>1000)
+    if (rate*f2>1000)
     {
         *fLog << err << "ERROR - Frequency exceeds 1GHz, this might leed to too much memory consumption." << endl;