Changeset 1623

Timestamp:

11/15/02 15:54:31 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft

Files:

• Mars/Changelog (modified) (1 diff)
• include-Classes/MMcFormat/MMcCorsikaRunHeader.cc (modified) (5 diffs)
• include-Classes/MMcFormat/MMcCorsikaRunHeader.h (modified) (4 diffs)
• include-Classes/MMcFormat/McLinkDef.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
 
+ 2002/11/15: Thomas Bretz
+
+   * mmc/MMcCorsikaRunHeader.[h,cc]:
+     - small changes
+
+   * mmc/McLinkDef.h:
+     - added missing MMcCorsikaRunHeader
+
+
+
  2002/11/15: Oscar Blanch
 
    * mmc/MMcCorsikaRunHeader.[h,cc]:
      - added
+
+
 
  2002/11/14: Thomas Bretz

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

@@ -33 +33 @@
 //
 ////////////////////////////////////////////////////////////////////////////
+#include "MMcCorsikaRunHeader.h"
 
-#ifndef MARS_MMcCorsikaRunHeader
-#include "MMcCorsikaRunHeader.h"
-#endif
-
-#include <fstream.h>
-#include <iomanip.h>
-
-#include "MLog.h"
-#include "MLogManip.h"
 ClassImp(MMcCorsikaRunHeader);
 
@@ -60 +52 @@
     fNumObsLev = 0.0;
     for(int i=0;i<10;i++)
-        fHeightLev[i]=0.0;
+        fHeightLev[i]=0.0;
     fSlopeSpec = 0.0;
     fELowLim = 0.0;
@@ -76 +68 @@
     for(int i=0;i<11;i++)  fCSTRBA[i] = 0.0;
     for(int i=0;i<5;i++){
-         fAATM[i] = 0.0;
-         fBATM[i] = 0.0;
-         fCATM[i] = 0.0;
+        fAATM[i] = 0.0;
+        fBATM[i] = 0.0;
+        fCATM[i] = 0.0;
     }
     for(int i=0;i<4;i++)  fNFL[i] = 0.0;
@@ -86 +78 @@
 // -------------------------------------------------------------------------
 //
-// Fill Corsika Run Header 
+// Fill Corsika Run Header
 //
 void MMcCorsikaRunHeader::Fill(const Float_t  runnumber,
-                               const Float_t  date,
+                               const Float_t  date,
                                const Float_t  vers,
                                const Float_t  numobslev,
@@ -138 +130 @@
     for(int i=0;i<4;i++)  fNFL[i] = nfl[i];
 }
-
-

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

@@ -3 +3 @@
 ///////////////////////////////////////////////////////////////////////
 //                                                                   //
-// MMcCorsikaRunHeader                                                        //
+// MMcCorsikaRunHeader                                               //
 //                                                                   //
 ///////////////////////////////////////////////////////////////////////
-
 #ifndef MARS_MParContainer
 #include "MParContainer.h"
@@ -15 +14 @@
 {
 private:
-  // Header copied directly from CORSIKA header, skiping dummy values.
-  // The propouse of this container is being able to cmopare with
-  // Corsika run Header
-  // See CORSIKA manual for explanations
+    // Header copied directly from CORSIKA header, skiping dummy values.
+    // The propouse of this container is being able to cmopare with
+    // Corsika run Header
+    // See CORSIKA manual for explanations
     Float_t fRunNumber;
     Float_t fDate;
@@ -24 +23 @@
     Float_t fNumObsLev;
     Float_t fHeightLev[10];
-    Float_t fSlopeSpec;  // Slope of primaries' energy spectrum 
-    Float_t fELowLim;  
-    Float_t fEUppLim;    // Limits of energy range for generation 
+    Float_t fSlopeSpec;  // Slope of primaries' energy spectrum
+    Float_t fELowLim;
+    Float_t fEUppLim;    // Limits of energy range for generation
     Float_t fEGS4_flag;
     Float_t fNKG_flag;
-    Float_t fEcutoffh;  
-    Float_t fEcutoffm;  
-    Float_t fEcutoffe;  
-    Float_t fEcutoffg;  
-    // Physical constants and interaction flags (see CORSIKA manual): 
+    Float_t fEcutoffh;
+    Float_t fEcutoffm;
+    Float_t fEcutoffe;
+    Float_t fEcutoffg;
+
+    // Physical constants and interaction flags (see CORSIKA manual):
     Float_t fC[50];
     Float_t fCKA[40];
@@ -44 +44 @@
 
 public:
-  MMcCorsikaRunHeader(const char *name=NULL, const char *title=NULL);
-  ~MMcCorsikaRunHeader();
+    MMcCorsikaRunHeader(const char *name=NULL, const char *title=NULL);
+    ~MMcCorsikaRunHeader();
 
-  void Fill(const Float_t  runnumber,
-            const Float_t  date,
-            const Float_t  vers,
-            const Float_t  fNumObsLev,
-            const Float_t  height[10],
-            const Float_t  slope,
-            const Float_t  elow,
-            const Float_t  eupp,
-            const Float_t  egs4,
-            const Float_t  nkg,
-            const Float_t  eh,
-            const Float_t  em,
-            const Float_t  ee,
-            const Float_t  eg,
-            const Float_t  c[50],
-            const Float_t  cka[40],
-            const Float_t  ceta[5],
-            const Float_t  cstrba[11],
-            const Float_t  aatm[5],
-            const Float_t  batm[5],
-            const Float_t  catm[5],
-            const Float_t  nfl[4]
-            );
-  
-  ClassDef(MMcCorsikaRunHeader, 1)      // storage container for general info
+    void Fill(const Float_t  runnumber,
+              const Float_t  date,
+              const Float_t  vers,
+              const Float_t  fNumObsLev,
+              const Float_t  height[10],
+              const Float_t  slope,
+              const Float_t  elow,
+              const Float_t  eupp,
+              const Float_t  egs4,
+              const Float_t  nkg,
+              const Float_t  eh,
+              const Float_t  em,
+              const Float_t  ee,
+              const Float_t  eg,
+              const Float_t  c[50],
+              const Float_t  cka[40],
+              const Float_t  ceta[5],
+              const Float_t  cstrba[11],
+              const Float_t  aatm[5],
+              const Float_t  batm[5],
+              const Float_t  catm[5],
+              const Float_t  nfl[4]
+             );
+
+    ClassDef(MMcCorsikaRunHeader, 1)    // storage container for general info
 };
 #endif

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

@@ -11 +11 @@
 #pragma link C++ class MMcFadcHeader+;
 #pragma link C++ class MMcConfigRunHeader+;
+#pragma link C++ class MMcCorsikaRunHeader+;
 
 #endif