Merge branch 'feature-movesplit'

[u/mrichter/AliRoot.git] / PWGPP / ITS / AliMeanVertexCalibTask.cxx

diff --git a/PWGPP/ITS/AliMeanVertexCalibTask.cxx b/PWGPP/ITS/AliMeanVertexCalibTask.cxx
index 76202f5a880545bce0cf30c4bac5fe98430886ac..89cbdf34c889c59604dc8aaca0c06753489f52d0 100644 (file)
--- a/PWGPP/ITS/AliMeanVertexCalibTask.cxx
+++ b/PWGPP/ITS/AliMeanVertexCalibTask.cxx
@@ -165,7 +165,7 @@ void AliMeanVertexCalibTask::UserExec(Option_t *)
   if(alimult) ntrklets = alimult->GetNumberOfTracklets();
   
   const char* beamType = esdE->GetBeamType();
-  Printf("beam type = %s", beamType);
+  // Printf("beam type = %s", beamType);
 
   Bool_t kLowFlux = kTRUE, kHighFlux = kFALSE;
   // TString pp= "p-p";
@@ -175,7 +175,7 @@ void AliMeanVertexCalibTask::UserExec(Option_t *)
   if (beamType == AA){ 
     kHighFlux = kTRUE;
     kLowFlux = kFALSE;
-    Printf ("high flux setting");
+    // Printf ("high flux setting");
     }
   
   AliCDBManager* man = AliCDBManager::Instance();
@@ -183,15 +183,15 @@ void AliMeanVertexCalibTask::UserExec(Option_t *)
   Int_t runNb = esdE->GetRunNumber();
   if (runNb > 0) {
     man->SetRun(runNb);
-    Printf("runNb = %d", runNb);
+    // Printf("runNb = %d", runNb);
   }
   
   AliCDBEntry *entry = (AliCDBEntry*)man->Get("GRP/Calib/RecoParam/");
-  Printf("entry = %p", entry);
+  // Printf("entry = %p", entry);
   TObjArray *arrayRecoParam=0x0;
   if (entry) {
     arrayRecoParam = (TObjArray*)entry->GetObject();
-    Printf("arrayRecoParam = %p", arrayRecoParam);
+    // Printf("arrayRecoParam = %p", arrayRecoParam);
   }
   else { 
     Printf("CDBEntry not found");
@@ -217,7 +217,7 @@ void AliMeanVertexCalibTask::UserExec(Option_t *)
 
   //track vertex recomputed from the vertexer
   AliESDVertex *trkv = vertexer->FindPrimaryVertex(esdE);
-  Printf ("trkv = %p", trkv); 
+  
   //const AliESDVertex *trkv = esdE->GetPrimaryVertexTracks();
   
   //SPD vertex taken from the ESD 
@@ -231,35 +231,35 @@ void AliMeanVertexCalibTask::UserExec(Option_t *)
     if(spdv->GetNContributors()>0) {
       TString title=spdv->GetTitle();
       if(title.Contains("3D")) {
-       ((TH1F*)fOutput->FindObject("hSPDVertexX"))->Fill(spdv->GetXv());
-       ((TH1F*)fOutput->FindObject("hSPDVertexY"))->Fill(spdv->GetYv());
+       ((TH1F*)fOutput->FindObject("hSPDVertexX"))->Fill(spdv->GetX());
+       ((TH1F*)fOutput->FindObject("hSPDVertexY"))->Fill(spdv->GetY());
       }
-      ((TH1F*)fOutput->FindObject("hSPDVertexZ"))->Fill(spdv->GetZv());
+      ((TH1F*)fOutput->FindObject("hSPDVertexZ"))->Fill(spdv->GetZ());
     }
   }
   
   
   if(trkv) {
     if(trkv->GetNContributors()>0) {
-      ((TH1F*)fOutput->FindObject("hTRKVertexX"))->Fill(trkv->GetXv());
-      ((TH1F*)fOutput->FindObject("hTRKVertexY"))->Fill(trkv->GetYv());
-      ((TH1F*)fOutput->FindObject("hTRKVertexZ"))->Fill(trkv->GetZv());
+      ((TH1F*)fOutput->FindObject("hTRKVertexX"))->Fill(trkv->GetX());
+      ((TH1F*)fOutput->FindObject("hTRKVertexY"))->Fill(trkv->GetY());
+      ((TH1F*)fOutput->FindObject("hTRKVertexZ"))->Fill(trkv->GetZ());
 
-      ((TH2F*)fOutput->FindObject("hTRKVertexXvsMult"))->Fill(trkv->GetXv(), ntrklets);
-      ((TH2F*)fOutput->FindObject("hTRKVertexYvsMult"))->Fill(trkv->GetYv(), ntrklets);
+      ((TH2F*)fOutput->FindObject("hTRKVertexXvsMult"))->Fill(trkv->GetX(), ntrklets);
+      ((TH2F*)fOutput->FindObject("hTRKVertexYvsMult"))->Fill(trkv->GetY(), ntrklets);
       
       if (ntrklets>30 && ntrklets<45){
-       ((TH1F*)fOutput->FindObject("hTRKVertexXdefMult"))->Fill(trkv->GetXv());
-       ((TH1F*)fOutput->FindObject("hTRKVertexYdefMult"))->Fill(trkv->GetYv());
+       ((TH1F*)fOutput->FindObject("hTRKVertexXdefMult"))->Fill(trkv->GetX());
+       ((TH1F*)fOutput->FindObject("hTRKVertexYdefMult"))->Fill(trkv->GetY());
       }
       
       if (ntrklets>1500){
-       ((TH1F*)fOutput->FindObject("hTRKVertexXHighMult"))->Fill(trkv->GetXv());
-       ((TH1F*)fOutput->FindObject("hTRKVertexYHighMult"))->Fill(trkv->GetYv());
+       ((TH1F*)fOutput->FindObject("hTRKVertexXHighMult"))->Fill(trkv->GetX());
+       ((TH1F*)fOutput->FindObject("hTRKVertexYHighMult"))->Fill(trkv->GetY());
       }
       
-      ((TH2F*)fOutput->FindObject("hTRKVertexXZ"))->Fill(trkv->GetXv(),trkv->GetZv());
-      ((TH2F*)fOutput->FindObject("hTRKVertexYZ"))->Fill(trkv->GetYv(),trkv->GetZv());
+      ((TH2F*)fOutput->FindObject("hTRKVertexXZ"))->Fill(trkv->GetX(),trkv->GetZ());
+      ((TH2F*)fOutput->FindObject("hTRKVertexYZ"))->Fill(trkv->GetY(),trkv->GetZ());
       
     }
   }
