diff --git a/macros/CCEScan/Hamburg.C b/macros/CCEScan/Hamburg.C index 1ce289f..63ac42c 100755 --- a/macros/CCEScan/Hamburg.C +++ b/macros/CCEScan/Hamburg.C @@ -203,12 +203,16 @@ TString vn_flux7_e("v_flux7_e_"); TString vn_flux8_v("v_flux8_v_"); TString vn_flux8_e("v_flux8_e_"); + TString vn_flux13_v("v_flux13_v_"); + TString vn_flux13_e("v_flux13_e_"); vn_sector += lay.Data(); vn_flux7_v += lay.Data(); vn_flux7_e += lay.Data(); vn_flux8_v += lay.Data(); vn_flux8_e += lay.Data(); + vn_flux13_v += lay.Data(); + vn_flux13_e += lay.Data(); // Add radius postfix if (det.EqualTo("IT")) { @@ -220,6 +224,8 @@ vn_flux7_e += Form("_r%d",(int)radius); vn_flux8_v += Form("_r%d",(int)radius); vn_flux8_e += Form("_r%d",(int)radius); + vn_flux13_v += Form("_r%d",(int)radius); + vn_flux13_e += Form("_r%d",(int)radius); } } @@ -230,8 +236,10 @@ TVectorD* vp_flux7_e = (TVectorD*)f_sector->Get(vn_flux7_e.Data()); TVectorD* vp_flux8_v = (TVectorD*)f_sector->Get(vn_flux8_v.Data()); TVectorD* vp_flux8_e = (TVectorD*)f_sector->Get(vn_flux8_e.Data()); + TVectorD* vp_flux13_v = (TVectorD*)f_sector->Get(vn_flux13_v.Data()); + TVectorD* vp_flux13_e = (TVectorD*)f_sector->Get(vn_flux13_e.Data()); - if (!vp_sector || !vp_flux7_v || !vp_flux7_e || !vp_flux8_v || !vp_flux8_e) { + if (!vp_sector || !vp_flux7_v || !vp_flux7_e || !vp_flux8_v || !vp_flux8_e || !vp_flux13_v || !vp_flux13_e) { Error("Hamburg","Flux vectors are not available"); return EXIT_FAILURE; } @@ -241,6 +249,8 @@ TVectorD v_flux7_e = *vp_flux7_e; TVectorD v_flux8_v = *vp_flux8_v; TVectorD v_flux8_e = *vp_flux8_e; + TVectorD v_flux13_v = *vp_flux13_v; + TVectorD v_flux13_e = *vp_flux13_e; // Define number of calculated pathes int nErr = 1000; @@ -257,6 +267,7 @@ std::vector v_tempUnce; std::vector v_fluxUnce7; std::vector v_fluxUnce8; + std::vector v_fluxUnce13; std::vector v_deltaV; std::vector v_N; @@ -274,6 +285,8 @@ double flux7_e = v_flux7_e(i_flux); double flux8_v = v_flux8_v(i_flux); double flux8_e = v_flux8_e(i_flux); + double flux13_v = v_flux13_v(i_flux); + double flux13_e = v_flux13_e(i_flux); // Temperature uncertainty of 2 degree double temp_e = 2.0; @@ -286,6 +299,7 @@ v_para.push_back(para_base); v_fluxUnce7.push_back(0.0); v_fluxUnce8.push_back(0.0); + v_fluxUnce13.push_back(0.0); v_tempUnce.push_back(0.0); }else{ // Make gaussian variation of parameters @@ -296,6 +310,7 @@ v_para.push_back(temp_para); v_fluxUnce7.push_back(flux7_e*gRandom->Gaus()); v_fluxUnce8.push_back(flux8_e*gRandom->Gaus()); + v_fluxUnce13.push_back(flux13_e*gRandom->Gaus()); v_tempUnce.push_back(temp_e*(2.0*gRandom->Uniform()-1.0)); } v_deltaV.push_back(0.0); @@ -314,7 +329,9 @@ double tStart = 1262325600; // 1-1-2010 - double tStop = 1372654800; // 1-7-2013 + // double tStop = 1372654800; // 1-7-2013 + double tStop = 1448928000; // 1-12-2015 + double tRun = tStart; double tFillEnd = tStart; @@ -362,6 +379,8 @@ dFlux = (flux7_v+v_fluxUnce7[i])*v_peakLumi(i_lumi)*STTool::FLUKAConvFac; }else if(v_beamEner(i_lumi)==8.0) { dFlux = (flux8_v+v_fluxUnce8[i])*v_peakLumi(i_lumi)*STTool::FLUKAConvFac; + }else if(v_beamEner(i_lumi)==13.0) { + dFlux = (flux13_v+v_fluxUnce13[i])*v_peakLumi(i_lumi)*STTool::FLUKAConvFac; }else{ dFlux = 0.0; }