diff --git a/macros/CCEScan/Hamburg.C b/macros/CCEScan/Hamburg.C index f11231e..db98036 100755 --- a/macros/CCEScan/Hamburg.C +++ b/macros/CCEScan/Hamburg.C @@ -104,12 +104,8 @@ TString det("TT"); TString lay("TTaU"); - // double radius = -1000.0; + double radius = -1000.0; int sector = 2634; - // Elena - implement circular crowns - double radius = -10.0; - double radmin = 0.0; - double radmax = 2000.0; bool useRadius = false; @@ -340,7 +336,6 @@ int i_lumi = 0; - double tStart = 1262325600; // 1-1-2010 // double tStop = 1372654800; // 1-7-2013 // double tStop = 1448928000; // 1-12-2015 @@ -412,7 +407,6 @@ } } - // Calculate change in the effective doping concentration v_N[i](0) = GetNc(v_para[i],v_flux[i]); v_N[i](1) = GetNa(v_para[i],v_N[i](1),v_flux[i],dFlux,tStep,temp); @@ -435,7 +429,6 @@ std::sort(v_temp.begin(),v_temp.end()); - // Extract 68% confidence interval v_low.push_back(TMath::Max(0.0,v_deltaV[0]-v_temp[(int)(0.158*v_temp.size())])); v_hig.push_back(TMath::Max(0.0,v_temp[(int)(0.842*v_temp.size())]-v_deltaV[0])); @@ -479,7 +472,6 @@ TVectorD vr_hig = getROOTVector(v_hig_red); TVectorD vr_low = getROOTVector(v_low_red); - // Store result TFile* f_out = new TFile(fn_out.Data(),"UPDATE"); @@ -513,7 +505,6 @@ Printf("tau_a: %f,tau_y: %f",tau_a,tau_y); Printf("flux: %f, dFlux: %f, t: %f",flux,dFlux,T_noBeam); - dNc += (para["gc"]+para["Nc"]*para["c"]*TMath::Exp(-para["c"]*flux))*dFlux*dT/2.0; dNa += (flux*para["ga"]*-1.0/tau_a+para["ga"]*dFlux)*TMath::Exp(-T_noBeam/tau_a)*dT/2.0; @@ -530,7 +521,6 @@ Printf("dNc: %f,dNa: %f,dNy: %f",dNc,dNa,dNy); return dNc+dNa+dNy; - } // Calculate stable damage part @@ -567,5 +557,3 @@ return para["q"]*para["d"]*para["d"]/(2.0*para["eps"]*para["eps0"]); } - -