adding TPCFitMap to the AODtrack
authorkleinb <kleinb@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 13 Dec 2011 19:32:02 +0000 (19:32 +0000)
committerkleinb <kleinb@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 13 Dec 2011 19:32:02 +0000 (19:32 +0000)
ANALYSIS/AliAnalysisTaskESDfilter.cxx
STEER/AOD/AliAODTrack.cxx
STEER/AOD/AliAODTrack.h

index aff0131..2f9bd34 100644 (file)
@@ -484,6 +484,7 @@ void AliAnalysisTaskESDfilter::ConvertCascades(const AliESDEvent& esd)
                                                                            vtx->UsesTrack(esdCascadeBach->GetID()),\r
                                                                            AliAODTrack::kSecondary,\r
                                                                            selectInfo);\r
                                                                            vtx->UsesTrack(esdCascadeBach->GetID()),\r
                                                                            AliAODTrack::kSecondary,\r
                                                                            selectInfo);\r
+           aodTrack->SetTPCFitMap(esdCascadeBach->GetTPCFitMap());\r
            aodTrack->SetTPCClusterMap(esdCascadeBach->GetTPCClusterMap());\r
            aodTrack->SetTPCSharedMap (esdCascadeBach->GetTPCSharedMap());\r
            aodTrack->SetChi2perNDF(Chi2perNDF(esdCascadeBach));\r
            aodTrack->SetTPCClusterMap(esdCascadeBach->GetTPCClusterMap());\r
            aodTrack->SetTPCSharedMap (esdCascadeBach->GetTPCSharedMap());\r
            aodTrack->SetChi2perNDF(Chi2perNDF(esdCascadeBach));\r
@@ -568,6 +569,7 @@ void AliAnalysisTaskESDfilter::ConvertCascades(const AliESDEvent& esd)
                     vtx->UsesTrack(esdCascadePos->GetID()),\r
                     AliAODTrack::kSecondary,\r
                     selectInfo);\r
                     vtx->UsesTrack(esdCascadePos->GetID()),\r
                     AliAODTrack::kSecondary,\r
                     selectInfo);\r
+        aodTrack->SetTPCFitMap(esdCascadePos->GetTPCFitMap());\r
         aodTrack->SetTPCClusterMap(esdCascadePos->GetTPCClusterMap());\r
         aodTrack->SetTPCSharedMap (esdCascadePos->GetTPCSharedMap());\r
         aodTrack->SetChi2perNDF(Chi2perNDF(esdCascadePos));\r
         aodTrack->SetTPCClusterMap(esdCascadePos->GetTPCClusterMap());\r
         aodTrack->SetTPCSharedMap (esdCascadePos->GetTPCSharedMap());\r
         aodTrack->SetChi2perNDF(Chi2perNDF(esdCascadePos));\r
@@ -614,6 +616,7 @@ void AliAnalysisTaskESDfilter::ConvertCascades(const AliESDEvent& esd)
                                                       vtx->UsesTrack(esdCascadeNeg->GetID()),\r
                                                       AliAODTrack::kSecondary,\r
                                                       selectInfo);\r
                                                       vtx->UsesTrack(esdCascadeNeg->GetID()),\r
                                                       AliAODTrack::kSecondary,\r
                                                       selectInfo);\r
+        aodTrack->SetTPCFitMap(esdCascadeNeg->GetTPCFitMap());\r
         aodTrack->SetTPCClusterMap(esdCascadeNeg->GetTPCClusterMap());\r
         aodTrack->SetTPCSharedMap (esdCascadeNeg->GetTPCSharedMap());\r
         aodTrack->SetChi2perNDF(Chi2perNDF(esdCascadeNeg));\r
         aodTrack->SetTPCClusterMap(esdCascadeNeg->GetTPCClusterMap());\r
         aodTrack->SetTPCSharedMap (esdCascadeNeg->GetTPCSharedMap());\r
         aodTrack->SetChi2perNDF(Chi2perNDF(esdCascadeNeg));\r