@@ -267,25 +267,25 @@ void AliMeanVertexCalibTask::UserExec(Option_t *)
   if (itsSAv){
     if (itsSAv->GetNContributors()>0){
       
-      ((TH1F*)fOutput->FindObject("hITSSAVertexX"))->Fill(itsSAv->GetXv());
-      ((TH1F*)fOutput->FindObject("hITSSAVertexY"))->Fill(itsSAv->GetYv());
-      ((TH1F*)fOutput->FindObject("hITSSAVertexZ"))->Fill(itsSAv->GetZv());
+      ((TH1F*)fOutput->FindObject("hITSSAVertexX"))->Fill(itsSAv->GetX());
+      ((TH1F*)fOutput->FindObject("hITSSAVertexY"))->Fill(itsSAv->GetY());
+      ((TH1F*)fOutput->FindObject("hITSSAVertexZ"))->Fill(itsSAv->GetZ());
 
-      ((TH2F*)fOutput->FindObject("hITSSAVertexXvsMult"))->Fill(itsSAv->GetXv(), ntrklets);
-      ((TH2F*)fOutput->FindObject("hITSSAVertexYvsMult"))->Fill(itsSAv->GetYv(), ntrklets);
+      ((TH2F*)fOutput->FindObject("hITSSAVertexXvsMult"))->Fill(itsSAv->GetX(), ntrklets);
+      ((TH2F*)fOutput->FindObject("hITSSAVertexYvsMult"))->Fill(itsSAv->GetY(), ntrklets);
       
       if (ntrklets>30 && ntrklets<45){
-       ((TH1F*)fOutput->FindObject("hITSSAVertexXdefMult"))->Fill(itsSAv->GetXv());
-       ((TH1F*)fOutput->FindObject("hITSSAVertexYdefMult"))->Fill(itsSAv->GetYv());
+       ((TH1F*)fOutput->FindObject("hITSSAVertexXdefMult"))->Fill(itsSAv->GetX());
+       ((TH1F*)fOutput->FindObject("hITSSAVertexYdefMult"))->Fill(itsSAv->GetY());
       }
       
       if (ntrklets>1500){
-       ((TH1F*)fOutput->FindObject("hITSSAVertexXHighMult"))->Fill(itsSAv->GetXv());
-       ((TH1F*)fOutput->FindObject("hITSSAVertexYHighMult"))->Fill(itsSAv->GetYv());
+       ((TH1F*)fOutput->FindObject("hITSSAVertexXHighMult"))->Fill(itsSAv->GetX());
+       ((TH1F*)fOutput->FindObject("hITSSAVertexYHighMult"))->Fill(itsSAv->GetY());
       }
       
-      ((TH2F*)fOutput->FindObject("hITSSAVertexXZ"))->Fill(itsSAv->GetXv(),itsSAv->GetZv());
-      ((TH2F*)fOutput->FindObject("hITSSAVertexYZ"))->Fill(itsSAv->GetYv(),itsSAv->GetZv());
+      ((TH2F*)fOutput->FindObject("hITSSAVertexXZ"))->Fill(itsSAv->GetX(),itsSAv->GetZ());
+      ((TH2F*)fOutput->FindObject("hITSSAVertexYZ"))->Fill(itsSAv->GetY(),itsSAv->GetZ());
       
     }
   }