Changeset 9336 for trunk/MagicSoft/Mars/msim/MSimMMCS.cc

Timestamp:

02/15/09 13:24:59 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/msim/MSimMMCS.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/msim/MSimMMCS.cc

@@ -84 +84 @@
         return kFALSE;
 
-    fPointingPos = (MPointingPos*)plist->FindObject("MPointingPos");
-    if (!fPointingPos)
+    fPointingTel = (MPointingPos*)plist->FindObject("MPointingPos");
+    if (!fPointingTel)
     {
         *fLog << err << "MPointingPos not found... aborting." << endl;
@@ -134 +134 @@
 
     //    fNumPheFromDNSB        MMcPedestalNSBAdd   // Number of phe/ns from diffuse NSB
+
+    // FIXME: Is there a way to write them as LAST entry in the file?
     mrh->SetNumSimulatedShowers(fRunHeader->GetNumEvents());
     mrh->SetImpactMax(fRunHeader->GetImpactMax());
+    mrh->SetCorsikaVersion(TMath::Nint(fRunHeader->GetProgramVersion()*100));
 
     // ----------------------------------------------------
@@ -148 +151 @@
     const UInt_t id = fRunHeader->GetParticleID();
 
+    // FIXME: Is there a way to write them as LAST entry in the file?
     rh->SetRunInfo(1, fRunHeader->GetRunNumber(), 0);
     rh->SetSourceInfo(MMcEvtBasic::GetParticleName(id));
@@ -166 +170 @@
     fMcEvtBasic->SetImpact(fEvtHeader->GetImpact());
 
-    fMcEvtBasic->SetTelescopeTheta(fPointingPos->GetZdRad());
-    fMcEvtBasic->SetTelescopePhi(fPointingPos->GetAzRad());
+    fMcEvtBasic->SetTelescopeTheta(fPointingTel->GetZdRad());
+    fMcEvtBasic->SetTelescopePhi(fPointingTel->GetAzRad());
 
     fMcEvtBasic->SetReadyToSave();
@@ -173 +177 @@
     static_cast<MMcEvtBasic&>(*fMcEvt) = *fMcEvtBasic;
 
+    // Convert from corsika franme to telescope frame, taking
+    // the magnetic field into account: tel = corsika+offset
     fMcEvt->SetTheta(fEvtHeader->GetZd());
-    fMcEvt->SetPhi(fEvtHeader->GetAz());
+    fMcEvt->SetPhi(fEvtHeader->GetAz()+fRunHeader->GetMagneticFieldAz());
 
     fMcEvt->SetEvtNumber(fEvtHeader->GetEvtNumber());