Implementing E/p calibration and monitoring in external classes

.gitignore

@@ -44,3 +44,6 @@ prod_alcarereco
 *.png
 *.eps
 *.pdf
+
+LSF*
+ZFitter/output*

EOverPCalibration/bin/BuildFile.xml

@@ -14,6 +14,7 @@
 <bin file="DrawPrecisionPlotsEB.cpp" name="DrawPrecisionPlotsEB"> </bin>
 <bin file="DrawPrecisionPlotsEE.cpp" name="DrawPrecisionPlotsEE"> </bin>
 <bin file="CompareICSet.cpp" name="CompareICSet"> </bin>
+<bin file="CompareICSet_ratio.cpp" name="CompareICSet_ratio"> </bin>
 <bin file="CalibrationPlots.cpp" name="CalibrationPlots"> </bin>
 <bin file="CalibrationMomentum.cpp" name="CalibrationMomentum"> </bin>
 <bin file="CompareSCalibMCTruth_EB.cpp" name="CompareSCalibMCTruth_EB"> </bin>

EOverPCalibration/bin/CalibrationPlots.cpp

@@ -60,11 +60,7 @@ int main(int argc, char **argv)
   }
 
   std::string configFileName = argv[1];
-#ifdef CMSSW_7_2_X
   std::shared_ptr<edm::ParameterSet> parameterSet = edm::readConfig(configFileName);
-#else
-  boost::shared_ptr<edm::ParameterSet> parameterSet = edm::readConfig(configFileName);
-#endif
   edm::ParameterSet Options = parameterSet -> getParameter<edm::ParameterSet>("Options");
 
 
@@ -113,6 +109,17 @@ int main(int argc, char **argv)
     else{ std::cout<<" Exit from code, no odd input file"<<std::endl; std::exit(EXIT_FAILURE); }
   }
 
+
+  TFile* f4 = new TFile("momentumCalibration2015_EE_ptK.root");
+  std::vector<std::vector<TGraphErrors*> > corrMomentum(1);
+
+  for (int k=0; k<1; k++) {
+    for(int i = 0; i <2; ++i){
+      std::cout<<k<<" "<<i<<std::endl;
+      TString Name = Form("g_pData_EE_%d_%d",k,i);
+      (corrMomentum.at(k)).push_back( (TGraphErrors*)(f4->Get(Name)) );
+    }
+  }
 
 
   //------------
@@ -154,6 +161,8 @@ int main(int argc, char **argv)
 
   //-----------------------
   // map for dead TT centre
+
+  std::cout<<"debug"<<std::endl;
 
   std::map<int, std::vector< std::pair<int,int> > > TT_centre;
   if( isEB == true )
@@ -181,6 +190,7 @@ int main(int argc, char **argv)
   }
 
 
+  std::cout<<"debug"<<std::endl;
 
   //---------------
   // define outfile
@@ -193,6 +203,7 @@ int main(int argc, char **argv)
 
 
 
+  std::cout<<"debug"<<std::endl;
 
 
   //--------------------------------------------------------------
@@ -211,7 +222,10 @@ int main(int argc, char **argv)
     inFileOdd  = new TFile(inFileNameOdd.c_str(),"READ");
   }
 
+  std::cout<<"debug"<<std::endl;
 
+  std::map<int, TH2F*> h2_corrP;
+  std::map<int, TH2F*> h2_IC_corr;
 
   // get the IC maps as they come from the algorithm
   std::map<int, TH2F*> h2_IC_raw;
