Adding protection for TPCAlign objects in mergeByComponent for CPass0, as in CPass1...
authorzampolli <Chiara.Zampolli@cern.ch>
Sun, 17 Aug 2014 08:38:19 +0000 (10:38 +0200)
committerzampolli <Chiara.Zampolli@cern.ch>
Sun, 17 Aug 2014 08:38:19 +0000 (10:38 +0200)
PWGPP/CalibMacros/CPass0/mergeByComponent.C
PWGPP/CalibMacros/CPass0/runCalibTrain.C
PWGPP/CalibMacros/CPass1/runCalibTrain.C

index 10e0289..704668a 100644 (file)
@@ -69,6 +69,18 @@ void MergeCPass(const Char_t *list, TString component, TString outputFileName="C
     merger.AddReject("esdFriend");
   else
     merger.AddAccept(component.Data());
+  //
+  // temporary solution: reject THn and THnSparse of  TPCAlign directory, since they
+  // will be merged using their owner AliTPCcalibAlign object
+  {
+    merger.AddReject("AliTPCcalibAlign.alignTPC.fClusterDelta_0");
+    merger.AddReject("AliTPCcalibAlign.alignTPC.fClusterDelta_1");
+    merger.AddReject("AliTPCcalibAlign.alignTPC.fTrackletDelta_0");
+    merger.AddReject("AliTPCcalibAlign.alignTPC.fTrackletDelta_1");
+    merger.AddReject("AliTPCcalibAlign.alignTPC.fTrackletDelta_2");
+    merger.AddReject("AliTPCcalibAlign.alignTPC.fTrackletDelta_3");
+  }
+  //
   /* merge */
   merger.IterTXT(list, outputFileName.Data(), kFALSE);
   /* notify */
index bdae696..1fa5643 100644 (file)
@@ -111,8 +111,7 @@ void runCalibTrain(Int_t runNumber, const char *inFileName = "AliESDs.root", con
   mgr->AddTask(clgmTask);
   AliAnalysisDataContainer *dummyInp = mgr->GetCommonInputContainer();
   if (dummyInp) mgr->ConnectInput(clgmTask,0,dummyInp);
-  // dummy task to clean geometry in Terminate <<<<
-   //
+
   // Run the analysis
   AliSysInfo::AddStamp("BeforeInitAnalysis");
   if (!mgr->InitAnalysis()) {
index 0e389d5..af66856 100644 (file)
@@ -107,8 +107,7 @@ void runCalibTrain(Int_t runNumber, const char *inFileName = "AliESDs.root", con
   mgr->AddTask(clgmTask);
   AliAnalysisDataContainer *dummyInp = mgr->GetCommonInputContainer();
   if (dummyInp) mgr->ConnectInput(clgmTask,0,dummyInp);
-  // dummy task to clean geometry in Terminate <<<<
-  //
+
   // Run the analysis
   AliSysInfo::AddStamp("BeforeInitAnalysis");
   if (!mgr->InitAnalysis()) {