diff --git a/macros/CCEScan/voltageFit_spline.C b/macros/CCEScan/voltageFit_spline.C index 31a1e49..e8bfc04 100755 --- a/macros/CCEScan/voltageFit_spline.C +++ b/macros/CCEScan/voltageFit_spline.C @@ -177,7 +177,7 @@ TString dn_data(Form("%s/data/ST/Aging" ,diskVar)); - TString fn_data(Form("%s/CCEScan.root", + TString fn_data(Form("%s/CCEScan.root",//Michele for TESTING dn_data.Data())); TString fn_dummy(Form("%s/check",dn_data.Data())); @@ -224,7 +224,8 @@ - for (int i=0; i<11; i++) { + //for (int i=0; i<11; i++) { + for (int i=0; i<12; i++) { //MIchele TString vn_input(Form("%s/v_pulse%d_val%d",dn_input.Data(),i,val)); if (radius>0.0) { vn_input +=Form("_r%d",(int)radius); @@ -258,7 +259,10 @@ double height_val = v_input(0); double height_err = v_input(1); + double height_sys = v_input(11);//Michele + + //This is a fake if... if (true || det.EqualTo("IT")) { height_val /= 0.1306; // transform back to the amplitude height_err /= 0.1306; // transform back to the amplitude @@ -271,11 +275,11 @@ - Printf(" %8.2f V: %8.4f+/-%8.4f",volt,height_val,height_err); + Printf(" %8.2f V: %8.4f+/-%8.4f(stat) +/-%8.4f (sys)",volt,height_val,height_err, height_sys);//MIchele // Load the input values in to vector v_adc_val.push_back(height_val); - v_adc_err.push_back(height_err); + v_adc_err.push_back(height_err + height_sys); //Putting systematic and statistical togther, temporary fix v_volt_val.push_back(volt); v_volt_err.push_back(0.0);