Changeset 18549 for trunk

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.

Location:

trunk/Mars/msim

Files:

• MPhotonData.cc (modified) (3 diffs)
• MPhotonData.h (modified) (3 diffs)
• MPhotonEvent.cc (modified) (1 diff)

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;

trunk/Mars/msim/MPhotonData.h

@@ -37 +37 @@
 
     Float_t fTime;                       // [ns] Time since first interaction or entrance into atmosphere
-    UShort_t fWavelength;                // [nm] Wavelength
+    Short_t fWavelength;                 // [nm] Wavelength
 //    UInt_t   fNumPhotons;                // Number of cherenkov photons ins bunch
     Float_t  fProductionHeight;          // [cm] Height of bunch production
@@ -78 +78 @@
 
     // Getter Others
-    UShort_t GetWavelength() const { return fWavelength; }
+    UShort_t GetWavelength() const { return TMath::Abs(fWavelength); }
     Float_t GetProductionHeight() const { return fProductionHeight; }
     MMcEvtBasic::ParticleId_t GetPrimary() const { return fPrimary; }
+
+    // Status of the simulation of photons
+    Bool_t IncludesEfficiencies() const { return fWavelength<0; }
 
     //virtual Float_t GetWeight() const { return 1; }
@@ -97 +100 @@
 
     void SetPrimary(MMcEvtBasic::ParticleId_t p) { fPrimary=p; }
-    void SetWavelength(UShort_t wl) { fWavelength=wl; }
+    void SetWavelength(Short_t wl) { fWavelength=wl; }
 
     void AddTime(Double_t dt) { fTime += dt; }

trunk/Mars/msim/MPhotonEvent.cc

@@ -550 +550 @@
 {
     const UInt_t n = GetNumPhotons();
+    if (n==0)
+        return;
+
+    // Corsika has already produced and written the wavelength
+    if (operator[](0).GetWavelength()>0)
+        return;
 
     for (UInt_t i=0; i<n; i++)