Another histos for lumi

[u/mrichter/AliRoot.git] / ITS / AliITSCalibrationSPD.cxx

diff --git a/ITS/AliITSCalibrationSPD.cxx b/ITS/AliITSCalibrationSPD.cxx
index 5a3a22d52bb96eb9ca5214de96874b4829ec91ec..917078ca97d68d3382d1019c2cb0454ee8247980 100644 (file)
--- a/ITS/AliITSCalibrationSPD.cxx
+++ b/ITS/AliITSCalibrationSPD.cxx
@@ -12,8 +12,9 @@
  * about the suitability of this software for any purpose. It is          *
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
-
+#include "TArrayI.h"
 #include "AliITSCalibrationSPD.h"
+
 ///////////////////////////////////////////////////////////////////////////
 //  Calibration class for set:ITS                   
 //  Specific subdetector implementation for         
@@ -54,7 +55,7 @@ void AliITSCalibrationSPD::AddBad(UInt_t col, UInt_t row) {
 //____________________________________________________________________________
 void AliITSCalibrationSPD::SetChipBad(UInt_t chip) {
   // set full chip bad
-  if (chip>=5 || chip<0 ) {AliError("Wrong chip number");
+  if (chip>=5) {AliError("Wrong chip number");
   }
   else {
     fBadChip[chip]=kTRUE;
@@ -63,7 +64,7 @@ void AliITSCalibrationSPD::SetChipBad(UInt_t chip) {
 //____________________________________________________________________________
 void AliITSCalibrationSPD::UnSetChipBad(UInt_t chip) {
   // unset full chip bad
-  if (chip>=5 || chip<0 ) {AliError("Wrong chip number");
+  if (chip>=5 ) {AliError("Wrong chip number");
   }
   else {
     fBadChip[chip]=kFALSE;
@@ -222,38 +223,38 @@ void AliITSCalibrationSPD::SetNrBad(UInt_t /*nr*/) {
   AliError("This method should not be used anymore. Use SetNrBadSingle instead!!!");
 }
 //______________________________________________________________________
-void AliITSCalibrationSPD::Streamer(TBuffer &R__b) {
+void AliITSCalibrationSPD::Streamer(TBuffer &ruub) {
   // Stream an object of class AliITSCalibrationSPD.
-  UInt_t R__s, R__c;
-  if (R__b.IsReading()) {
-    Version_t R__v = R__b.ReadVersion(&R__s, &R__c); if (R__v) { }
-    AliITSCalibration::Streamer(R__b);
-    if (R__v >= 8) {
-      R__b >> fNrBad;
-      fBadChannels.Streamer(R__b);
-      R__b.ReadStaticArray((bool*)fBadChip);
+  UInt_t ruus, ruuc;
+  if (ruub.IsReading()) {
+    Version_t ruuv = ruub.ReadVersion(&ruus, &ruuc); if (ruuv) { }
+    AliITSCalibration::Streamer(ruub);
+    if (ruuv >= 8) {
+      ruub >> fNrBad;
+      fBadChannels.Streamer(ruub);
+      ruub.ReadStaticArray((bool*)fBadChip);
     }
     else {
       Double_t dummy;
-      R__b >> dummy;
-      R__b >> dummy;
-      R__b >> dummy;
-      R__b >> dummy;
-      R__b >> dummy;
-      R__b >> dummy;
-      R__b >> dummy;
-      R__b >> fNrBad;
-      if (R__v == 7) {
-       fBadChannels.Streamer(R__b);
-       R__b.ReadStaticArray((bool*)fBadChip);
+      ruub >> dummy;
+      ruub >> dummy;
+      ruub >> dummy;
+      ruub >> dummy;
+      ruub >> dummy;
+      ruub >> dummy;
+      ruub >> dummy;
+      ruub >> fNrBad;
+      if (ruuv == 7) {
+       fBadChannels.Streamer(ruub);
+       ruub.ReadStaticArray((bool*)fBadChip);
       }
       else {
-       if (R__v == 6) {
-         fBadChannels.Streamer(R__b);
+       if (ruuv == 6) {
+         fBadChannels.Streamer(ruub);
        }
        else {
          TArrayI fBadChannelsV1;
-         fBadChannelsV1.Streamer(R__b);
+         fBadChannelsV1.Streamer(ruub);
          fBadChannels.Set(fNrBad*2);
          for (UInt_t i=0; i<fNrBad*2; i++) {
            fBadChannels[i] = fBadChannelsV1[i];
@@ -264,14 +265,14 @@ void AliITSCalibrationSPD::Streamer(TBuffer &R__b) {
        }
       }
     }
-    R__b.CheckByteCount(R__s, R__c, AliITSCalibrationSPD::IsA());
+    ruub.CheckByteCount(ruus, ruuc, AliITSCalibrationSPD::IsA());
   }
   else {
-    R__c = R__b.WriteVersion(AliITSCalibrationSPD::IsA(), kTRUE);
-    AliITSCalibration::Streamer(R__b);
-    R__b << fNrBad;
-    fBadChannels.Streamer(R__b);
-    R__b.WriteArray(fBadChip, 5);
-    R__b.SetByteCount(R__c, kTRUE);
+    ruuc = ruub.WriteVersion(AliITSCalibrationSPD::IsA(), kTRUE);
+    AliITSCalibration::Streamer(ruub);
+    ruub << fNrBad;
+    fBadChannels.Streamer(ruub);
+    ruub.WriteArray(fBadChip, 5);
+    ruub.SetByteCount(ruuc, kTRUE);
   }
 }