diff --git a/Control/AthenaConfiguration/python/iconfTool/gui/__init__.py b/Control/AthenaConfiguration/python/iconfTool/gui/__init__.py old mode 100644 new mode 100755 diff --git a/Reconstruction/Jet/JetMonitoring/JetMonitoring/HIJetUEMonitoring.h b/Reconstruction/Jet/JetMonitoring/JetMonitoring/HIJetUEMonitoring.h index 8477ab2954e3850cb1cae08da999ac7bf2896d5e..b234e92615e782d78f477f204b99ccff8624b773 100644 --- a/Reconstruction/Jet/JetMonitoring/JetMonitoring/HIJetUEMonitoring.h +++ b/Reconstruction/Jet/JetMonitoring/JetMonitoring/HIJetUEMonitoring.h @@ -50,6 +50,7 @@ class HIJetUEMonitoring : public JetHistoBase { TProfile * m_SubtractedET_Centrality; TH2F * m_2dSubtractedET_Centrality; TH2F * m_2dSubtractedET_Expected_Centrality; + TH2F * m_2dSubtractedET_pT; TH2F * m_2dSubtractedET_Expected_eta; TProfile * m_SubtractedET_Expected_eta; diff --git a/Reconstruction/Jet/JetMonitoring/Root/HIJetUEMonitoring.cxx b/Reconstruction/Jet/JetMonitoring/Root/HIJetUEMonitoring.cxx index b59e8bca1936ab962220103f8b6449e5a69f3df6..97537860d90f1ab4def927af636e35ae0350e745 100644 --- a/Reconstruction/Jet/JetMonitoring/Root/HIJetUEMonitoring.cxx +++ b/Reconstruction/Jet/JetMonitoring/Root/HIJetUEMonitoring.cxx @@ -40,6 +40,7 @@ int HIJetUEMonitoring::buildHistos(){ m_FCALET = bookHisto( hbuilder.build<TH1F>("FCalET") ); //inclusive + m_2dSubtractedET_pT = bookHisto( hbuilder.build<TH2F>("2dSubtractedET_pT") ); m_SubtractedET_Centrality = bookHisto( hbuilder.build<TProfile>("SubtractedET_Centrality") ); m_2dSubtractedET_Centrality = bookHisto( hbuilder.build<TH2F>("2dSubtractedET_Centrality") ); m_2dSubtractedET_Expected_Centrality = bookHisto( hbuilder.build<TH2F>("2dSubtractedET_Expected_Centrality") ); @@ -175,7 +176,7 @@ int HIJetUEMonitoring::fillHistosFromJet(const xAOD::Jet &j){ // float diff = fabs(j.getAttribute<float>("JetSubtractedScaleMomentum_phi") - m_psiN_FCal); // while (diff > TMath::Pi()/2. ) diff = TMath::Pi() - diff; - if (fabs(j.getAttribute<float>("JetEtaJESScaleMomentum_eta"))<2.1){ + if (fabs(j.getAttribute<float>("JetEtaJESScaleMomentum_eta"))<2.8){ if (m_FCalET > 2.7){//0-10% m_SubtractedET_pt_0_10->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_pt")*toGeV,SubtractedET ); } @@ -191,6 +192,9 @@ int HIJetUEMonitoring::fillHistosFromJet(const xAOD::Jet &j){ } if (j.getAttribute<float>("JetEtaJESScaleMomentum_pt")*toGeV > m_ptcut){ + // ATH_MSG_INFO(" FCal ET: "<< m_FCalET<<" SubtractedE:, "<<SubtractedET<<" m_psiN_FCal: "<<m_psiN_FCal<<" Acos: "<<Acos <<" m_vN_fcal: "<<m_vN_fcal<<" ptcut: "<<m_ptcut); + m_2dSubtractedET_pT->Fill( j.getAttribute<float>("JetEtaJESScaleMomentum_pt")*toGeV, SubtractedET); + m_SubtractedET_Centrality->Fill( m_FCalET, SubtractedET); m_2dSubtractedET_Centrality->Fill( m_FCalET, SubtractedET); m_2dSubtractedET_Expected_Centrality->Fill( m_FCalET, (SubtractedET/m_FCalET)*0.025); diff --git a/Reconstruction/Jet/JetMonitoring/python/HIJetHistoTools.py b/Reconstruction/Jet/JetMonitoring/python/HIJetHistoTools.py index 97773cb34c8e2be76787cf665651664cd2c9581a..d7edc5a7fcb0ccac2bba601f4754812f23447dc5 100644 --- a/Reconstruction/Jet/JetMonitoring/python/HIJetHistoTools.py +++ b/Reconstruction/Jet/JetMonitoring/python/HIJetHistoTools.py @@ -152,14 +152,16 @@ jhm.addTool( HIJetUEMonitoring("centrality", HistoDef = [ hdef('FCalET', "FCalET; FCal ET [TeV]; entries",50,0,10), hdef('SubtractedET_Centrality', "UnsubScMomentum-SubScMomentum vs FCalET; FCal ET [TeV]; SubtractedET [GeV]",50,0,10), - hdef('2dSubtractedET_Centrality', "UnsubScMomentum-SubScMomentum vs FCalET; FCal ET [TeV]; SubtractedET [GeV]",50,0,10,40,0,200 ), + hdef('2dSubtractedET_Centrality', "UnsubScMomentum-SubScMomentum vs FCalET; FCal ET [TeV]; SubtractedET [GeV]",50,0,10,50,0,250 ), + + hdef('2dSubtractedET_pT', "UnsubScMomentum-SubScMomentum vs pT; jet pT [GeV]; SubtractedET [GeV]",100,0,1000,50,0,250 ), hdef('2dSubtractedET_Expected_Centrality', "(UnsubScMomentum-SubScMomentum)/Expected vs FCalET; FCal ET [TeV]; (A^{Jet}/A^{FCal})xSubtractedET/FCalET",50,0,10,100,0,5 ), hdef('2dSubtractedET_Expected_eta', "(UnsubScMomentum-SubScMomentum)/Expected vs #eta; #eta; (A^{Jet}/A^{FCal})xSubtractedET/FCalET",50,-6,6,100,0,5 ), hdef('SubtractedET_Expected_eta', "(UnsubScMomentum-SubScMomentum)/Expected vs #eta; #eta; (A^{Jet}/A^{FCal})xSubtractedET/FCalET",50,-6,6 ), - hdef('2dSubtractedET_2Dphi', "UnsubScMomentum-SubScMomentum vs 2|#phi-#Psi_{2}|; 2|#phi-#Psi_{2}|; SubtractedET [GeV]",25,0,3.3, 40,0,200 ), + hdef('2dSubtractedET_2Dphi', "UnsubScMomentum-SubScMomentum vs 2|#phi-#Psi_{2}|; 2|#phi-#Psi_{2}|; SubtractedET [GeV]",25,0,3.3, 50,0,250 ), hdef('SubtractedET_eta', "UnsubScMomentum-SubScMomentum vs #eta; #eta; SubtractedET [GeV]",50,-6,6 ), hdef('SubtractedET_pt', "UnsubScMomentum-SubScMomentum vs p_{T}; p_{T} [GeV]; SubtractedET [GeV]",100,0,1000 ),