diff --git a/macros/CCEScan/voltageFit_spline.C b/macros/CCEScan/voltageFit_spline.C index fad064b..658dfc2 100755 --- a/macros/CCEScan/voltageFit_spline.C +++ b/macros/CCEScan/voltageFit_spline.C @@ -308,16 +308,18 @@ // Extract the ratio values for the sampling point - TVectorD* vp_ratio = (TVectorD*)f_ratio->Get(Form("v_ratio_%s",lay.Data())); - TVectorD* vp_secRatio = (TVectorD*)f_ratio->Get(Form("v_sector_%s",lay.Data())); + TVectorD* vp_ratio = (TVectorD*)f_ratio->Get(Form("v_ratio_%s",lay.Data())); + TVectorD* vp_ratio_err = (TVectorD*)f_ratio->Get(Form("v_ratio_err_%s",lay.Data())); + TVectorD* vp_secRatio = (TVectorD*)f_ratio->Get(Form("v_sector_%s",lay.Data())); - if (!vp_ratio || !vp_secRatio) { + if (!vp_ratio || !vp_secRatio || !vp_ratio_err) { Error("voltageFit_spline","Ratio vectors not available"); Printf("=========================================\n"); return EXIT_FAILURE; } TVectorD v_ratio = *vp_ratio; + TVectorD v_ratio_err = *vp_ratio_err; TVectorD v_secRatio = *vp_secRatio; TF1* fu_volt = STTool::Constfunc; @@ -330,12 +332,16 @@ ratio_err = STTool::TTratio_err; } - // Using ratio per bin - if (false && det.EqualTo("TT")) { + /* Elena + // if (false && det.EqualTo("TT")) { + */ + // Using ratio per sector + if (true) { int ratioInd = getClosestIndex(v_secRatio,(double)sector); if (!(ratioInd<0) && (int)v_secRatio(ratioInd)==sector && true) { Info("voltageFit_spline","Using specific ratio for sector %d",sector); ratio_val = v_ratio(ratioInd); + ratio_err = v_ratio_err(ratioInd); } }