diff --git a/macros/CCEScan/deplVphiN_normalized.C b/macros/CCEScan/deplVphiN_normalized.C index 2b88bfa..99ab388 100644 --- a/macros/CCEScan/deplVphiN_normalized.C +++ b/macros/CCEScan/deplVphiN_normalized.C @@ -117,9 +117,12 @@ TFile* f_deplV = TFile::Open(fn_deplV.Data()); TFile* f_fill = TFile::Open(fn_fill.Data()); TFile* f_sector = TFile::Open(fn_sector.Data()); - const Int_t nRTT = 4; // Define ranges of radii + const Int_t nRTT = 4; Double_t rTT[nRTT] = {-1.0,75.0,45.0,40.0}; + // Define ranges of radii + const Int_t nRIT = 2; + Double_t rIT[nRIT] = {-1.0,175.0}; // Get information about the luminosity and the TVectorD* vp_fill = (TVectorD*)f_fill->Get("v_fill"); TVectorD* vp_lumi7 = (TVectorD*)f_fill->Get("v_lumi7"); @@ -143,9 +146,15 @@ TVectorD v_sector = *vp_sector; TVectorD v_vdepl = *vp_vdepl; Int_t effnR = nRTT; + + /* --- Comment this bit out (Elena) + // No radius is taken into account in case of IT + + --- */ if (det.EqualTo("IT")) { - effnR = 1; + // effnR = 1; + effnR = nRIT; } // We plot only one prediction... not one per sector! @@ -411,21 +420,42 @@ } } }else{ - if (vdepl_prod>v2Bound) { - v_vdepl_v_norm_high.push_back(vdepl_val/vdepl_prod); - v_vdepl_e_norm_high.push_back(vdepl_tot/vdepl_prod); - v_phiN_v_norm_high.push_back(phiN_val); - v_phiN_e_norm_high.push_back(phiN_err); - }else if(vdepl_prod>v1Bound) { - v_vdepl_v_norm_mid.push_back(vdepl_val/vdepl_prod); - v_vdepl_e_norm_mid.push_back(vdepl_tot/vdepl_prod); - v_phiN_v_norm_mid.push_back(phiN_val); - v_phiN_e_norm_mid.push_back(phiN_err); - }else{ - v_vdepl_v_norm_low.push_back(vdepl_val/vdepl_prod); - v_vdepl_e_norm_low.push_back(vdepl_tot/vdepl_prod); - v_phiN_v_norm_low.push_back(phiN_val); - v_phiN_e_norm_low.push_back(phiN_err); + if (vdepl_prod>v2Bound) { // Sectors with higher Vdepl after production + if (rIT[k]>0.0) { // Inner circles + v_vdepl_v_r_high.push_back(vdepl_val/vdepl_prod); + v_vdepl_e_r_high.push_back(vdepl_tot/vdepl_prod); + v_phiN_v_r_high.push_back(phiN_val); + v_phiN_e_r_high.push_back(phiN_err); + }else{ // Whole sectors + v_vdepl_v_norm_high.push_back(vdepl_val/vdepl_prod); + v_vdepl_e_norm_high.push_back(vdepl_tot/vdepl_prod); + v_phiN_v_norm_high.push_back(phiN_val); + v_phiN_e_norm_high.push_back(phiN_err); + } + }else if(vdepl_prod>v1Bound) { // Sectors with lower Vdepl after production + if (rIT[k]>0.0) { // Inner circles + v_vdepl_v_r_mid.push_back(vdepl_val/vdepl_prod); + v_vdepl_e_r_mid.push_back(vdepl_tot/vdepl_prod); + v_phiN_v_r_mid.push_back(phiN_val); + v_phiN_e_r_mid.push_back(phiN_err); + }else{ // Whole sectors + v_vdepl_v_norm_mid.push_back(vdepl_val/vdepl_prod); + v_vdepl_e_norm_mid.push_back(vdepl_tot/vdepl_prod); + v_phiN_v_norm_mid.push_back(phiN_val); + v_phiN_e_norm_mid.push_back(phiN_err); + } + }else{ // Sectors with lowest Vdepl after production + if (rIT[k]>0.0) { // Inner circles + v_vdepl_v_r_low.push_back(vdepl_val/vdepl_prod); + v_vdepl_e_r_low.push_back(vdepl_tot/vdepl_prod); + v_phiN_v_r_low.push_back(phiN_val); + v_phiN_e_r_low.push_back(phiN_err); + }else{ // Whole sectors + v_vdepl_v_norm_low.push_back(vdepl_val/vdepl_prod); + v_vdepl_e_norm_low.push_back(vdepl_tot/vdepl_prod); + v_phiN_v_norm_low.push_back(phiN_val); + v_phiN_e_norm_low.push_back(phiN_err); + } } } // end if (IT or TT) } // end loop on radii