From: mkrzewic <mkrzewic@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Mon, 4 Feb 2013 12:01:16 +0000 (+0000)
Subject: update to production version
X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=98a7c0411a8444d935ba15dd315e83410eedefbb;p=u%2Fmrichter%2FAliRoot.git

update to production version
---

diff --git a/PWGPP/CalibMacros/CPass0/mergeByComponent.C b/PWGPP/CalibMacros/CPass0/mergeByComponent.C
index c6b8ede93fb..10e028947cd 100644
--- a/PWGPP/CalibMacros/CPass0/mergeByComponent.C
+++ b/PWGPP/CalibMacros/CPass0/mergeByComponent.C
@@ -56,6 +56,12 @@ void MergeCPass(const Char_t *list, TString component, TString outputFileName="C
   //AliTPCcalibAlign::SetMergeEntriesCut(10000000);
   //AliTPCcalibTracks::SetMergeEntriesCut(10000000);
   //AliTPCcalibTime::SetResHistoMergeCut(10000000);
+
+   AliTPCcalibTimeGain::SetMergeEntriesCut(500000);
+   AliTPCcalibGainMult::SetMergeEntriesCut(500000);
+   AliTPCcalibAlign::SetMergeEntriesCut(5000000);
+   AliTPCcalibTracks::SetMergeEntriesCut(5000000);
+
   AliFileMerger merger;
   /* select what to merge */
   merger.SetNoTrees(kFALSE);
diff --git a/PWGPP/CalibMacros/CPass1/mergeByComponent.C b/PWGPP/CalibMacros/CPass1/mergeByComponent.C
index c6b8ede93fb..10e028947cd 100644
--- a/PWGPP/CalibMacros/CPass1/mergeByComponent.C
+++ b/PWGPP/CalibMacros/CPass1/mergeByComponent.C
@@ -56,6 +56,12 @@ void MergeCPass(const Char_t *list, TString component, TString outputFileName="C
   //AliTPCcalibAlign::SetMergeEntriesCut(10000000);
   //AliTPCcalibTracks::SetMergeEntriesCut(10000000);
   //AliTPCcalibTime::SetResHistoMergeCut(10000000);
+
+   AliTPCcalibTimeGain::SetMergeEntriesCut(500000);
+   AliTPCcalibGainMult::SetMergeEntriesCut(500000);
+   AliTPCcalibAlign::SetMergeEntriesCut(5000000);
+   AliTPCcalibTracks::SetMergeEntriesCut(5000000);
+
   AliFileMerger merger;
   /* select what to merge */
   merger.SetNoTrees(kFALSE);