Changeset 19947 for trunk

Timestamp:

04/23/20 17:48:20 (5 years ago)

Author:

tbretz

Message:

Added fRunNumber to MMcEvt for convenience, accordingly increased version number, pipe MCorsikaRunHeader::fRunNumber to MMcEvt.

Location:

trunk/Mars

Files:

• mmc/MMcEvt.cxx (modified) (2 diffs)
• mmc/MMcEvt.hxx (modified) (3 diffs)
• msim/MSimMMCS.cc (modified) (1 diff)

trunk/Mars/mmc/MMcEvt.cxx

@@ -56 +56 @@
 //  - moved fTheta to MmcEvtBasic
 //
+// Version 8:
+//  - added fRunNumber
+//
 /////////////////////////////////////////////////////////////////////////////
 #include "MMcEvt.hxx"
@@ -102 +105 @@
                UInt_t   uiPelS,    UInt_t   uiPelC,    Float_t  elec,
                Float_t  muon,      Float_t  other,     Float_t  fadc_jitter,
-               Int_t    reuse)
+               Int_t    reuse) : fRunNumber(0)
 {
     fName  = "MMcEvt";

trunk/Mars/mmc/MMcEvt.hxx

@@ -10 +10 @@
 {
 private:
+    UInt_t  fRunNumber;          // [fits: name=RunNum   ; unit=uint32]
     UInt_t  fEvtNumber;          // [fits: name=EventNum ; unit=uint32]
     Float_t fThick0;             // [g/cm2]
@@ -102 +103 @@
     void SetCoreY(Float_t CoreY) { fCoreY=CoreY; }                //Set Core y pos
 
+    void SetRunNumber(UInt_t n) { fRunNumber=n; }
     void SetEvtNumber(UInt_t n) { fEvtNumber=n; }
     void SetEventReuse(UInt_t n) { fEventReuse=n; }
@@ -120 +122 @@
     void Clear(Option_t *opt=NULL);
 
-    ClassDef(MMcEvt, 7)  //Stores Montecarlo Information of one event (eg. the energy)
+    ClassDef(MMcEvt, 8)  //Stores Montecarlo Information of one event (eg. the energy)
 };
 

trunk/Mars/msim/MSimMMCS.cc

@@ -210 +210 @@
 
 
+    fMcEvt->SetRunNumber(fRunHeader->GetRunNumber());
     fMcEvt->SetEvtNumber(fEvtHeader->GetEvtNumber());
     fMcEvt->SetEventReuse(fEvtHeader->GetNumReuse());