@@ -856,6 +859,7 @@ void AliAnalysisTaskESDfilter::ConvertV0s(const AliESDEvent& esd)
                                                     vtx->UsesTrack(esdV0Pos->GetID()),\r
                                                     AliAODTrack::kSecondary,\r
                                                     selectInfo);\r
                                                     vtx->UsesTrack(esdV0Pos->GetID()),\r
                                                     AliAODTrack::kSecondary,\r
                                                     selectInfo);\r
+           aodTrack->SetTPCFitMap(esdV0Pos->GetTPCFitMap());\r
            aodTrack->SetTPCClusterMap(esdV0Pos->GetTPCClusterMap());\r
            aodTrack->SetTPCSharedMap (esdV0Pos->GetTPCSharedMap());\r
            aodTrack->SetChi2perNDF(Chi2perNDF(esdV0Pos));\r
            aodTrack->SetTPCClusterMap(esdV0Pos->GetTPCClusterMap());\r
            aodTrack->SetTPCSharedMap (esdV0Pos->GetTPCSharedMap());\r
            aodTrack->SetChi2perNDF(Chi2perNDF(esdV0Pos));\r
@@ -900,6 +904,7 @@ void AliAnalysisTaskESDfilter::ConvertV0s(const AliESDEvent& esd)
                                                     vtx->UsesTrack(esdV0Neg->GetID()),\r
                                                     AliAODTrack::kSecondary,\r
                                                     selectInfo);\r
                                                     vtx->UsesTrack(esdV0Neg->GetID()),\r
                                                     AliAODTrack::kSecondary,\r
                                                     selectInfo);\r
+           aodTrack->SetTPCFitMap(esdV0Neg->GetTPCFitMap());\r
            aodTrack->SetTPCClusterMap(esdV0Neg->GetTPCClusterMap());\r
            aodTrack->SetTPCSharedMap (esdV0Neg->GetTPCSharedMap());\r
            aodTrack->SetChi2perNDF(Chi2perNDF(esdV0Neg));\r
            aodTrack->SetTPCClusterMap(esdV0Neg->GetTPCClusterMap());\r
            aodTrack->SetTPCSharedMap (esdV0Neg->GetTPCSharedMap());\r
            aodTrack->SetChi2perNDF(Chi2perNDF(esdV0Neg));\r
@@ -1100,6 +1105,7 @@ void AliAnalysisTaskESDfilter::ConvertTPCOnlyTracks(const AliESDEvent& esd)
                                                             AliAODTrack::kPrimary, \r
                                                             selectInfo);\r
     aodTrack->SetIsHybridTPCConstrainedGlobal(isHybridITSTPC);    \r
                                                             AliAODTrack::kPrimary, \r
                                                             selectInfo);\r
     aodTrack->SetIsHybridTPCConstrainedGlobal(isHybridITSTPC);    \r
+    aodTrack->SetTPCFitMap(track->GetTPCFitMap());\r
     aodTrack->SetTPCClusterMap(track->GetTPCClusterMap());\r
     aodTrack->SetTPCSharedMap (track->GetTPCSharedMap());\r
     aodTrack->SetIsTPCConstrained(kTRUE);    \r
     aodTrack->SetTPCClusterMap(track->GetTPCClusterMap());\r
     aodTrack->SetTPCSharedMap (track->GetTPCSharedMap());\r
     aodTrack->SetIsTPCConstrained(kTRUE);    \r
@@ -1240,6 +1246,7 @@ void AliAnalysisTaskESDfilter::ConvertGlobalConstrainedTracks(const AliESDEvent&
                                                             selectInfo);\r
     aodTrack->SetIsHybridGlobalConstrainedGlobal(isHybridGC);    \r
     aodTrack->SetIsGlobalConstrained(kTRUE);    \r
                                                             selectInfo);\r
     aodTrack->SetIsHybridGlobalConstrainedGlobal(isHybridGC);    \r
     aodTrack->SetIsGlobalConstrained(kTRUE);    \r