@@ -267,29 +281,50 @@ int main(int argc, char **argv)
   }
   else
   {
+  std::cout<<"debug"<<std::endl;
     h2_IC_raw[-1] = (TH2F*)( inFile->Get("h_scale_EEM") );
     h2_IC_raw[1]  = (TH2F*)( inFile->Get("h_scale_EEP") );  
+  std::cout<<"debug"<<std::endl;
 
     h2_IC_raw_phiNorm[-1] = (TH2F*)( h2_IC_raw[-1]->Clone("h2_IC_raw_phiNorm_EEM") );
     h2_IC_raw_phiNorm[1]  = (TH2F*)( h2_IC_raw[1] ->Clone("h2_IC_raw_phiNorm_EEP") );
     h2_IC_raw_phiNorm[-1] -> Reset("ICEMS");
     h2_IC_raw_phiNorm[1]  -> Reset("ICEMS");
     h2_IC_raw_phiNorm[-1] -> ResetStats();
     h2_IC_raw_phiNorm[1]  -> ResetStats();
+
+    h2_corrP[-1] = (TH2F*)( h2_IC_raw[-1]->Clone("h2_corrP_EEM") );
+    h2_corrP[1]  = (TH2F*)( h2_IC_raw[1] ->Clone("h2_corrP_EEP") );
+    h2_corrP[-1] -> Reset("ICEMS");
+    h2_corrP[1]  -> Reset("ICEMS");
+    h2_corrP[-1] -> ResetStats();
+    h2_corrP[1]  -> ResetStats();
+
+    h2_IC_corr[-1] = (TH2F*)( h2_IC_raw[-1]->Clone("h2_IC_corr_EEM") );
+    h2_IC_corr[1]  = (TH2F*)( h2_IC_raw[1] ->Clone("h2_IC_corr_EEP") );
+    h2_IC_corr[-1] -> Reset("ICEMS");
+    h2_IC_corr[1]  -> Reset("ICEMS");
+    h2_IC_corr[-1] -> ResetStats();
+    h2_IC_corr[1]  -> ResetStats();
+
 
+  std::cout<<"debug"<<std::endl;
     if( evalStat )
     {
+  std::cout<<"debug"<<std::endl;
       h2_ICEven_raw[-1] = (TH2F*)( inFileEven->Get("h_scale_EEM") );
       h2_ICEven_raw[1]  = (TH2F*)( inFileEven->Get("h_scale_EEP") );  
       h2_ICOdd_raw[-1 ] = (TH2F*)( inFileOdd ->Get("h_scale_EEM") );
       h2_ICOdd_raw[1]   = (TH2F*)( inFileOdd ->Get("h_scale_EEP") );
+  std::cout<<"debug"<<std::endl;
 
       h2_IC_raw_phiNorm_even[-1] = (TH2F*)( h2_ICEven_raw[-1]->Clone("h2_IC_raw_phiNorm_even_EEM") );
       h2_IC_raw_phiNorm_even[1]  = (TH2F*)( h2_ICEven_raw[1] ->Clone("h2_IC_raw_phiNorm_even_EEP") );
       h2_IC_raw_phiNorm_even[-1] -> Reset("ICEMS");
       h2_IC_raw_phiNorm_even[1]  -> Reset("ICEMS");
       h2_IC_raw_phiNorm_even[-1] -> ResetStats();
       h2_IC_raw_phiNorm_even[1]  -> ResetStats();
+  std::cout<<"debug"<<std::endl;
 
       h2_IC_raw_phiNorm_odd[-1] = (TH2F*)( h2_ICOdd_raw[-1]->Clone("h2_IC_raw_phiNorm_odd_EEM") );
       h2_IC_raw_phiNorm_odd[1]  = (TH2F*)( h2_ICOdd_raw[1] ->Clone("h2_IC_raw_phiNorm_odd_EEP") );
@@ -301,6 +336,7 @@ int main(int argc, char **argv)
   }
 
 
+  std::cout<<"debug"<<std::endl;
 
   // normalize each ring to the average IC of that eta ring
   if( isEB == true )
@@ -315,6 +351,8 @@ int main(int argc, char **argv)
   else
   {
     NormalizeIC_EE(h2_IC_raw[-1],h2_IC_raw[1],h2_IC_raw_phiNorm[-1],h2_IC_raw_phiNorm[1],TT_centre[-1],TT_centre[1],eRings);
+    //    DrawCorr_EE(h2_IC_raw[-1],h2_IC_raw[1],h2_corrP[-1],h2_corrP[1],TT_centre[-1],TT_centre[1],corrMomentum,eRings,true,1);
+    //    DrawICCorr_EE(h2_IC_raw[-1],h2_IC_raw[1],h2_IC_corr[-1],h2_IC_corr[1],TT_centre[-1],TT_centre[1],corrMomentum,eRings,true);
     if( evalStat )
     {
       NormalizeIC_EE(h2_ICEven_raw[-1],h2_ICEven_raw[1],h2_IC_raw_phiNorm_even[-1],h2_IC_raw_phiNorm_even[1],TT_centre[-1],TT_centre[1],eRings);
@@ -580,7 +618,7 @@ int main(int argc, char **argv)
         }
       }
 
-    NormalizeIC_EB(h2_IC_crackCorr[0],h2_IC_crackCorr_phiNorm[0],TT_centre[0]);
+    NormalizeIC_EB(h2_IC_crackCorr[0],h2_IC_crackCorr_phiNorm[0],TT_centre[0],false);
 
     outFile -> mkdir("crackCorr");
     outFile -> cd("crackCorr");
@@ -688,47 +726,82 @@ int main(int argc, char **argv)
   {
     DrawICMap(h2_IC_raw_phiNorm[0],      outputFolder+"/EB_h2_IC_raw_phiNorm",      "png",isEB);
     DrawICMap(h2_IC_crackCorr_phiNorm[0],outputFolder+"/EB_h2_IC_crackCorr_phiNorm","png",isEB);
+    DrawICMap(h2_IC_raw_phiNorm[0],      outputFolder+"/EB_h2_IC_raw_phiNorm",      "pdf",isEB);
+    DrawICMap(h2_IC_crackCorr_phiNorm[0],outputFolder+"/EB_h2_IC_crackCorr_phiNorm","pdf",isEB);
 
     DrawSpreadHisto(h_spread[0],       outputFolder+"/EB_h_spread",          "f_EB_spread_vsEta",          "png",isEB);
     DrawSpreadHisto(h_spread_crackCorr,outputFolder+"/EB_h_spread_crackCorr","f_EB_spread_vsEta_crackCorr","png",isEB);
+    DrawSpreadHisto(h_spread[0],       outputFolder+"/EB_h_spread",          "f_EB_spread_vsEta",          "pdf",isEB);
+    DrawSpreadHisto(h_spread_crackCorr,outputFolder+"/EB_h_spread_crackCorr","f_EB_spread_vsEta_crackCorr","pdf",isEB);
 
     DrawSpreadGraph(g_spread_vsEta[0],       outputFolder+"/EB_g_spread_vsEta",          "png",isEB,g_stat_vsEta[0]);
     DrawSpreadGraph(g_spread_vsEta_crackCorr,outputFolder+"/EB_g_spread_vsEta_crackCorr","png",isEB,g_stat_vsEta_crackCorr);
+    DrawSpreadGraph(g_spread_vsEta[0],       outputFolder+"/EB_g_spread_vsEta",          "pdf",isEB,g_stat_vsEta[0]);
+    DrawSpreadGraph(g_spread_vsEta_crackCorr,outputFolder+"/EB_g_spread_vsEta_crackCorr","pdf",isEB,g_stat_vsEta_crackCorr);
 
     DrawResidualGraph(g_residual_vsEta[0],       outputFolder+"/EB_g_residual_vsEta",          "png",isEB);
     DrawResidualGraph(g_residual_vsEta_crackCorr,outputFolder+"/EB_g_residual_vsEta_crackCorr","png",isEB);
+    DrawResidualGraph(g_residual_vsEta[0],       outputFolder+"/EB_g_residual_vsEta",          "pdf",isEB);
+    DrawResidualGraph(g_residual_vsEta_crackCorr,outputFolder+"/EB_g_residual_vsEta_crackCorr","pdf",isEB);
 
     DrawPhiAvgICSpread(h_phiAvgICSpread[0],       outputFolder+"/EB_h_phiAvgICSpread",          "png",isEB);
     DrawPhiAvgICSpread(h_phiAvgICSpread_crackCorr,outputFolder+"/EB_h_phiAvgICSpread_crackCorr","png",isEB);
+    DrawPhiAvgICSpread(h_phiAvgICSpread[0],       outputFolder+"/EB_h_phiAvgICSpread",          "pdf",isEB);
+    DrawPhiAvgICSpread(h_phiAvgICSpread_crackCorr,outputFolder+"/EB_h_phiAvgICSpread_crackCorr","pdf",isEB);
 
     DrawAvgICVsPhiGraph(g_avgIC_vsPhi[0],       outputFolder+"/EB_g_avgIC_vsPhi",          "png",kRed+2,  isEB);
     DrawAvgICVsPhiGraph(g_avgIC_vsPhi_crackCorr,outputFolder+"/EB_g_avgIC_vsPhi_crackCorr","png",kGreen+2,isEB);
+    DrawAvgICVsPhiGraph(g_avgIC_vsPhi[0],       outputFolder+"/EB_g_avgIC_vsPhi",          "pdf",kRed+2,  isEB);
+    DrawAvgICVsPhiGraph(g_avgIC_vsPhi_crackCorr,outputFolder+"/EB_g_avgIC_vsPhi_crackCorr","pdf",kGreen+2,isEB);
 
     DrawAvgICVsPhiFoldGraph(g_avgIC_vsPhiFold_EBM,g_avgIC_vsPhiFold_crackCorr_EBM,outputFolder+"/EBM_g_avgIC_vsPhiFold","png",isEB);
     DrawAvgICVsPhiFoldGraph(g_avgIC_vsPhiFold_EBP,g_avgIC_vsPhiFold_crackCorr_EBP,outputFolder+"/EBP_g_avgIC_vsPhiFold","png",isEB);
+    DrawAvgICVsPhiFoldGraph(g_avgIC_vsPhiFold_EBM,g_avgIC_vsPhiFold_crackCorr_EBM,outputFolder+"/EBM_g_avgIC_vsPhiFold","pdf",isEB);
+    DrawAvgICVsPhiFoldGraph(g_avgIC_vsPhiFold_EBP,g_avgIC_vsPhiFold_crackCorr_EBP,outputFolder+"/EBP_g_avgIC_vsPhiFold","pdf",isEB);
   }
   else
   {
     DrawICMap(h2_IC_raw_phiNorm[-1],outputFolder+"/EEM_h2_IC_raw_phiNorm","png",isEB);
     DrawICMap(h2_IC_raw_phiNorm[+1],outputFolder+"/EEP_h2_IC_raw_phiNorm","png",isEB);
+    DrawICMap(h2_IC_raw_phiNorm[-1],outputFolder+"/EEM_h2_IC_raw_phiNorm","pdf",isEB);
+    DrawICMap(h2_IC_raw_phiNorm[+1],outputFolder+"/EEP_h2_IC_raw_phiNorm","pdf",isEB);
+
+    //    DrawICMap(h2_corrP[-1],outputFolder+"/EEM_h2_corrP","png",isEB);
+    //    DrawICMap(h2_corrP[+1],outputFolder+"/EEP_h2_corrP","png",isEB);
+
+    //    DrawICMap(h2_IC_corr[-1],outputFolder+"/EEM_h2_IC_corr","png",isEB);
+    //DrawICMap(h2_IC_corr[+1],outputFolder+"/EEP_h2_IC_corr","png",isEB);
 
     DrawSpreadHisto(h_spread[-1],outputFolder+"/EEM_h_spread","f_EE_spread_vsEta_EEM","png",isEB);
     DrawSpreadHisto(h_spread[0],  outputFolder+"/EE_h_spread","f_EE_spread_vsEta_EE", "png",isEB);
     DrawSpreadHisto(h_spread[+1],outputFolder+"/EEP_h_spread","f_EE_spread_vsEta_EEP","png",isEB);
+    DrawSpreadHisto(h_spread[-1],outputFolder+"/EEM_h_spread","f_EE_spread_vsEta_EEM","pdf",isEB);
+    DrawSpreadHisto(h_spread[0],  outputFolder+"/EE_h_spread","f_EE_spread_vsEta_EE", "pdf",isEB);
+    DrawSpreadHisto(h_spread[+1],outputFolder+"/EEP_h_spread","f_EE_spread_vsEta_EEP","pdf",isEB);
 
     DrawSpreadGraph(g_spread_vsEta[-1],outputFolder+"/EEM_g_spread_vsEta","png",isEB,g_stat_vsEta[-1]);
     DrawSpreadGraph(g_spread_vsEta[0],  outputFolder+"/EE_g_spread_vsEta","png",isEB,g_stat_vsEta[0]);
     DrawSpreadGraph(g_spread_vsEta[+1],outputFolder+"/EEP_g_spread_vsEta","png",isEB,g_stat_vsEta[+1]);
+    DrawSpreadGraph(g_spread_vsEta[-1],outputFolder+"/EEM_g_spread_vsEta","pdf",isEB,g_stat_vsEta[-1]);
+    DrawSpreadGraph(g_spread_vsEta[0],  outputFolder+"/EE_g_spread_vsEta","pdf",isEB,g_stat_vsEta[0]);
+    DrawSpreadGraph(g_spread_vsEta[+1],outputFolder+"/EEP_g_spread_vsEta","pdf",isEB,g_stat_vsEta[+1]);
 
     DrawResidualGraph(g_residual_vsEta[-1],outputFolder+"/EEM_g_residual_vsEta","png",isEB);
     DrawResidualGraph(g_residual_vsEta[0],  outputFolder+"/EE_g_residual_vsEta","png",isEB);
     DrawResidualGraph(g_residual_vsEta[+1],outputFolder+"/EEP_g_residual_vsEta","png",isEB);
+    DrawResidualGraph(g_residual_vsEta[-1],outputFolder+"/EEM_g_residual_vsEta","pdf",isEB);
+    DrawResidualGraph(g_residual_vsEta[0],  outputFolder+"/EE_g_residual_vsEta","pdf",isEB);
+    DrawResidualGraph(g_residual_vsEta[+1],outputFolder+"/EEP_g_residual_vsEta","pdf",isEB);
 
     DrawPhiAvgICSpread(h_phiAvgICSpread[-1],outputFolder+"/EEM_h_phiAvgICSpread","png",isEB);
     DrawPhiAvgICSpread(h_phiAvgICSpread[+1],outputFolder+"/EEP_h_phiAvgICSpread","png",isEB);
+    DrawPhiAvgICSpread(h_phiAvgICSpread[-1],outputFolder+"/EEM_h_phiAvgICSpread","pdf",isEB);
+    DrawPhiAvgICSpread(h_phiAvgICSpread[+1],outputFolder+"/EEP_h_phiAvgICSpread","pdf",isEB);
 
     DrawAvgICVsPhiGraph(g_avgIC_vsPhi[-1],outputFolder+"/EEM_g_avgIC_vsPhi","png",kRed+2,isEB);
     DrawAvgICVsPhiGraph(g_avgIC_vsPhi[+1],outputFolder+"/EEP_g_avgIC_vsPhi","png",kRed+2,isEB);
+    DrawAvgICVsPhiGraph(g_avgIC_vsPhi[-1],outputFolder+"/EEM_g_avgIC_vsPhi","pdf",kRed+2,isEB);
+    DrawAvgICVsPhiGraph(g_avgIC_vsPhi[+1],outputFolder+"/EEP_g_avgIC_vsPhi","pdf",kRed+2,isEB);
   }
 
   outFile -> Close();
@@ -835,7 +908,7 @@ int main(int argc, char **argv)
                    << std::fixed << std::setprecision(0) << std::setw(10) << h2_final[iz]->GetYaxis()->GetBinLowEdge(iy)
                    << std::fixed << std::setprecision(0) << std::setw(10) << iz
                    << std::fixed << std::setprecision(6) << std::setw(15) << IC
-		   << std::fixed << std::setprecision(6) << std::setw(15) << sqrt( statPrec*statPrec + sysPrec*sysPrec ) 
+		   << std::fixed << std::setprecision(6) << std::setw(15) << sqrt( statPrec*statPrec )//+ sysPrec*sysPrec ) 
                    << std::endl;
 	  }
           else