From: mivanov Date: Tue, 17 Sep 2013 17:11:34 +0000 (+0000) Subject: Updated macro to calculate space charge fluctuation X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=f0085660a7bfb46c0f6c2562dda5bd6f00b398b7;p=u%2Fmrichter%2FAliRoot.git Updated macro to calculate space charge fluctuation (Marian) --- diff --git a/TPC/Upgrade/macros/spaceChargeFluctuation.C b/TPC/Upgrade/macros/spaceChargeFluctuation.C index 5fddf6f1913..274dc033dd0 100644 --- a/TPC/Upgrade/macros/spaceChargeFluctuation.C +++ b/TPC/Upgrade/macros/spaceChargeFluctuation.C @@ -1316,7 +1316,7 @@ void MakeSpaceChargeFluctuationScan(Double_t scale, Int_t nfilesMerge, Int_t sig // // Make Z scan corrections // - if (1){ + if (0){ for (Int_t ihis=1; ihis<=9; ihis+=2){ TH3 *his3DZ = PermutationHistoZ(his3DReference,16*(ihis)); AliTPCSpaceCharge3D *spaceChargeZ = new AliTPCSpaceCharge3D; @@ -1521,6 +1521,14 @@ void MakeSpaceChargeFluctuationScan(Double_t scale, Int_t nfilesMerge, Int_t sig AliExternalTrackParam *ot1= new AliExternalTrackParam(vertex, pxyz, cv, psign); AliExternalTrackParam *td0 = corr->FitDistortedTrack(*ot0, refX0, dir, 0); AliExternalTrackParam *td1 = corr->FitDistortedTrack(*ot1, refX1, dir, 0); + if (td0==0) { // if fit fail use dummy values + ot0= new AliExternalTrackParam(vertex, pxyz, cv, psign); + td0= new AliExternalTrackParam(vertex, pxyz, cv, psign); + } + if (td1==0) { + ot1= new AliExternalTrackParam(vertex, pxyz, cv, psign); + td1= new AliExternalTrackParam(vertex, pxyz, cv, psign); + } // 2. TPC constrained umulation AliExternalTrackParam *tdConstrained = new AliExternalTrackParam(*td1); tdConstrained->Rotate(ot1->GetAlpha()); @@ -1557,7 +1565,7 @@ void MakeSpaceChargeFluctuationScan(Double_t scale, Int_t nfilesMerge, Int_t sig snprintf(name0, 100, "T_%s_0.=",corr->GetName()); snprintf(name1, 100, "T_%s_1.=",corr->GetName()); snprintf(oname0, 100, "OT_%s_0.=",corr->GetName()); - snprintf(oname1, 100, "T_%s_1.=",corr->GetName()); + snprintf(oname1, 100, "OT_%s_1.=",corr->GetName()); snprintf(onameConstrained, 100, "OConst_%s_1.=",corr->GetName()); // snprintf(nameITS, 100, "TPCITS_%s_1.=",corr->GetName());