- added the ITS clusters/track in the track properties

- fixed bug, eta info was filled with theta
- added Reconfigure function
- defined binning and axes ranges for the distribitions in the configuration macro

diff --git a/HLT/global/AliHLTGlobalHistoComponent.cxx b/HLT/global/AliHLTGlobalHistoComponent.cxx
index d6bee46ef7dc7589634a23eff6d62242f1c69b03..745343712d4c1f7dbac1307ad5dc63c7eea6fd84 100644 (file)
--- a/HLT/global/AliHLTGlobalHistoComponent.cxx
+++ b/HLT/global/AliHLTGlobalHistoComponent.cxx
@@ -90,7 +90,8 @@ TTree* AliHLTGlobalHistoComponent::CreateTree(int /*argc*/, const char** /*argv*
     "Track_eta "
     "Track_p "
     "Track_theta "
     "Track_eta "
     "Track_p "
     "Track_theta "

-    "Track_Nclusters "
+    "Track_TPCclus "
+    "Track_ITSclus "

     "Track_status "
     "Track_charge "
     "Track_DCAr "
     "Track_status "
     "Track_charge "
     "Track_DCAr "


@@ -183,8 +184,8 @@ int AliHLTGlobalHistoComponent::FillTree(TTree* pTree, const AliHLTComponentEven
   ResetVariables();
 
   // fetch ESD from input stream
   ResetVariables();
 
   // fetch ESD from input stream

-  const TObject* obj = GetFirstInputObject(kAliHLTAllDataTypes, "AliESDEvent");
-  AliESDEvent* esd = dynamic_cast<AliESDEvent*>(const_cast<TObject*>(obj));
+  const TObject *obj = GetFirstInputObject(kAliHLTAllDataTypes, "AliESDEvent");
+  AliESDEvent *esd = dynamic_cast<AliESDEvent*>(const_cast<TObject*>(obj));

   esd->GetStdContent();
 
   // fill track variables
   esd->GetStdContent();
 
   // fill track variables


@@ -194,9 +195,9 @@ int AliHLTGlobalHistoComponent::FillTree(TTree* pTree, const AliHLTComponentEven
   fVertexZ         = esd->GetPrimaryVertexTracks()->GetZ();
   fNofContributors = esd->GetPrimaryVertexTracks()->GetNContributors();
   fVertexStatus    = esd->GetPrimaryVertexTracks()->GetStatus();
   fVertexZ         = esd->GetPrimaryVertexTracks()->GetZ();
   fNofContributors = esd->GetPrimaryVertexTracks()->GetNContributors();
   fVertexStatus    = esd->GetPrimaryVertexTracks()->GetStatus();

-  fNofV0s = esd->GetNumberOfV0s();
+  fNofV0s          = esd->GetNumberOfV0s();

   
   

-  if(fNofV0s > fMaxV0Count){
+  if(fFillV0==kTRUE && (fNofV0s > fMaxV0Count)){

      HLTWarning("Found V0s are %d, while component argument is %d, the respective TTree branch is not filled properly. Need to reconfigure.\n", fNofV0s, fMaxV0Count);
   }
   
      HLTWarning("Found V0s are %d, while component argument is %d, the respective TTree branch is not filled properly. Need to reconfigure.\n", fNofV0s, fMaxV0Count);
   }
   


@@ -209,10 +210,11 @@ int AliHLTGlobalHistoComponent::FillTree(TTree* pTree, const AliHLTComponentEven
       
       fTrackVariables.Fill("Track_pt"       , esdTrack->Pt()                      );
       fTrackVariables.Fill("Track_phi"       , esdTrack->Phi()*TMath::RadToDeg()   );
       
       fTrackVariables.Fill("Track_pt"       , esdTrack->Pt()                      );
       fTrackVariables.Fill("Track_phi"       , esdTrack->Phi()*TMath::RadToDeg()   );

-      fTrackVariables.Fill("Track_eta"       , esdTrack->Theta()                  );
+      fTrackVariables.Fill("Track_eta"       , esdTrack->Eta()                    );

       fTrackVariables.Fill("Track_p"        , esdTrack->P()                       );
       fTrackVariables.Fill("Track_theta"     , esdTrack->Theta()*TMath::RadToDeg() );
       fTrackVariables.Fill("Track_p"        , esdTrack->P()                       );
       fTrackVariables.Fill("Track_theta"     , esdTrack->Theta()*TMath::RadToDeg() );

-      fTrackVariables.Fill("Track_Nclusters" , esdTrack->GetTPCNcls()             );
+      fTrackVariables.Fill("Track_TPCclus"   , esdTrack->GetTPCNcls()             );
+      fTrackVariables.Fill("Track_ITSclus"   , esdTrack->GetNcls(0)               );

       fTrackVariables.Fill("Track_status"    , esdTrack->GetStatus()              );
       fTrackVariables.Fill("Track_charge"    , esdTrack->Charge()                 );
       fTrackVariables.Fill("Track_DCAr"      , DCAr                               );
       fTrackVariables.Fill("Track_status"    , esdTrack->GetStatus()              );
       fTrackVariables.Fill("Track_charge"    , esdTrack->Charge()                 );
       fTrackVariables.Fill("Track_DCAr"      , DCAr                               );


@@ -222,12 +224,9 @@ int AliHLTGlobalHistoComponent::FillTree(TTree* pTree, const AliHLTComponentEven
   }
   
   if(fFillV0==kTRUE){
   }
   
   if(fFillV0==kTRUE){

-     for(int i=0; i<fNofV0s; i++){
-     
-     
+     for(int i=0; i<fNofV0s; i++){     

         AliESDv0 *esdV0 = esd->GetV0(i);
         if(!esdV0) continue;
         AliESDv0 *esdV0 = esd->GetV0(i);
         if(!esdV0) continue;

-       

            
        //fV0Variables.Fill("V0_AP", ap);
        //fV0Variables.Fill("V0_pt", pt); 
            
        //fV0Variables.Fill("V0_AP", ap);
        //fV0Variables.Fill("V0_pt", pt); 

diff --git a/HLT/global/macros/makeGlobalHistoConfigObject.C b/HLT/global/macros/makeGlobalHistoConfigObject.C
index 1e65ebbe04ad1ab59e2ff0fdec6d0d486e22b5e9..316ee6e78cef6d40fff5841e8089ada1c57c9133 100644 (file)
--- a/HLT/global/macros/makeGlobalHistoConfigObject.C
+++ b/HLT/global/macros/makeGlobalHistoConfigObject.C
@@ -124,46 +124,26 @@ void makeGlobalHistoConfigObject()
 TString makeString(){
   
   TString s = "";
 TString makeString(){
   
   TString s = "";

+

   s+="-max-track-count 8000 ";
   s+="-max-track-count 8000 ";

+  //s+="-max-track-count 8000 -fill-V0 -max-V0-count 200 ";

   
   

-  s+="-histogram TrackPt -size 1000 -expression Track_pt -cut Track_Nclusters>0 ";
-  s+="-histogram TrackPhi(180,0,360) -size 1000 -expression Track_phi -cut Track_Nclusters>0 ";
-  s+="-histogram TrackMultiplicity -size 1000 -expression trackcount -cut Track_Nclusters>0 ";
-  s+="-histogram TrackEta -size 1000 -expression Track_eta -cut Track_Nclusters>0 ";
-  s+="-histogram TrackNclusters(200,0,200) -size 1000 -expression Track_Nclusters -cut Track_Nclusters>0 ";
-  s+="-histogram TrackTheta(90,0,180) -size 1000 -expression Track_theta -cut Track_Nclusters>0 ";
-  s+="-histogram TrackDCAr -size 1000 -expression Track_DCAr -cut Track_Nclusters>0 ";
-  s+="-histogram TrackCharge -size 1000 -expression Track_charge -cut Track_Nclusters>0 ";
+  s+="-histogram TrackPt(100,0,20) -size 1000 -expression Track_pt -cut Track_TPCclus>0 ";
+  s+="-histogram TrackPhi(180,0,360) -size 1000 -expression Track_phi -cut Track_TPCclus>0 ";
+  s+="-histogram TrackMultiplicity(500,0,10000) -size 1000 -expression trackcount -cut Track_TPCclus>0 ";
+  s+="-histogram TrackEta(100,-2,2) -size 1000 -expression Track_eta -cut Track_TPCclus>0 ";
+  s+="-histogram TrackTPCclus(200,0,200) -size 1000 -expression Track_TPCclus -cut Track_TPCclus>0 ";
+  s+="-histogram TrackITSclus(7,0,7) -size 1000 -expression Track_ITSclus -cut Track_ITSclus>0 ";
+  s+="-histogram TrackTheta(90,0,180) -size 1000 -expression Track_theta -cut Track_TPCclus>0 ";
+  s+="-histogram TrackDCAr(100,-50,50) -size 1000 -expression Track_DCAr -cut Track_TPCclus>0 ";
+  s+="-histogram TrackCharge -size 1000 -expression Track_charge -cut Track_TPCclus>0 ";

 
   s+="-histogram VertexXY -size 1000 -expression vertexY:vertexX -cut nContributors>3 -opt colz ";
 
   s+="-histogram VertexXY -size 1000 -expression vertexY:vertexX -cut nContributors>3 -opt colz ";

-  s+="-histogram VertexX  -size 1000 -expression vertexX -cut nContributors>3 ";
-  s+="-histogram VertexY  -size 1000 -expression vertexY -cut nContributors>3 ";
-  s+="-histogram VertexZ  -size 1000 -expression vertexZ -cut nContributors>3 ";
+  s+="-histogram VertexX(100,-20,20)  -size 1000 -expression vertexX -cut nContributors>3 ";
+  s+="-histogram VertexY(100,-20,20)  -size 1000 -expression vertexY -cut nContributors>3 ";
+  s+="-histogram VertexZ(200,-50,50)  -size 1000 -expression vertexZ -cut nContributors>3 ";

   s+="-histogram VertexTrendX -size 1000 -expression vertexX:event -cut nContributors>3 ";
   s+="-histogram VertexTrendY -size 1000 -expression vertexY:event -cut nContributors>3 ";
   s+="-histogram VertexTrendX -size 1000 -expression vertexX:event -cut nContributors>3 ";
   s+="-histogram VertexTrendY -size 1000 -expression vertexY:event -cut nContributors>3 ";

-
-  //s+= "-histogram UPC -size 1500 -expression (px_1+px_2)*(px_1+px_2)+(py_1+py_2)*(py_1+py_2) -cut nClusters_1>50&&nClusters_2>50 ";
-  //s+= "-histogram pt1square -size 1500 -expression px_1*px_1+py_1*py_1 -cut nClusters_1>50 ";
-  //s+= "-histogram pt2 -size 1500 -expression TMath::Sqrt(px_2*px_2+py_2*py_2) -cut nClusters_2>50 ";
-
+  

   return s;
 }
   return s;
 }

-/*
--histogram TrackPt -size 1000 -expression Track_pt -cut Track_Nclusters>0 
--histogram TrackPhi(180,0,360) -size 1000 -expression Track_phi -cut Track_Nclusters>0 
--histogram TrackMultiplicity -size 1000 -expression trackcount -cut Track_Nclusters>0 
--histogram TrackEta -size 1000 -expression Track_eta -cut Track_Nclusters>0 
--histogram TrackNclusters(200,0,200) -size 1000 -expression Track_Nclusters -cut Track_Nclusters>0 
--histogram TrackTheta(90,0,180) -size 1000 -expression Track_theta -cut Track_Nclusters>0 
--histogram TrackDCAr -size 1000 -expression Track_DCAr -cut Track_Nclusters>0 
--histogram TrackCharge -size 1000 -expression Track_charge -cut Track_Nclusters>0 
-
--histogram VertexXY -size 1000 -expression vertexY:vertexX -cut nContributors>3 -opt colz 
--histogram VertexX  -size 1000 -expression vertexX -cut nContributors>3 
--histogram VertexY  -size 1000 -expression vertexY -cut nContributors>3 
--histogram VertexZ  -size 1000 -expression vertexZ -cut nContributors>3 
--histogram VertexTrendX -size 1000 -expression vertexX:event -cut nContributors>3 
--histogram VertexTrendY -size 1000 -expression vertexY:event -cut nContributors>3 
-
--histogram UPC -size 1000 -expression TMath::Sqrt((px_1+px_2)*(px_1+px_2)+(py_1+py_2)*(py_1+py_2)) -cut nClusters_1>50&&nClusters_2>50 
-*/