Adding the run number (M. Krzewicki)

diff --git a/STEER/AliRelAlignerKalman.cxx b/STEER/AliRelAlignerKalman.cxx
index 3325ffdcd727971c8e6205a3513dcc8d4047f26a..f721b0c993174ebaeb44db0d8d75583dce5937bb 100644 (file)
--- a/STEER/AliRelAlignerKalman.cxx
+++ b/STEER/AliRelAlignerKalman.cxx
@@ -76,13 +76,7 @@
 #include <TF1.h>
 
 #include "AliESDtrack.h"
-#include "AliTrackPointArray.h"
-#include "AliGeomManager.h"
-#include "AliTrackFitterKalman.h"
-#include "AliTrackFitterRieman.h"
-#include "AliESDfriendTrack.h"
 #include "AliESDEvent.h"
-#include "AliESDVertex.h"
 #include "AliExternalTrackParam.h"
 
 #include "AliRelAlignerKalman.h"
@@ -1358,6 +1352,7 @@ Bool_t AliRelAlignerKalman::Merge( const AliRelAlignerKalman* al )
   fPH = ph;
 
   //merge stats
+  if (!success) return kFALSE; //no point in merging stats if merge not succesful
   fNProcessedEvents += al->fNProcessedEvents;
   fNUpdates += al->fNUpdates;
   fNOutliers += al->fNOutliers;

diff --git a/STEER/AliRelAlignerKalman.h b/STEER/AliRelAlignerKalman.h
index 01b0ad764080405d521e6f81d05bbbb0791cddd7..d34d8aa841ae6f66f84ed10c9f7f0c87c26bb76a 100644 (file)
--- a/STEER/AliRelAlignerKalman.h
+++ b/STEER/AliRelAlignerKalman.h
@@ -14,10 +14,10 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include <TMath.h>
-#include <TObject.h>
 #include <TVectorD.h>
 #include <TMatrix.h>
 
+class TObject;
 class AliExternalTrackParam;
 class AliESDEvent;
 class AliESDtrack;
@@ -114,8 +114,8 @@ public:
     Bool_t IsPositiveDefinite( const TMatrixD& mat ) const;
     void SetTimeStamp( const UInt_t ts ) { fTimeStamp = ts; }
     UInt_t GetTimeStamp() const {return fTimeStamp;}
-    void SetRunNumber( const UInt_t rn ) { fRunNumber = rn; }
-    UInt_t GetRunNumber() const {return fRunNumber;}
+    void SetRunNumber( const Int_t rn ) { fRunNumber = rn; }
+    Int_t GetRunNumber() const {return fRunNumber;}
     Int_t Compare(const TObject *obj) const;
     Bool_t IsSortable() const { return kTRUE; }
     
@@ -172,7 +172,7 @@ private:
     Int_t fNProcessedEvents; //number of processed events
     Int_t fTrackInBuffer; //!number of tracks in buffer
     UInt_t fTimeStamp;    //time stamp
-    UInt_t fRunNumber;    //run number
+    Int_t fRunNumber;    //run number
 
     //TPC stuff
     Double_t fTPCvd; //TPC drift velocity