JCORRAN code update from DongJo

[u/mrichter/AliRoot.git] / PWGCF / Correlations / JCORRAN / AliJEventHeader.cxx

diff --git a/PWGCF/Correlations/JCORRAN/AliJEventHeader.cxx b/PWGCF/Correlations/JCORRAN/AliJEventHeader.cxx
old mode 100755 (executable)
new mode 100644 (file)
index 665da4b..e87330d
--- a/PWGCF/Correlations/JCORRAN/AliJEventHeader.cxx
+++ b/PWGCF/Correlations/JCORRAN/AliJEventHeader.cxx
@@ -1,5 +1,5 @@
 /**************************************************************************
- * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ * Copyright(c) 1998-2014, ALICE Experiment at CERN, All rights reserved. *
  *                                                                        *
  * Author: The ALICE Off-line Project.                                    *
  * Contributors are mentioned in the code where appropriate.              *
@@ -7,12 +7,14 @@
  * Permission to use, copy, modify and distribute this software and its   *
  * documentation strictly for non-commercial purposes is hereby granted   *
  * without fee, provided that the above copyright notice appears in all   *
- * copies and that both the copyright notice and this permission notifce   *
+ * copies and that both the copyright notice and this permission notice   *
  * appear in the supporting documentation. The authors make no claims     *
  * about the suitability of this software for any purpose. It is          *
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
+// Comment describing what this class does needed!
+
 // $Id: AliJEventHeader.cxx,v 1.2 2008/01/21 11:56:39 djkim Exp $
 
 ////////////////////////////////////////////////////
@@ -38,9 +40,18 @@ AliJEventHeader::AliJEventHeader():
     fTriggerMaskAlice(0),
     fTriggerMaskJCorran(0),
     fSPDTrackletMult(-999),
+    fTrackletsITSTPC(-999),
+    fTrackletsITSSA(-999),
     fV0Mult(-999),
+    fV0AMult(-999),
+    fV0CMult(-999),
     fEventType(0),
-    fVtxMult(-9999)   //FK// EFF
+    fFiredTriggers(), 
+    fVtxMult(-9999),
+    fBunchCrossNumber(0),
+    fESDFileName(),
+    fEventNumberESDFile(0),
+    fL0TriggerInputs(0)
 {
   // default constructor
   SetName("AliJEventHeader");
@@ -48,17 +59,23 @@ AliJEventHeader::AliJEventHeader():
 }
 
 //______________________________________________________________________________
-AliJEventHeader::AliJEventHeader(int eventid, float cent, float vrtz, ULong64_t triggmaskAli, 
-                                 UInt_t triggmaskJC, Int_t refmult, Float_t v0mult, 
-                                 UInt_t eventType
-                                 ):
+AliJEventHeader::AliJEventHeader(int eventid, float cent, float vrtz, ULong64_t triggmaskAli, UInt_t triggmaskJC, Int_t refmult, Int_t itstpcmult, Int_t itssamult, Float_t v0mult, Float_t v0Amult, Float_t v0Cmult, UInt_t eventType) :
     AliJBaseEventHeader(eventid,cent,vrtz),
     fTriggerMaskAlice(triggmaskAli),
     fTriggerMaskJCorran(triggmaskJC),
     fSPDTrackletMult(refmult),
+    fTrackletsITSTPC(itstpcmult),
+    fTrackletsITSSA(itssamult),
     fV0Mult(v0mult),
+    fV0AMult(v0Amult),
+    fV0CMult(v0Cmult),
     fEventType(eventType),
-    fVtxMult(-9999)  //FK// EFF
+    fFiredTriggers(), 
+    fVtxMult(-9999),  
+    fBunchCrossNumber(0),
+    fESDFileName(),
+    fEventNumberESDFile(0),
+    fL0TriggerInputs(0)
 {
   //constructor
   SetName("AliJEventHeader");
@@ -70,9 +87,18 @@ AliJEventHeader::AliJEventHeader(const AliJEventHeader& a):
     fTriggerMaskAlice(a.fTriggerMaskAlice),
     fTriggerMaskJCorran(a.fTriggerMaskJCorran),
     fSPDTrackletMult(a.fSPDTrackletMult),
+    fTrackletsITSTPC(a.fTrackletsITSTPC),
+    fTrackletsITSSA(a.fTrackletsITSSA),
     fV0Mult(a.fV0Mult),
+    fV0AMult(a.fV0AMult),
+    fV0CMult(a.fV0CMult),
     fEventType(a.fEventType),
-    fVtxMult(a.fVtxMult)  //FK// EFF
+    fFiredTriggers(a.fFiredTriggers), 
+    fVtxMult(a.fVtxMult),
+    fBunchCrossNumber(a.fBunchCrossNumber),
+    fESDFileName(a.fESDFileName),
+    fEventNumberESDFile(a.fEventNumberESDFile),
+    fL0TriggerInputs( a.fL0TriggerInputs )
 {
   //copy constructor
   for( int i=0;i<kcNTYPE;i++ ) fCentralityArray[i] = a.fCentralityArray[i];
@@ -86,9 +112,14 @@ AliJEventHeader&  AliJEventHeader::operator=(const AliJEventHeader& header){
     fTriggerMaskAlice = header.fTriggerMaskAlice;
     fTriggerMaskJCorran = header.fTriggerMaskJCorran;
     fSPDTrackletMult = header.fSPDTrackletMult;
+    fTrackletsITSTPC = header.fTrackletsITSTPC;
+    fTrackletsITSSA = header.fTrackletsITSSA;
     fV0Mult = header.fV0Mult;
+    fV0AMult = header.fV0AMult;
+    fV0CMult = header.fV0CMult;
     fEventType       = header.fEventType;
-    fVtxMult         = header.fVtxMult;  //FK// EFF
+    fVtxMult         = header.fVtxMult; 
+    fFiredTriggers   = header.fFiredTriggers;
     for( int i=0;i<kcNTYPE;i++ ) fCentralityArray[i] = header.fCentralityArray[i];
   }