Update for SPD alignement (included in SDD calibration) - Ruben

diff --git a/PWGPP/CalibMacros/CPass0/AddTaskSDDCalib.C b/PWGPP/CalibMacros/CPass0/AddTaskSDDCalib.C
index 3e27913f67b9624da80fef64741cd364078cd47a..c9be8a3e27ad41116c9f4d22738dc1cd26bff159 100644 (file)
--- a/PWGPP/CalibMacros/CPass0/AddTaskSDDCalib.C
+++ b/PWGPP/CalibMacros/CPass0/AddTaskSDDCalib.C
@@ -1,4 +1,4 @@
-AliAnalysisTaskITSAlignQA *AddTaskSDDCalib(Int_t nrun=0) 
+AliAnalysisTaskITSAlignQA *AddTaskSDDCalib(Int_t nrun=0, Bool_t writeITSTP=kFALSE, Bool_t useTPCcrv=kFALSE) 
 {
 
   AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
@@ -18,6 +18,13 @@ AliAnalysisTaskITSAlignQA *AddTaskSDDCalib(Int_t nrun=0)
     return NULL;
   }
   
+  if (writeITSTP) {
+    AliAODHandler* aodHandler = new AliAODHandler();
+    aodHandler->SetOutputFileName( "AODtpITS.root" );
+    aodHandler->SetCreateNonStandardAOD();
+    mgr->SetOutputEventHandler(aodHandler);
+  }
+
   // Create and configure the task
   AliAnalysisTaskITSAlignQA *taskali = new AliAnalysisTaskITSAlignQA();
   //  taskali->SelectCollisionCandidates();
@@ -32,7 +39,9 @@ AliAnalysisTaskITSAlignQA *AddTaskSDDCalib(Int_t nrun=0)
   taskali->SetDoSSDResiduals(kFALSE);
   taskali->SetDoSDDDriftTime(kFALSE);
   taskali->SetMinMaxMult(20.,1070.);
+  taskali->SetUseTPCMomentum(useTPCcrv);
   //
+  taskali->SetDoFillTPTree(writeITSTP);
   //
   TString outputFileName = AliAnalysisManager::GetCommonFileName();
   

diff --git a/PWGPP/CalibMacros/CPass0/CPass0.jdl b/PWGPP/CalibMacros/CPass0/CPass0.jdl
index 8c745bcc96e765b682b5260fea17ef3d7b9c97da..2b81b5e822a73e6a6f3929931be6b68512ca3297 100644 (file)
--- a/PWGPP/CalibMacros/CPass0/CPass0.jdl
+++ b/PWGPP/CalibMacros/CPass0/CPass0.jdl
@@ -39,5 +39,5 @@ InputDataCollection="LF:/alice/data/2011/LHC11a/$1/collection,nodownload";
 OutputDir="/alice/cern.ch/user/j/jotwinow/CPass0/output/$1/#alienfilename/.root//#";
 
 OutputArchive={"log_archive:*.log@disk=1",
-              "root_archive.zip:AliESDfriends_v1.root,@disk=1"};
+              "root_archive.zip:AliESDfriends_v1.root,AODtpITS.root,@disk=1"};
 

