Index: trunk/MagicSoft/Mars/msim/MSimMMCS.cc =================================================================== --- trunk/MagicSoft/Mars/msim/MSimMMCS.cc (revision 9332) +++ trunk/MagicSoft/Mars/msim/MSimMMCS.cc (revision 9336) @@ -84,6 +84,6 @@ return kFALSE; - fPointingPos = (MPointingPos*)plist->FindObject("MPointingPos"); - if (!fPointingPos) + fPointingTel = (MPointingPos*)plist->FindObject("MPointingPos"); + if (!fPointingTel) { *fLog << err << "MPointingPos not found... aborting." << endl; @@ -134,6 +134,9 @@ // 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,4 +151,5 @@ 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,6 +170,6 @@ fMcEvtBasic->SetImpact(fEvtHeader->GetImpact()); - fMcEvtBasic->SetTelescopeTheta(fPointingPos->GetZdRad()); - fMcEvtBasic->SetTelescopePhi(fPointingPos->GetAzRad()); + fMcEvtBasic->SetTelescopeTheta(fPointingTel->GetZdRad()); + fMcEvtBasic->SetTelescopePhi(fPointingTel->GetAzRad()); fMcEvtBasic->SetReadyToSave(); @@ -173,6 +177,8 @@ static_cast(*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()); Index: trunk/MagicSoft/Mars/msim/MSimMMCS.h =================================================================== --- trunk/MagicSoft/Mars/msim/MSimMMCS.h (revision 9332) +++ trunk/MagicSoft/Mars/msim/MSimMMCS.h (revision 9336) @@ -18,5 +18,5 @@ MMcEvtBasic *fMcEvtBasic; MMcEvt *fMcEvt; - MPointingPos *fPointingPos; + MPointingPos *fPointingTel; //! telescope poiting position in local (telescope) coordinate system MCorsikaEvtHeader *fEvtHeader; MCorsikaRunHeader *fRunHeader; Index: trunk/MagicSoft/Mars/msim/MSimPointingPos.cc =================================================================== --- trunk/MagicSoft/Mars/msim/MSimPointingPos.cc (revision 9332) +++ trunk/MagicSoft/Mars/msim/MSimPointingPos.cc (revision 9336) @@ -41,7 +41,11 @@ // Output Containers: // MPointingPos +// PointingCorsika [MPointingPos] // ////////////////////////////////////////////////////////////////////////////// #include "MSimPointingPos.h" + +#include +#include #include "MLog.h" @@ -64,5 +68,7 @@ // MSimPointingPos::MSimPointingPos(const char* name, const char *title) - : fRunHeader(0), fEvtHeader(0), fPointing(0) + : fRunHeader(0), fEvtHeader(0), fPointingCorsika(0), fPointingLocal(0), + fOffTargetDistance(-1), fOffTargetPhi(-1) + { fName = name ? name : "MSimPointingPos"; @@ -77,6 +83,10 @@ Int_t MSimPointingPos::PreProcess(MParList *pList) { - fPointing = (MPointingPos*)pList->FindCreateObj("MPointingPos"); - if (!fPointing) + fPointingCorsika = (MPointingPos*)pList->FindCreateObj("MPointingPos", "PointingCorsika"); + if (!fPointingCorsika) + return kFALSE; + + fPointingLocal = (MPointingPos*)pList->FindCreateObj("MPointingPos"); + if (!fPointingLocal) return kFALSE; @@ -95,6 +105,30 @@ } + // FIXED offset + // Diffuse? ( FOV of camera folded with mirror diameter as Corsika input? ) + // Hour angle! + // Angle to magnetic field! + + if (IsOffTargetObservation()) + { + *fLog << inf; + *fLog << "Off target observations switched on with" << endl; + *fLog <<" a pointing distance of " << GetOffTargetDistance() << "deg "; + if (fOffTargetPhi<0) + *fLog << "randomly distributed in phi." << endl; + else + *fLog << "and phi=" << GetOffTargetPhi() << "deg." << endl; + } + return kTRUE; } + +/* +Bool_t MSimPointingPos::ReInit(MParList *pList) +{ + // FIXME: Check also the enlightened region on the ground! + return kTRUE; +} +*/ // -------------------------------------------------------------------------- @@ -102,34 +136,58 @@ Int_t MSimPointingPos::Process() { + // If a view cone is given use the fixed telescope orientation const Bool_t fixed = fRunHeader->HasViewCone(); // Local sky coordinates (direction of telescope axis) - const Double_t zd = fixed ? fRunHeader->GetZdMin() : fEvtHeader->GetZd()*TMath::RadToDeg(); // x==north - const Double_t az = fixed ? fRunHeader->GetAzMin() : fEvtHeader->GetAz()*TMath::RadToDeg(); // y==west + /*const*/ Double_t zd = fixed ? fRunHeader->GetZdMin() : fEvtHeader->GetZd()*TMath::RadToDeg(); // x==north + /*const*/ Double_t az = fixed ? fRunHeader->GetAzMin() : fEvtHeader->GetAz()*TMath::RadToDeg(); // y==west + + if (!fixed && IsOffTargetObservation()) + { + const Double_t theta = zd*TMath::DegToRad(); + const Double_t phi = az*TMath::DegToRad(); + + /*const*/ TVector3 source; + source.SetMagThetaPhi(1, theta, phi); + + /*const*/ TVector3 point; + point.SetMagThetaPhi(1, theta+fOffTargetDistance, phi); + + const Double_t delta = fOffTargetPhi>0 ? fOffTargetPhi : + gRandom->Uniform(TMath::TwoPi()); + + point.Rotate(delta, source); + + zd = point.Theta()*TMath::RadToDeg(); + az = point.Phi()*TMath::RadToDeg(); + } // Setup the pointing position - fPointing->SetLocalPosition(zd, az); + fPointingCorsika->SetLocalPosition(zd, az); + fPointingLocal->SetLocalPosition(zd, az+fRunHeader->GetMagneticFieldAz()); + + // Calculate incident angle between magnetic field direction + // and pointing direction ( phi and theta? ) return kTRUE; } -/* Int_t MSimPointingPos::ReadEnv(const TEnv &env, TString prefix, Bool_t print) { Bool_t rc = kFALSE; - if (IsEnvDefined(env, prefix, "FileName", print)) + if (IsEnvDefined(env, prefix, "OffTargetDistance", print)) { rc = kTRUE; - SetFileName(GetEnvValue(env, prefix, "FileName", fFileName)); + SetOffTargetDistance(GetEnvValue(env, prefix, "OffTargetDistance", GetOffTargetDistance())); } - if (IsEnvDefined(env, prefix, "UseTheta", print)) + if (IsEnvDefined(env, prefix, "OffTargetPhi", print)) { rc = kTRUE; - SetUseTheta(GetEnvValue(env, prefix, "UseTheta", fUseTheta)); + SetOffTargetPhi(GetEnvValue(env, prefix, "OffTargetPhi", GetOffTargetPhi())); } return rc; } -*/ + Index: trunk/MagicSoft/Mars/msim/MSimPointingPos.h =================================================================== --- trunk/MagicSoft/Mars/msim/MSimPointingPos.h (revision 9332) +++ trunk/MagicSoft/Mars/msim/MSimPointingPos.h (revision 9336) @@ -14,20 +14,33 @@ { private: - MCorsikaRunHeader *fRunHeader; //! Header storing event information - MCorsikaEvtHeader *fEvtHeader; //! Header storing event information - MPointingPos *fPointing; //! Output storing telescope poiting position + MCorsikaRunHeader *fRunHeader; //! Header storing event information + MCorsikaEvtHeader *fEvtHeader; //! Header storing event information + MPointingPos *fPointingCorsika; //! Output storing telescope poiting position in corsika coordinate system (modulo magnetig field declination) + MPointingPos *fPointingLocal; //! Output storing telescope poiting position in local (telescope) coordinate system + + Double_t fOffTargetDistance; // [rad] Distance of the observed off-target position from the source + Double_t fOffTargetPhi; // [rad] Rotation angle of the off-target position (phi==0 means south, phi=90 west) [0;2pi], phi<0 means random // MParContainer - //Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print=kFALSE); + Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print=kFALSE); // MTask - Int_t PreProcess(MParList *pList); - Int_t Process(); - + Int_t PreProcess(MParList *pList); + //Bool_t ReInit(MParList *pList); + Int_t Process(); public: MSimPointingPos(const char *name=NULL, const char *title=NULL); + // Getter + Double_t GetOffTargetDistance() const { return fOffTargetDistance*TMath::RadToDeg(); } + Double_t GetOffTargetPhi() const { return fOffTargetPhi*TMath::RadToDeg(); } + + // Setter + void SetOffTargetDistance(Double_t d=-1) { fOffTargetDistance = d*TMath::DegToRad(); } + void SetOffTargetPhi(Double_t p=-1) { fOffTargetPhi = p*TMath::DegToRad(); } + // MSimPointingPos + Bool_t IsOffTargetObservation() const { return fOffTargetDistance>0; } // TObject