Removing redundant code (Yuri)

diff --git a/RAW/AliCaloRawStreamV3.cxx b/RAW/AliCaloRawStreamV3.cxx
index 01b8e33cf4bf494f058974222f060edb98711d8f..2153fb343f5088f8fc4110516d54f05a32a92092 100644 (file)
--- a/RAW/AliCaloRawStreamV3.cxx
+++ b/RAW/AliCaloRawStreamV3.cxx
@@ -51,7 +51,6 @@ AliCaloRawStreamV3::AliCaloRawStreamV3(AliRawReader* rawReader, TString calo, Al
   fRow(-1),
   fColumn(-1),
   fCaloFlag(0),
-  fFilter(0),
   fNModules(0),
   fNRCU(0),
   fNSides(0),
@@ -118,7 +117,6 @@ AliCaloRawStreamV3::AliCaloRawStreamV3(const AliCaloRawStreamV3& stream) :
   fRow(-1),
   fColumn(-1),
   fCaloFlag(0),
-  fFilter(0),
   fNModules(0),
   fNRCU(0),
   fNSides(0),
@@ -154,7 +152,7 @@ void AliCaloRawStreamV3::Reset()
   // reset PHOS/EMCAL raw stream params
   AliAltroRawStreamV3::Reset();
   fModule = fRow = fColumn = -1;
-  fFilter = fCaloFlag = 0;
+  fCaloFlag = 0;
   fCalo="";
 }
 
@@ -167,12 +165,6 @@ Bool_t AliCaloRawStreamV3::NextChannel()
 
   if (AliAltroRawStreamV3::NextChannel()) {
     ApplyAltroMapping();
-    if ( fFilter > 0 ) { // some data should be filtered out
-      if ( (fFilter & (1<<fCaloFlag)) != 0) {  
-       // this particular data should be filtered out
-       return NextChannel(); // go to the next address instead
-      }
-    }
     return kTRUE;
   }
   else

diff --git a/RAW/AliCaloRawStreamV3.h b/RAW/AliCaloRawStreamV3.h
index a2a8cccedf699fa46e7ac55b3947b1ca1c54991b..e85bad2e381b0d9f2dba794ae753623ce1cffacf 100644 (file)
--- a/RAW/AliCaloRawStreamV3.h
+++ b/RAW/AliCaloRawStreamV3.h
@@ -46,10 +46,6 @@ public :
   Bool_t  IsLEDMonData()   const {return (fCaloFlag == kLEDMonData);} 
 
   Int_t   GetCaloFlag() const { return fCaloFlag; } 
-  Int_t   GetFilter() const { return fFilter; } 
-
-  void SkipData(EAliCaloFlag caloFlag=kLEDMonData) 
-    { fFilter |= (1<<caloFlag); }
 
 protected:
 
@@ -62,7 +58,6 @@ protected:
   Int_t            fRow;      // index of current row
   Int_t            fColumn;   // index of current column
   Int_t            fCaloFlag; // low (0) or (1) high gain; see enum EAliCaloFlag above
-  Int_t            fFilter;   // default 0 = let everything through
   Int_t            fNModules; // number of (super)modules
   Int_t            fNRCU;     // number of RCU per (super)module
   Int_t            fNSides;   // Division of EMCal in "A" "C" sides
@@ -70,7 +65,7 @@ protected:
   Bool_t           fExternalMapping; // use external mapping or create a default one
   AliAltroMapping *fMapping[20];     // pointers to ALTRO mapping
 
-  ClassDef(AliCaloRawStreamV3, 2)   // class for reading PHOS/EMCAL raw digits
+  ClassDef(AliCaloRawStreamV3, 3)   // class for reading PHOS/EMCAL raw digits
 
 };