+    aodTrack->SetTPCFitMap(esdTrack->GetTPCFitMap());\r
     aodTrack->SetTPCClusterMap(esdTrack->GetTPCClusterMap());\r
     aodTrack->SetTPCSharedMap (esdTrack->GetTPCSharedMap());\r
     aodTrack->SetChi2perNDF(Chi2perNDF(esdTrack));\r
     aodTrack->SetTPCClusterMap(esdTrack->GetTPCClusterMap());\r
     aodTrack->SetTPCSharedMap (esdTrack->GetTPCSharedMap());\r
     aodTrack->SetChi2perNDF(Chi2perNDF(esdTrack));\r
@@ -1316,6 +1323,7 @@ void AliAnalysisTaskESDfilter::ConvertTracks(const AliESDEvent& esd)
                                                             AliAODTrack::kPrimary, \r
                                                             selectInfo)\r
                          );\r
                                                             AliAODTrack::kPrimary, \r
                                                             selectInfo)\r
                          );\r
+    aodTrack->SetTPCFitMap(esdTrack->GetTPCFitMap());\r
     aodTrack->SetTPCClusterMap(esdTrack->GetTPCClusterMap());\r
     aodTrack->SetTPCSharedMap (esdTrack->GetTPCSharedMap());\r
     aodTrack->SetChi2perNDF(Chi2perNDF(esdTrack));\r
     aodTrack->SetTPCClusterMap(esdTrack->GetTPCClusterMap());\r
     aodTrack->SetTPCSharedMap (esdTrack->GetTPCSharedMap());\r
     aodTrack->SetChi2perNDF(Chi2perNDF(esdTrack));\r
@@ -1575,6 +1583,7 @@ void AliAnalysisTaskESDfilter::ConvertKinks(const AliESDEvent& esd)
                                                vtx->UsesTrack(esdTrack->GetID()),\r
                                                AliAODTrack::kPrimary,\r
                                                selectInfo);\r
                                                vtx->UsesTrack(esdTrack->GetID()),\r
                                                AliAODTrack::kPrimary,\r
                                                selectInfo);\r
+            mother->SetTPCFitMap(esdTrackM->GetTPCFitMap());\r
             mother->SetTPCClusterMap(esdTrackM->GetTPCClusterMap());\r
             mother->SetTPCSharedMap (esdTrackM->GetTPCSharedMap());\r
             mother->SetChi2perNDF(Chi2perNDF(esdTrackM));\r
             mother->SetTPCClusterMap(esdTrackM->GetTPCClusterMap());\r
             mother->SetTPCSharedMap (esdTrackM->GetTPCSharedMap());\r
             mother->SetChi2perNDF(Chi2perNDF(esdTrackM));\r
@@ -1639,6 +1648,7 @@ void AliAnalysisTaskESDfilter::ConvertKinks(const AliESDEvent& esd)
                                                vtx->UsesTrack(esdTrack->GetID()),\r
                                                AliAODTrack::kSecondary,\r
                                                selectInfo);\r
                                                vtx->UsesTrack(esdTrack->GetID()),\r
                                                AliAODTrack::kSecondary,\r
                                                selectInfo);\r
+            daughter->SetTPCFitMap(esdTrackD->GetTPCFitMap());\r
             daughter->SetTPCClusterMap(esdTrackD->GetTPCClusterMap());\r
             daughter->SetTPCSharedMap (esdTrackD->GetTPCSharedMap());\r
            daughter->SetTPCPointsF(esdTrackD->GetTPCNclsF());\r
             daughter->SetTPCClusterMap(esdTrackD->GetTPCClusterMap());\r
             daughter->SetTPCSharedMap (esdTrackD->GetTPCSharedMap());\r
            daughter->SetTPCPointsF(esdTrackD->GetTPCNclsF());\r
index 9ee12eb..cb6b060 100644 (file)
@@ -38,6 +38,7 @@ AliAODTrack::AliAODTrack() :
   fLabel(-999),
   fITSMuonClusterMap(0),
   fFilterMap(0),
   fLabel(-999),
   fITSMuonClusterMap(0),
   fFilterMap(0),
