Changeset 5340 for trunk

Timestamp:

11/04/04 21:52:46 (20 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft

Files:

• Mars/Changelog (modified) (1 diff)
• Mars/mfileio/MReadMarsFile.cc (modified) (1 diff)
• Mars/mmontecarlo/MMcCollectionAreaCalc.cc (modified) (2 diffs)
• Mars/mmontecarlo/MMcCollectionAreaCalc.h (modified) (1 diff)
• include-Classes/MMcFormat/MMcRunHeader.cxx (modified) (4 diffs)
• include-Classes/MMcFormat/MMcRunHeader.hxx (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -25 +25 @@
      - Added member fMirrorFraction to keep the active fraction of the
        mirror dish set in the camera simulation. Added Getter & Setter.
+       Added some comments. Update class version to 4.
+
+   * mmc/MMcRunHeader.[hxx,cxx]
+     - Removed member fTelesTheta, fTelesPhi. They make no sense since
+       telescope orientation can change from event to event in MC too.
+       Added getter and setter for fShowerThetaMin and fShowerThetaMax.
+
+   * mmontecarlo/MMcCollectionAreaCalc.[h,cc]
+     - Changed consistency check on MMcRunHeader.fTelesTheta to check
+       on fShowerThetaMin and fShowerThetaMax
+
+   * mfileio/MReadMarsFile.cc
+     - Removed obsolete check of old MC files, which needed the removed
+       data member MMcRunHeader.fTelesTheta.
 
  2004/11/04: Nepomuk Otte

trunk/MagicSoft/Mars/mfileio/MReadMarsFile.cc

@@ -208 +208 @@
     if (mcheader)
     {
-        if (mcheader->GetReflVersion()<=40 && mcheader->GetTelesTheta()>15)
-        {
-            *fLog << warn << "Warning - You may use Monte Carlo data produced with a version" << endl;
-            *fLog << "of the reflector program < 0.4 and a zenith angle > 15," << endl;
-            *fLog << "in this case you may get less photons than you would expect." << endl;
-        }
         if (mcheader->GetCamVersion()==50)
         {

trunk/MagicSoft/Mars/mmontecarlo/MMcCollectionAreaCalc.cc

@@ -67 +67 @@
     fAllEvtsTriggered         =  kFALSE;
     fTotalNumSimulatedShowers =  0;
-    fTheta                    = -1.;
+    fThetaMin                 = -1.;
+    fThetaMax                 = -1.;
 
 } 
@@ -100 +101 @@
 
 
-    if (fTheta>=0 && fTheta!=runheader->GetTelesTheta())
-    {
-        *fLog << warn << "Warning - Read files have different TelesTheta (";
-        *fLog << fTheta << ", " << runheader->GetTelesTheta() << ")..." << endl;
-    }
-    fTheta = runheader->GetTelesTheta();
+    if ( (fThetaMin >= 0 && fThetaMin != runheader->GetShowerThetaMin()) ||
+         (fThetaMax >= 0 && fThetaMax != runheader->GetShowerThetaMax()) )
+    {
+        *fLog << warn << "Warning - Read files have different Theta ranges (";
+        *fLog << "(" << fThetaMin << ", " << fThetaMax << ")   vs   (" << 
+          runheader->GetShowerThetaMin() << ", " << 
+          runheader->GetShowerThetaMax() << ")..." << endl;
+    }
+    fThetaMin = runheader->GetShowerThetaMin();
+    fThetaMax = runheader->GetShowerThetaMax();
 
 

trunk/MagicSoft/Mars/mmontecarlo/MMcCollectionAreaCalc.h

@@ -26 +26 @@
     UInt_t fCorsikaVersion;
     Bool_t fAllEvtsTriggered;
-    Float_t fTheta;
+    Float_t fThetaMin;
+    Float_t fThetaMax;
 
     Bool_t ReInit(MParList *plist);

trunk/MagicSoft/include-Classes/MMcFormat/MMcRunHeader.cxx

@@ -60 +60 @@
 // is the azimuth of the momentum vector of particles, and is measured
 // from the north direction, anticlockwise (i.e, west is phi=90 degrees).
-// When it refers to the telescope orientation, it is the azimuth of a 
-// vector along the telescope axis, going from the camera to the mirror. 
-// So, fTelesTheta=90, fTelesPhi = 0 means the telescope is pointing 
-// horizontally towards South. For an explanation, see also TDAS 02-11. 
 //
 ////////////////////////////////////////////////////////////////////////////
@@ -113 +109 @@
 
     fNumPheFromDNSB = 0.0;
-    fTelesTheta = 0.0;
-    fTelesPhi = 0.0;
     fShowerThetaMax = 0.0;
     fShowerThetaMin = 0.0;
@@ -171 +165 @@
                         const Int_t    sfDeS,
                         const Float_t  numdnsb,
-                        const Float_t  telestheta,
-                        const Float_t  telesphi,
                         const Float_t  shthetamax,
                         const Float_t  shthetamin,
@@ -213 +205 @@
 
     fNumPheFromDNSB = numdnsb;
-    fTelesTheta = telestheta;
-    fTelesPhi = telesphi;
     fShowerThetaMax = shthetamax;
     fShowerThetaMin = shthetamin;

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

@@ -6 +6 @@
 //                                                                   //
 // Version 5: removed members fSourceOffsetTheta, fSourceOffsetPhi   //
+//            (were no longer used)                                  //
+//                                                                   //
+// Version 6: removed members fTelesTheta, fTelesPhi                 //
 //            (were no longer used)                                  //
 //                                                                   //
@@ -48 +51 @@
 
   Float_t fNumPheFromDNSB;  // Number of phe/ns from diffuse NSB
-  
-  //  Telescope axis position (zenith and azimutal angle)
-  Float_t fTelesTheta;  // >180 (200) means that telescope is always pointing the shower. 
-                        // Otherwise it is Theta where Telescope is pointing.
-  Float_t fTelesPhi;    // See class description. > 360 (400) means that telescope is always pointing the shower.
-                        // Otherwise it is Phi where Telescope is pointing.
   
   //  Angular range used in the Corsika showers generation (degrees)
@@ -120 +117 @@
             const Int_t    sfDeS,
             const Float_t  numdnsb,
-            const Float_t  telestheta,
-            const Float_t  telesphi,
             const Float_t  shthetamax,
             const Float_t  shthetamin,
@@ -142 +137 @@
 
   Float_t  GetNumPheFromDNSB() const      { return fNumPheFromDNSB; }
-  Float_t  GetTelesTheta() const          { return fTelesTheta; }
   UShort_t GetCamVersion() const          { return fCamVersion; }
   UShort_t GetReflVersion() const         { return fReflVersion; }
@@ -148 +142 @@
   UInt_t   GetCorsikaVersion() const      { return fCorsikaVersion; }
   Bool_t   GetAllEvtsTriggered() const    { return fAllEvtsTriggered ? kTRUE : kFALSE; }
+
+  Float_t  GetShowerThetaMin() const { return fShowerThetaMin; } 
+  Float_t  GetShowerThetaMax() const { return fShowerThetaMax; } 
+
   Float_t GetImpactMax() const            {return fImpactMax;}
 
-  ClassDef(MMcRunHeader, 5)     // storage container for general run info
+  ClassDef(MMcRunHeader, 6)     // storage container for general run info
 };
 #endif