Changeset 9595 for trunk/MagicSoft/include-Classes/MMcFormat

Timestamp:

06/24/10 15:05:04 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/include-Classes/MMcFormat

Files:

• MMcCorsikaRunHeader.h (modified) (2 diffs)
• MMcEvt.hxx (modified) (4 diffs)
• MMcEvtBasic.h (modified) (4 diffs)

trunk/MagicSoft/include-Classes/MMcFormat/MMcCorsikaRunHeader.h

@@ -101 +101 @@
     Float_t GetViewconeAngleOuter() const { return fViewconeAngles[1]; }
     Float_t GetAtmosphericModel() const { return fAtmosphericModel; }
+    Bool_t HasViewCone() const { return fViewconeAngles[1]>0; }
 
     Int_t GetNumCT() const { return fNumCT; }
@@ -113 +114 @@
         fSlopeSpec=slope; fELowLim=emin; fEUppLim=emax;
     }
+    void SetViewCone(Float_t inner, Float_t outer)
+    {
+        fViewconeAngles[0] = inner;
+        fViewconeAngles[1] = outer;
+    }
+
 
     MGeomCorsikaCT &operator[](Int_t i) const;

trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.hxx

@@ -14 +14 @@
     Float_t fFirstTarget;        // []
     Float_t fZFirstInteraction;  // [cm]
-
-    Float_t fTheta;              // [rad] Theta angle of event
-    Float_t fPhi;                // [rad] Phi angle of event (see class description)
 
     Float_t fCoreD;              // [cm] Core d pos
@@ -72 +69 @@
     // Getter
     UInt_t  GetEvtNumber() const { return fEvtNumber; }  //Get Event Number
-    Float_t GetTheta() const { return fTheta; }          //Get Theta angle
-    Float_t GetPhi() const { return fPhi ;  }            //Get Phi angle
 
     Float_t GetCoreX() const { return fCoreX; }          //Get Core x pos
@@ -103 +98 @@
 
     // Setter
-    void SetTheta(Float_t Theta) { fTheta=Theta; }                //Set Theta angle
-    void SetPhi(Float_t Phi)     { fPhi=Phi;  }                   //Set Phi angle
     void SetCoreD(Float_t CoreD) { fCoreD=CoreD; }                //Set Core d pos
     void SetCoreX(Float_t CoreX) { fCoreX=CoreX; }                //Set Core x pos
@@ -123 +116 @@
     void Clear(Option_t *opt=NULL);
 
-    ClassDef(MMcEvt, 6)  //Stores Montecarlo Information of one event (eg. the energy)
+    ClassDef(MMcEvt, 7)  //Stores Montecarlo Information of one event (eg. the energy)
 };
 

trunk/MagicSoft/include-Classes/MMcFormat/MMcEvtBasic.h

@@ -36 +36 @@
   Float_t      fTelescopePhi;    // [rad]
   Float_t      fTelescopeTheta;  // [rad]
-  
+
+  Float_t      fTheta;           // [rad] Theta angle of event
+  Float_t      fPhi;             // [rad] Phi angle of event (see class description)
+
 public:
   MMcEvtBasic();
@@ -50 +53 @@
   Float_t GetTelescopePhi() const { return fTelescopePhi; }
   Float_t GetTelescopeTheta() const { return fTelescopeTheta; }
+
+  Float_t GetParticlePhi() const { return fPhi; }
+  Float_t GetParticleTheta() const { return fTheta; }
+
+  //Float_t GetTheta() const { return fTheta; }
+  //Float_t GetPhi() const { return fPhi ;  }
 
   static TString GetParticleName(Int_t id);
@@ -78 +87 @@
   void SetTelescopePhi  (Float_t Phi)   { fTelescopePhi=Phi; }
 
+  void SetParticleTheta(Float_t Theta)  { fTheta=Theta; }
+  void SetParticlePhi  (Float_t Phi)    { fPhi=Phi; }
+
+  //void SetTheta(Float_t Theta) { fTheta=Theta; }                //Set Theta angle
+  //void SetPhi(Float_t Phi)     { fPhi=Phi;  }                   //Set Phi angle
+
   void Fill(ParticleId_t, Float_t, Float_t, Float_t, Float_t);
 
@@ -84 +99 @@
   void Print(Option_t *opt=NULL) const;
 
-  ClassDef(MMcEvtBasic, 2) //Stores Basic Montecarlo Information of one event
+  ClassDef(MMcEvtBasic, 3) //Stores Basic Montecarlo Information of one event
 
 };