+  fTPCFitMap(),
   fTPCClusterMap(),
   fTPCSharedMap(),
   fTPCnclsF(0),
   fTPCClusterMap(),
   fTPCSharedMap(),
   fTPCnclsF(0),
@@ -83,6 +84,7 @@ AliAODTrack::AliAODTrack(Short_t id,
   fLabel(label),
   fITSMuonClusterMap(0),
   fFilterMap(selectInfo),
   fLabel(label),
   fITSMuonClusterMap(0),
   fFilterMap(selectInfo),
+  fTPCFitMap(),
   fTPCClusterMap(),
   fTPCSharedMap(),
   fTPCnclsF(0),
   fTPCClusterMap(),
   fTPCSharedMap(),
   fTPCnclsF(0),
@@ -132,6 +134,7 @@ AliAODTrack::AliAODTrack(Short_t id,
   fLabel(label),
   fITSMuonClusterMap(0),
   fFilterMap(selectInfo),
   fLabel(label),
   fITSMuonClusterMap(0),
   fFilterMap(selectInfo),
+  fTPCFitMap(),
   fTPCClusterMap(),
   fTPCSharedMap(),
   fTPCnclsF(0),
   fTPCClusterMap(),
   fTPCSharedMap(),
   fTPCnclsF(0),
@@ -175,6 +178,7 @@ AliAODTrack::AliAODTrack(const AliAODTrack& trk) :
   fLabel(trk.fLabel),
   fITSMuonClusterMap(trk.fITSMuonClusterMap),
   fFilterMap(trk.fFilterMap),
   fLabel(trk.fLabel),
   fITSMuonClusterMap(trk.fITSMuonClusterMap),
   fFilterMap(trk.fFilterMap),
+  fTPCFitMap(trk.fTPCFitMap),
   fTPCClusterMap(trk.fTPCClusterMap),
   fTPCSharedMap(trk.fTPCSharedMap),
   fTPCnclsF(trk.fTPCnclsF),
   fTPCClusterMap(trk.fTPCClusterMap),
   fTPCSharedMap(trk.fTPCSharedMap),
   fTPCnclsF(trk.fTPCnclsF),
@@ -219,6 +223,7 @@ AliAODTrack& AliAODTrack::operator=(const AliAODTrack& trk)
     fLabel             = trk.fLabel;    
     fITSMuonClusterMap = trk.fITSMuonClusterMap;
     fFilterMap         = trk.fFilterMap;
     fLabel             = trk.fLabel;    
     fITSMuonClusterMap = trk.fITSMuonClusterMap;
     fFilterMap         = trk.fFilterMap;
+    fTPCFitMap         = trk.fTPCFitMap;
     fTPCClusterMap     = trk.fTPCClusterMap;
     fTPCSharedMap      = trk.fTPCSharedMap;
     fTPCnclsF          = trk.fTPCnclsF;
     fTPCClusterMap     = trk.fTPCClusterMap;
     fTPCSharedMap      = trk.fTPCSharedMap;
     fTPCnclsF          = trk.fTPCnclsF;
index 600a25b..15e7838 100644 (file)
@@ -124,7 +124,7 @@ class AliAODTrack : public AliVTrack {
   virtual Bool_t   XvYvZv(Double_t x[3]) const { x[0] = Xv(); x[1] = Yv(); x[2] = Zv(); return kTRUE; }
 
   Double_t Chi2perNDF()  const { return fChi2perNDF; }
   virtual Bool_t   XvYvZv(Double_t x[3]) const { x[0] = Xv(); x[1] = Yv(); x[2] = Zv(); return kTRUE; }
 
   Double_t Chi2perNDF()  const { return fChi2perNDF; }
-  UShort_t GetTPCNcls()  const { return fTPCClusterMap.CountBits();}
+  UShort_t GetTPCNcls()  const { return fTPCFitMap.CountBits();}
   
   virtual Double_t M() const { return M(GetMostProbablePID()); }
   Double_t M(AODTrkPID_t pid) const;
   
   virtual Double_t M() const { return M(GetMostProbablePID()); }
   Double_t M(AODTrkPID_t pid) const;
@@ -235,11 +235,13 @@ class AliAODTrack : public AliVTrack {
   UInt_t  GetFilterMap() const {return fFilterMap;}
 
   const TBits& GetTPCClusterMap() const {return fTPCClusterMap;}
   UInt_t  GetFilterMap() const {return fFilterMap;}
 
   const TBits& GetTPCClusterMap() const {return fTPCClusterMap;}
+  const TBits& GetTPCFitMap() const {return fTPCFitMap;}
   Float_t GetTPCClusterInfo(Int_t nNeighbours=3, Int_t type=0, Int_t row0=0, Int_t row1=159) const;
   
   const TBits& GetTPCSharedMap() const {return fTPCSharedMap;}
   void    SetTPCClusterMap(const TBits amap) {fTPCClusterMap = amap;}
   void    SetTPCSharedMap(const TBits amap) {fTPCSharedMap = amap;}
   Float_t GetTPCClusterInfo(Int_t nNeighbours=3, Int_t type=0, Int_t row0=0, Int_t row1=159) const;
   
   const TBits& GetTPCSharedMap() const {return fTPCSharedMap;}
   void    SetTPCClusterMap(const TBits amap) {fTPCClusterMap = amap;}
   void    SetTPCSharedMap(const TBits amap) {fTPCSharedMap = amap;}
+  void    SetTPCFitMap(const TBits amap) {fTPCFitMap = amap;}
   void    SetTPCPointsF(UShort_t  findable){fTPCnclsF = findable;}
 
   UShort_t GetTPCNclsF() const { return fTPCnclsF;}
   void    SetTPCPointsF(UShort_t  findable){fTPCnclsF = findable;}
 
   UShort_t GetTPCNclsF() const { return fTPCnclsF;}
@@ -366,8 +368,10 @@ class AliAODTrack : public AliVTrack {
                                     // (ITS: bit 1-8, muon trigger: bit 9-16, muon tracker: bit 17-26, muon match trigger: bit 31-32) 
   UInt_t        fFilterMap;         // filter information, one bit per set of cuts
 
                                     // (ITS: bit 1-8, muon trigger: bit 9-16, muon tracker: bit 17-26, muon match trigger: bit 31-32) 
   UInt_t        fFilterMap;         // filter information, one bit per set of cuts
 
+  TBits         fTPCFitMap;      // Map of clusters, one bit per padrow; if has a cluster on given padrow which is used in the fit   
   TBits         fTPCClusterMap;     // Map of clusters, one bit per padrow; 1 if has a cluster on given padrow
   TBits         fTPCSharedMap;      // Map of clusters, one bit per padrow; 1 if has a shared cluster on given padrow
   TBits         fTPCClusterMap;     // Map of clusters, one bit per padrow; 1 if has a cluster on given padrow
   TBits         fTPCSharedMap;      // Map of clusters, one bit per padrow; 1 if has a shared cluster on given padrow
+
   UShort_t      fTPCnclsF;          // findable clusters
 
   Short_t       fID;                // unique track ID, points back to the ESD track
   UShort_t      fTPCnclsF;          // findable clusters
 
   Short_t       fID;                // unique track ID, points back to the ESD track
@@ -382,7 +386,7 @@ class AliAODTrack : public AliVTrack {
   AliAODPid    *fDetPid;            // more detailed or detector specific pid information
   TRef          fProdVertex;        // vertex of origin
 
   AliAODPid    *fDetPid;            // more detailed or detector specific pid information
   TRef          fProdVertex;        // vertex of origin
 
-  ClassDef(AliAODTrack, 14);
+  ClassDef(AliAODTrack, 15);
 };
 
 inline Bool_t  AliAODTrack::IsPrimaryCandidate() const
 };
 
 inline Bool_t  AliAODTrack::IsPrimaryCandidate() const