Changeset 18549 for trunk/Mars/msim/MPhotonData.cc

Timestamp:

08/26/16 13:03:45 (8 years ago)

Author:

tbretz

Message:

The wavelength is now kept as a negative value so that it can be checked on the photon level if CEFFIC was turned on. It is however returned without sign for convenience. The loop to simulate the wavelength is only executed if the first photon has a zero wavelength -- it is assumed they are all consistent.

File:

• trunk/Mars/msim/MPhotonData.cc (modified) (3 diffs)

trunk/Mars/msim/MPhotonData.cc

@@ -177 +177 @@
 void MPhotonData::SimWavelength(Float_t wmin, Float_t wmax)
 {
-    if (fWavelength>0)
-        return;
-
     const Double_t w = gRandom->Uniform(wmin, wmax);
 
@@ -288 +285 @@
     fTime             =  f[4]/10.;              // a relative arival time [ns]
     fProductionHeight =  pow(10, f[5]/1000.);   // altitude of emission a.s.l. [cm]
-    fWavelength       =  TMath::Abs(f[7]);      // wavelength [nm]: 0 undetermined, <0 already in p.e.
+    fWavelength       =  f[7];                  // wavelength [nm]: 0 undetermined, <0 already in p.e.
 
     // Now reset all data members which are not in the stream
@@ -370 +367 @@
 //    gLog << "Num Photons:      " << fNumPhotons << " from " << MMcEvtBasic::GetParticleName(fPrimary) << endl;
     gLog << "Origin:           " << MMcEvtBasic::GetParticleName(fPrimary) << endl;
-    gLog << "Wavelength:       " << dec << fWavelength << "nm" << endl;
+    gLog << "Wavelength:       " << fWavelength << "nm" << endl;
     gLog << "Pos X/Y  Cos U/V: " << fPosX << "/" << fPosY << "   " << fCosU << "/" << fCosV << endl;
     gLog << "Time/Prod.Height: " << fTime << "ns/" << fProductionHeight/100 << "m" << endl;