Merge branch 'histos'

* histos:
  Removed excessive loggin statements
  Added histogram features, improved code
  removed cout statements

diff --git a/HLT/global/AliHLTGlobalTrackMatcher.cxx b/HLT/global/AliHLTGlobalTrackMatcher.cxx
index 0944bed51dc85d023a72f456af56a5bfb893cae7..1d94f9a9a6df835c778340b2e21af3fb77ca2d5f 100644 (file)
--- a/HLT/global/AliHLTGlobalTrackMatcher.cxx
+++ b/HLT/global/AliHLTGlobalTrackMatcher.cxx
@@ -85,7 +85,7 @@ Int_t AliHLTGlobalTrackMatcher::AddTrackToCluster(Int_t tId, TArrayI* matchedTra
 
 Int_t AliHLTGlobalTrackMatcher::AddTrackToCluster(Int_t tId, Int_t* matchArray, bool bestMatch, Int_t nMatches ){
 
-  HLTInfo("Adding track %d to cluster with %d previous matches", tId, nMatches);
+  //  HLTInfo("Adding track %d to cluster with %d previous matches", tId, nMatches);
   
   //BALLE TODO: remove hardcoded 9
   if (nMatches > 9) {                                                   //BALLE this on tooo
@@ -114,7 +114,7 @@ Bool_t AliHLTGlobalTrackMatcher::IsTrackCloseToDetector(AliExternalTrackParam *
     return kFALSE;
   }
 
-  HLTInfo("Track coordinate at R = PHOS radius %f %f %f", trackPosition[0],trackPosition[1],trackPosition[2]);
+  //  HLTInfo("Track coordinate at R = PHOS radius %f %f %f", trackPosition[0],trackPosition[1],trackPosition[2]);
 
 
   //Positive y for EMCAL, negative for PHOS
@@ -133,7 +133,7 @@ Bool_t AliHLTGlobalTrackMatcher::IsTrackCloseToDetector(AliExternalTrackParam *
   if (TMath::Abs(trackPosition[0]) > fMaxX )
     return kFALSE;
 
-  HLTInfo("kTRUE");
+  // HLTInfo("kTRUE");
   
   return kTRUE;  
 }

diff --git a/HLT/global/AliHLTGlobalTrackMatcher.h b/HLT/global/AliHLTGlobalTrackMatcher.h
index 73723a4678b9547566105029073556c2663881cc..0f7485533202d900498365de7666e0b6e0c1146d 100644 (file)
--- a/HLT/global/AliHLTGlobalTrackMatcher.h
+++ b/HLT/global/AliHLTGlobalTrackMatcher.h
@@ -76,10 +76,10 @@ Int_t AliHLTGlobalTrackMatcher::Match( TObjArray * trackArray, vector<T*>  &clus
   Int_t nEmcalClusters = 0; //BALLE event->GetEMCALClusters(fEmcalClustersArray);
   
   if ( nTracks <= 0 ) {
-    HLTWarning("No tracks in event");
+    //    HLTWarning("No tracks in event");
     return 0;
   } else if  ( (nEmcalClusters <= 0) && (nPhosClusters <= 0))  {
-    HLTWarning("No calorimeter clusters in Event"); 
+    //HLTWarning("No calorimeter clusters in Event"); 
     return 0;
   }
 
@@ -141,7 +141,7 @@ Int_t AliHLTGlobalTrackMatcher::MatchTrackToClusters( AliExternalTrackParam * tr
     }
 
 
-    HLTInfo("Cluster global position %f %f %f", clusterPosition[0],clusterPosition[1],clusterPosition[2]);
+    //    HLTInfo("Cluster global position %f %f %f", clusterPosition[0],clusterPosition[1],clusterPosition[2]);
 
     
     //Calculate track - cluster residual
@@ -160,7 +160,7 @@ Int_t AliHLTGlobalTrackMatcher::MatchTrackToClusters( AliExternalTrackParam * tr
   
     Double_t match = dz + dxy;
     
-    HLTInfo("Track cluster residual %f, maxmatch %f", match, fMatchDistance);
+    //    HLTInfo("Track cluster residual %f, maxmatch %f", match, fMatchDistance);
     
     if( match > fMatchDistance  )  {     
       continue;
@@ -176,7 +176,7 @@ Int_t AliHLTGlobalTrackMatcher::MatchTrackToClusters( AliExternalTrackParam * tr
     //Add track to cluster's array of matching tracks
     Int_t nTracksMatched = cluster->GetNTracksMatched();
     iResult = AddTrackToCluster(track->GetID(), cluster->GetTracksMatched(), match < bestMatch[ic], nTracksMatched);
-    HLTInfo("Added track %d to cluster %d, it now has %d matching tracks", track->GetID(), cluster->GetID(), cluster->GetNTracksMatched());
+    //HLTInfo("Added track %d to cluster %d, it now has %d matching tracks", track->GetID(), cluster->GetID(), cluster->GetNTracksMatched());
   }
   
   return iResult;

diff --git a/HLT/global/AliHLTGlobalTrackMatcherComponent.cxx b/HLT/global/AliHLTGlobalTrackMatcherComponent.cxx
index 034391a246fe6ac154861ab4f5935aa6f84f02aa..ad50e90f53640cfc695aa36cf4d001561390b53c 100644 (file)
--- a/HLT/global/AliHLTGlobalTrackMatcherComponent.cxx
+++ b/HLT/global/AliHLTGlobalTrackMatcherComponent.cxx
@@ -214,7 +214,7 @@ int AliHLTGlobalTrackMatcherComponent::DoEvent(const AliHLTComponentEventData& /
      }
      
      if(iResult <0) {
-       HLTWarning("Error in track matcher");
+       //HLTWarning("Error in track matcher");
      }
      PushBack(pBlock->fPtr, pBlock->fSize, pBlock->fDataType, pBlock->fSpecification);
      //PushBack(pBlock->fPtr, pBlock->fSize, kAliHLTDataTypeCaloCluster | kAliHLTDataOriginAny );

diff --git a/HLT/global/physics/AliHLTCaloHistoClusterEnergy.cxx b/HLT/global/physics/AliHLTCaloHistoClusterEnergy.cxx
index baba871adb014a3a43d4bda740c15e5622ad4f22..69e9b57339451f365d4de48f6271d94a3855496d 100644 (file)
--- a/HLT/global/physics/AliHLTCaloHistoClusterEnergy.cxx
+++ b/HLT/global/physics/AliHLTCaloHistoClusterEnergy.cxx
@@ -77,7 +77,7 @@ Int_t AliHLTCaloHistoClusterEnergy::FillHistograms(Int_t nc, TRefArray * cluster
 }
 Int_t AliHLTCaloHistoClusterEnergy::FillHistograms(Int_t nc, vector<AliHLTCaloClusterDataStruct*> &cVec) {
   //See header file for documentation
-  HLTInfo("histo");
+  // HLTInfo("histo");
   for(int ic = 0; ic < nc; ic++) {
     AliHLTCaloClusterDataStruct * cluster = cVec.at(ic);
     return FillClusterEnergyHistos(cluster);

diff --git a/HLT/global/physics/AliHLTCaloHistoComponent.cxx b/HLT/global/physics/AliHLTCaloHistoComponent.cxx
index 22435dc25b8ef73ff73125cfe5d6b7c6550f639c..8c095cdc358f6176a538effb8586e88fe35f3d07 100644 (file)
--- a/HLT/global/physics/AliHLTCaloHistoComponent.cxx
+++ b/HLT/global/physics/AliHLTCaloHistoComponent.cxx
@@ -225,14 +225,14 @@ Int_t AliHLTCaloHistoComponent::DoEvent(const AliHLTComponentEventData& /*evtDat
 
   
   if (fDoEmcal) {
-    HLTInfo("Processing EMCAL blocks");
+    //    HLTInfo("Processing EMCAL blocks");
     for (const AliHLTComponentBlockData* pBlock=GetFirstInputBlock( kAliHLTDataTypeCaloCluster | kAliHLTDataOriginEMCAL ); pBlock!=NULL; pBlock=GetNextInputBlock()) {
       ProcessBlocks(pBlock, fEmcalHistogramArray);
     }
   }
 
   if (fDoPhos) {
-    HLTInfo("Processing PHOS blocks");
+    //HLTInfo("Processing PHOS blocks");
     for (const AliHLTComponentBlockData* pBlock=GetFirstInputBlock( kAliHLTDataTypeCaloCluster | kAliHLTDataOriginPHOS ); pBlock!=NULL; pBlock=GetNextInputBlock()) {
       ProcessBlocks(pBlock, fPhosHistogramArray);
     }
@@ -240,11 +240,11 @@ Int_t AliHLTCaloHistoComponent::DoEvent(const AliHLTComponentEventData& /*evtDat
 
   //Push histos
   for(int ih = 0; ih < fPhosHistogramArray->GetEntriesFast(); ih++) {
-    HLTInfo("Pushing PHOS histograms");
+    //HLTInfo("Pushing PHOS histograms");
     PushBack(static_cast<AliHLTCaloHistoProducer*>(fPhosHistogramArray->At(ih))->GetHistograms(), kAliHLTDataTypeHistogram | kAliHLTDataOriginPHOS );
   }
   for(int ih = 0; ih < fEmcalHistogramArray->GetEntriesFast(); ih++) {
-    HLTInfo("Pushing EMCAL histograms");
+    //HLTInfo("Pushing EMCAL histograms");
     PushBack(static_cast<AliHLTCaloHistoProducer*>(fEmcalHistogramArray->At(ih))->GetHistograms(), kAliHLTDataTypeHistogram | kAliHLTDataOriginEMCAL );
   }
 

diff --git a/HLT/global/physics/AliHLTCaloHistoMatchedTracks.cxx b/HLT/global/physics/AliHLTCaloHistoMatchedTracks.cxx
index f9153bb6200006e36c3a08ecb351d70323d333e8..d553cc38b2ac05ec74f780084aeab2b5737a1e4a 100644 (file)
--- a/HLT/global/physics/AliHLTCaloHistoMatchedTracks.cxx
+++ b/HLT/global/physics/AliHLTCaloHistoMatchedTracks.cxx
@@ -113,7 +113,7 @@ Int_t AliHLTCaloHistoMatchedTracks::FillHistograms(Int_t nc, vector<AliHLTCaloCl
 
 template <class T>
 Int_t AliHLTCaloHistoMatchedTracks::FillMatchedTracks(T* cluster){
-  HLTInfo("Filling track-matching histograms");
+  // HLTInfo("Filling track-matching histograms");
 
   if(cluster->GetNTracksMatched() > 0) {
     fHistMatchedEnergy->Fill(cluster->E());