diff --git a/data/db/systVolt.root b/data/db/systVolt.root index ae37bff..29b8db9 100644 --- a/data/db/systVolt.root +++ b/data/db/systVolt.root Binary files differ diff --git a/macros/CCEScan/deplTool.h b/macros/CCEScan/deplTool.h index 1bd1889..940af95 100755 --- a/macros/CCEScan/deplTool.h +++ b/macros/CCEScan/deplTool.h @@ -170,7 +170,7 @@ else{ return timeMap_post[step%6]*timestep; } - + } // Returns TT voltage in V for a given calibration step @@ -196,10 +196,10 @@ std::map timeMap_sw; if(fill>2252){ - timeMap_sw = timeMap_post + timeMap_sw = timeMap_post; } else{ - timeMap_sw = timeMap + timeMap_sw = timeMap; } std::map::const_iterator timeEnd = timeMap_sw.end(); @@ -222,10 +222,10 @@ std::map timeMap_sw; if(fill>2252){ - timeMap_sw = timeMap_post + timeMap_sw = timeMap_post; } else{ - timeMap_sw = timeMap + timeMap_sw = timeMap; } std::map::const_iterator timeEnd = timeMap_sw.end(); @@ -518,4 +518,4 @@ -}; + }; diff --git a/macros/CCEScan/landauFit.C b/macros/CCEScan/landauFit.C index 49c0512..a6b322c 100755 --- a/macros/CCEScan/landauFit.C +++ b/macros/CCEScan/landauFit.C @@ -422,12 +422,12 @@ sPDF->plotOn(sFrame,RooFit::Components(*nG),RooFit::LineColor(kBlue),RooFit::LineStyle(kDashed)); sPDF->plotOn(sFrame,RooFit::Components(*landauConv),RooFit::LineColor(kRed),RooFit::LineStyle(9)); sPDF->plotOn(sFrame,RooFit::Components(*landauConvPhoto),RooFit::LineColor(kRed),RooFit::LineStyle(kDashed)); - Double_t chi2 = sPDF->GetChisquare();//Michele + Info("landauFit","Results: "); Printf(" MPV: %5.2f+/-%5.2f ADC counts",v_res(0),v_res(1)); Printf(" Noise: %5.2f+/-%5.2f ADC counts",v_res(2),v_res(3)); - Printf(" Chi2: %5.2f counts",chi2);//MIchele + if (nRes->status()==0) { Info("landauFit","Signal fit status: %d",nRes->status()); diff --git a/macros/CCEScan/voltageFit_spline.C b/macros/CCEScan/voltageFit_spline.C index 726ccaa..946fd24 100755 --- a/macros/CCEScan/voltageFit_spline.C +++ b/macros/CCEScan/voltageFit_spline.C @@ -378,11 +378,15 @@ // Scale them Info("voltageFit_spline","#chi^{2}/ndf: %6.2f/%d",fu_volt->GetChisquare(),fu_volt->GetNDF()); + + /*Michele if (chi2ndf>0.00) { Info("voltageFit_spline","scaling"); - vr_adc_err_corr*=TMath::Sqrt(chi2ndf); + vr_adc_err_corr*=TMath::Sqrt(chi2ndf); } + //Michele*/ + // Get new graph ge_volt = new TGraphErrors(vr_volt_val_corr,vr_adc_val_corr,vr_volt_err_corr,vr_adc_err_corr);