diff --git a/PWGPP/CalibMacros/CPass0/runCalibTrain.C b/PWGPP/CalibMacros/CPass0/runCalibTrain.C
index e32f027c0493ac124fbcf73a26e63743d8477493..060858168c2e722db1793dc7c8701e20f8721693 100644 (file)
--- a/PWGPP/CalibMacros/CPass0/runCalibTrain.C
+++ b/PWGPP/CalibMacros/CPass0/runCalibTrain.C
@@ -66,7 +66,10 @@ void runCalibTrain(TString runNumberString, const char *inFileName = "AliESDs.ro
   AliTOFAnalysisTaskCalibPass0 *thisTask = AddTOFAnalysisTaskCalibPass0();
   AliAnalysisTask* tT0 = AddTaskT0Calib(runNumber);
   AliMeanVertexCalibTask *tMeanVtx = AddTaskMeanVertexCalib();
-  AliAnalysisTaskITSAlignQA *itsAlign = AddTaskSDDCalib();
+  //
+  Bool_t useTPCcrv  = kTRUE;
+  Bool_t writeITSTP = kFALSE;
+  AliAnalysisTaskITSAlignQA *itsAlign = AddTaskSDDCalib(0,writeITSTP,useTPCcrv);
 
   // Run the analysis
   if (!mgr->InitAnalysis()) {

diff --git a/PWGPP/CalibMacros/CPass1/AddTaskSDDCalib.C b/PWGPP/CalibMacros/CPass1/AddTaskSDDCalib.C
index 3e27913f67b9624da80fef64741cd364078cd47a..c9be8a3e27ad41116c9f4d22738dc1cd26bff159 100644 (file)
--- a/PWGPP/CalibMacros/CPass1/AddTaskSDDCalib.C
+++ b/PWGPP/CalibMacros/CPass1/AddTaskSDDCalib.C
@@ -1,4 +1,4 @@
-AliAnalysisTaskITSAlignQA *AddTaskSDDCalib(Int_t nrun=0) 
+AliAnalysisTaskITSAlignQA *AddTaskSDDCalib(Int_t nrun=0, Bool_t writeITSTP=kFALSE, Bool_t useTPCcrv=kFALSE) 
 {
 
   AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
@@ -18,6 +18,13 @@ AliAnalysisTaskITSAlignQA *AddTaskSDDCalib(Int_t nrun=0)
     return NULL;
   }
   
+  if (writeITSTP) {
+    AliAODHandler* aodHandler = new AliAODHandler();
+    aodHandler->SetOutputFileName( "AODtpITS.root" );
+    aodHandler->SetCreateNonStandardAOD();
+    mgr->SetOutputEventHandler(aodHandler);
+  }
+
   // Create and configure the task
   AliAnalysisTaskITSAlignQA *taskali = new AliAnalysisTaskITSAlignQA();
   //  taskali->SelectCollisionCandidates();
@@ -32,7 +39,9 @@ AliAnalysisTaskITSAlignQA *AddTaskSDDCalib(Int_t nrun=0)
   taskali->SetDoSSDResiduals(kFALSE);
   taskali->SetDoSDDDriftTime(kFALSE);
   taskali->SetMinMaxMult(20.,1070.);
+  taskali->SetUseTPCMomentum(useTPCcrv);
   //
+  taskali->SetDoFillTPTree(writeITSTP);
   //
   TString outputFileName = AliAnalysisManager::GetCommonFileName();
   

diff --git a/PWGPP/CalibMacros/CPass1/CPass1.jdl b/PWGPP/CalibMacros/CPass1/CPass1.jdl
index bc7f9569f90081359cfba19732ef886ac417b506..d77e171bca2865b436a995a95c3282773f05e7d2 100644 (file)
--- a/PWGPP/CalibMacros/CPass1/CPass1.jdl
+++ b/PWGPP/CalibMacros/CPass1/CPass1.jdl
@@ -41,7 +41,7 @@ OutputDir="/alice/cern.ch/user/j/jotwinow/CPass1/output/$1/#alienfilename/.root/
 
 
 OutputArchive={"log_archive:stderr.log,stdout.log,qa.log,sys*.log@disk=1",
-              "root_archive.zip:AliESDs.root,AliESDfriends.root,AliESDfriends_v1.root,Merged.QA.Data*.root,RecoQAresults.root@disk=3",
+              "root_archive.zip:AliESDs.root,AliESDfriends.root,AliESDfriends_v1.root,Merged.QA.Data*.root,RecoQAresults.root,AODtpITS.root@disk=3",
               "QA_archive.zip:QAresults.root,*.stat.qa@disk=2"
 };
 

diff --git a/PWGPP/CalibMacros/CPass1/runCalibTrain.C b/PWGPP/CalibMacros/CPass1/runCalibTrain.C
index 52e5ed4aa52e34af97975c0d8f6b39fd7bdcf8f3..a665c1f0a7873a2624d8a95708d3363af0017d38 100644 (file)
--- a/PWGPP/CalibMacros/CPass1/runCalibTrain.C
+++ b/PWGPP/CalibMacros/CPass1/runCalibTrain.C
@@ -66,7 +66,10 @@ void runCalibTrain(TString runNumberString, const char *inFileName = "AliESDs.ro
   AliTOFAnalysisTaskCalibPass0 *thisTask = AddTOFAnalysisTaskCalibPass0();
   AliAnalysisTask* tT0 = AddTaskT0Calib(runNumber);
   //AliMeanVertexCalibTask *tMeanVtx = AddTaskMeanVertexCalib();
-  AliAnalysisTaskITSAlignQA *itsAlign = AddTaskSDDCalib();
+  //
+  Bool_t useTPCcrv=kFALSE;
+  Bool_t writeITSTP = kTRUE;
+  AliAnalysisTaskITSAlignQA *itsAlign = AddTaskSDDCalib(0,writeITSTP,useTPCcrv);
 
   // Run the analysis
   if (!mgr->InitAnalysis()) {