X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSDetTypeRec.h;h=f80f83dbec8207db4a704f5daeeeb517772fdfc1;hb=44372324610bdd8d1fd30f66a94fc791328dce06;hp=2ef7272c104985bb5dd1bba3e7e97c0b58b3d87b;hpb=d97fc3e0a0d986c0f5e0b57c406b611c4bcedf06;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSDetTypeRec.h b/ITS/AliITSDetTypeRec.h
index 2ef7272c104..f80f83dbec8 100644
--- a/ITS/AliITSDetTypeRec.h
+++ b/ITS/AliITSDetTypeRec.h
@@ -32,6 +32,7 @@ class AliITSDDLModuleMapSDD;
 class AliITSNoiseSSDv2;
 class AliITSTriggerConditions;
 class AliITSFOSignalsSPD;
+class AliITSRecPointContainer;
 
 class AliITSDetTypeRec : public TObject {
   public:
@@ -51,9 +52,6 @@ class AliITSDetTypeRec : public TObject {
     virtual void SetSPDDeadModel(Int_t iMod, AliITSCalibration *cal);
     virtual void SetReconstructionModel(Int_t dettype, AliITSClusterFinder *rec);
     virtual Bool_t GetCalibration();
-    virtual Bool_t GetCalibrationSPD(Bool_t cacheStatus);
-    virtual Bool_t GetCalibrationSDD(Bool_t cacheStatus);
-    virtual Bool_t GetCalibrationSSD(Bool_t cacheStatus);
     virtual AliITSsegmentation* GetSegmentationModel(Int_t dettype) const;
     virtual AliITSCalibration* GetCalibrationModel(Int_t iMod) const;
     virtual AliITSCalibration* GetSPDDeadModel(Int_t iMod) const;
@@ -93,14 +91,18 @@ class AliITSDetTypeRec : public TObject {
     void MakeBranchRF(TTree *treeR){MakeBranchR(treeR,"Fast");}
     void DigitsToRecPoints(TTree *treeD,TTree *treeR,Int_t lastEntry,Option_t *det, Int_t optCluFind=0);
     void DigitsToRecPoints(AliRawReader* rawReader,TTree *treeR,Option_t *det="All");
-    void DigitsToRecPoints(AliRawReader* rawReader,TClonesArray** clusters,Option_t *opt);
+    void DigitsToRecPoints(AliRawReader* rawReader,Option_t *opt);
 
     void   SetFastOrFiredMapOnline(UInt_t eq, UInt_t hs, UInt_t chip);
     void   SetFastOrFiredMap(UInt_t chipKey){fFastOrFiredMap.SetBitNumber(chipKey);} 
     TBits  GetFastOrFiredMap() const {return fFastOrFiredMap;}
+    TBits  GetFiredChipMap() const; // (using SPD RecPoints)
+    TBits  GetFiredChipMap(TTree *treeR) const; // (using SPD RecPoints)
     void   ResetFastOrFiredMap(){fFastOrFiredMap.ResetAllBits();}
     void   RemoveFastOrFiredInActive(); // (using Trigger Conditions)
+    void   RemoveFastOrFiredFromDead(TBits firedchipmap); // (using SPD RecPoints)
    
+    
   private:
     // private methods
     AliITSDetTypeRec(const AliITSDetTypeRec& rec);
@@ -113,6 +115,9 @@ class AliITSDetTypeRec : public TObject {
 			       AliITSBadChannelsSSDv2 *badChannelsSSD);
     void ReadOldSSDGain(const TObjArray *array, 
 			AliITSGainSSDv2 *gainSSD);
+    virtual Bool_t GetCalibrationSPD(Bool_t cacheStatus);
+    virtual Bool_t GetCalibrationSDD(Bool_t cacheStatus);
+    virtual Bool_t GetCalibrationSSD(Bool_t cacheStatus);
 
     //    virtual void SetLoader(AliITSLoader* loader) {fLoader=loader;}
     static const Int_t fgkNdettypes;          // number of det. types
@@ -149,3 +154,4 @@ class AliITSDetTypeRec : public TObject {
 };
 
 #endif
+