From: morsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Tue, 15 Apr 2008 09:42:17 +0000 (+0000)
Subject: Protection in case we read older data.
X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=eda42f29653ce2118dbe7cd484a7de7c3af6b480

Protection in case we read older data.
---

diff --git a/STEER/AliMultiplicity.h b/STEER/AliMultiplicity.h
index 1959ae3c723..4cef32d2183 100644
--- a/STEER/AliMultiplicity.h
+++ b/STEER/AliMultiplicity.h
@@ -30,8 +30,9 @@ class AliMultiplicity : public TObject {
   else {Error("GetPhi","Invalid track number %d",i); return -9999.;}}
   Double_t GetDeltaPhi(Int_t i) const {if(i>=0 && i<fNtracks) {return fDeltPhi[i];}
   else {Error("GetDeltaPhi","Invalid track number %d",i); return -9999.;}}
-  Int_t GetLabel(Int_t i, Int_t layer) const {if(i>=0 && i<fNtracks) {return (layer == 0) ? fLabels[i] : fLabelsL2[i];}
-  else {Error("GetLabel","Invalid track number %d",i); return -9999;}}
+
+  Int_t GetLabel(Int_t i, Int_t layer) const;
+  
 // methods to access single cluster information
   Int_t GetNumberOfSingleClusters() const {return fNsingle;}
   Double_t GetThetaSingle(Int_t i) const { if(i>=0 && i<fNsingle) {return fThsingle[i];}
@@ -60,4 +61,23 @@ class AliMultiplicity : public TObject {
   ClassDef(AliMultiplicity,7);
 };
 
+inline Int_t AliMultiplicity::GetLabel(Int_t i, Int_t layer) const
+{
+    if(i>=0 && i<fNtracks) {
+	if (layer == 0) {
+	    return fLabels[i];
+	} else if (layer == 1) {
+	    if (fLabelsL2) {
+		return fLabelsL2[i];
+	    } else {
+		Warning("GetLabel", "No information for layer 2 available !");
+		return -9999;
+	    }
+	} else {
+	    Error("GetLabel","Invalid layer number %d",layer); return -9999;
+	}
+    } else {
+	Error("GetLabel","Invalid track number %d",i); return -9999;
+    }
+}
 #endif