Commit 612e1855 authored by Marcin Jerzy Nowak's avatar Marcin Jerzy Nowak Committed by Graeme Stewart
Browse files

TH1 rebinning API fix for ROOT6.4 (TrigROBDataProviderSvc-00-01-09)

	* src\TrigROBDataProviderSvc.cxx:
	* src\TrigROBDataProviderSvc_RTT.cxx: TH1 rebinning API fix for ROOT6.4
	* Tagging TrigROBDataProviderSvc-00-01-09

2015-06-11 Francesca Pastore
	* Lower some WARNING to DEBUG to reduce time of test running with WARNING on
	* TrigROBDataProviderSvc-00-01-08

2015-06-04 Francesca Pastore
	* Add histogram CallerPerEvent in TrigROBDataProviderSvc_RTT test and cure one buggy fill
	* TrigROBDataProviderSvc-00-01-07

2015-05-29 Francesca Pastore
	* Adding more histograms in TrigROBDataProviderSvc* and avoid check on L1
	ROBs
	* TrigROBDataProviderSvc-00-01-06

2015-03-21  scott snyder  <snyder@bnl.gov>
	* Tagging TrigROBDataProviderSvc-00-01-05.
	* src/TrigROBDataProviderSvc.cxx (initialize): Remove use of
...
(Long ChangeLog diff - truncated)
parent b8281559
......@@ -149,6 +149,8 @@ protected:
/// Pointer to AlgContextSvc
IAlgContextSvc* m_algContextSvc;
/// vector of Source ids to be ignored for the ROB map clear
std::vector<uint32_t> m_l1_ROB_ids;
private:
typedef ServiceHandle<StoreGateSvc> StoreGateSvc_t;
......@@ -188,6 +190,8 @@ private:
// flag which tells if module IDs from the L2 and EF result should be masked off
bool m_maskL2EFModuleID;
// ROS-ROB mapping
IntegerMapProperty m_rob_ros_map ;
BooleanProperty m_useROSmappingForROBRetrieval ;
......@@ -221,12 +225,16 @@ private:
Histo1DProperty m_histProp_requestedROBsPerCall;
Histo1DProperty m_histProp_receivedROBsPerCall;
Histo1DProperty m_histProp_timeROBretrieval;
Histo1DProperty m_histProp_retrievedROBsPerAlgo;
Histo1DProperty m_histProp_ROSRequest;
TH1F* m_hist_requestedROBsPerCall;
TH1F* m_hist_receivedROBsPerCall;
TH1F* m_hist_retrievedROBsPerAlgo;
TH1F* m_hist_timeROBretrieval;
TH2F* m_hist_genericStatusForROB;
TH2F* m_hist_specificStatusForROB;
TH2F* m_hist_ROSRequest;
// online simulation
BooleanProperty m_simulateOnlineDataAccess;
......
......@@ -56,13 +56,13 @@ class TrigROBDataProviderSvc_RTT : public TrigROBDataProviderSvc,
~TrigROBDataProviderSvc_RTT(void){};
/// vector of Source ids to be ignored for the ROB map clear
std::vector<uint32_t> m_l1_ROB_ids;
StatusCode queryInterface( const InterfaceID& riid, void** ppvInterface );
StatusCode initialize();
// fill histograms per event
void FillEvent();
/// set the name of the program which uses the ROBDataProviderSvc
void setCallerName(const std::string);
......@@ -92,7 +92,7 @@ class TrigROBDataProviderSvc_RTT : public TrigROBDataProviderSvc,
/// Optinonally the name of the caller of this method can be specified for cost monitoring
int collectCompleteEventData(const std::string callerName="UNKNOWN") {return TrigROBDataProviderSvc::collectCompleteEventData(callerName);};
bool isMissingPrefetching() { return m_missingPrefetchingPerEvent; };
bool isMissingPrefetching() { return 0;};// m_missingPrefetchingPerEvent; };
bool isPrefetchingAtAlgoLevel() { return m_enablePrefetchingAtAlgoLevel;};
......@@ -108,17 +108,13 @@ class TrigROBDataProviderSvc_RTT : public TrigROBDataProviderSvc,
typedef std::multimap<std::string, std::vector <uint32_t> > CALLER_ROBMAP;// map between each algo call and its ROBIds
CALLER_ROBMAP m_caller_robmap;
// void robmapPartialClear(); //obsolete
// counter of missing prefetching per call
int m_missingRequestedROBsPerCall;
bool m_missingPrefetchingPerEvent;
int m_missingRequestedROBsPerCall_pref;
bool m_missingPrefetchingPerEvent_pref;
// histogram prperties
Histo1DProperty m_histProp_requestedROBsPerAlgo;
Histo1DProperty m_histProp_requestPerAlgo;
Histo1DProperty m_histProp_callerPerEvent;
Histo1DProperty m_histProp_nocachedRequestedROBsPerAlgo;
Histo1DProperty m_histProp_nocachedRequestPerAlgo;
Histo1DProperty m_histProp_declaredROBsPerAlgo;
Histo1DProperty m_histProp_prefetchedROBsPerAlgo;
......@@ -130,9 +126,23 @@ class TrigROBDataProviderSvc_RTT : public TrigROBDataProviderSvc,
Histo1DProperty m_histProp_missingRequestPerAlgo_pref;
Histo1DProperty m_histProp_missingRequestedROBsPerCall_pref;
Histo1DProperty m_histProp_missingRequestedROBsPerAlgoButCached;
Histo1DProperty m_histProp_missingRequestPerAlgoButCached;
Histo1DProperty m_histProp_missingRequestedROBsPerCallButCached;
Histo1DProperty m_histProp_missingRequestedROBsPerAlgoButCached_pref;
Histo1DProperty m_histProp_missingRequestPerAlgoButCached_pref;
Histo1DProperty m_histProp_missingRequestedROBsPerCallButCached_pref;
//histograms
TH1F* m_hist_requestedROBsPerAlgo;
TH2F* m_hist_requestedROBsPerCallPerAlgo;
TH1F* m_hist_requestPerAlgo;
TH1F* m_hist_callerPerEvent;
TH1F* m_hist_nocachedRequestedROBsPerAlgo;
TH1F* m_hist_nocachedRequestPerAlgo;
TH1F* m_hist_declaredROBsPerAlgo;
TH1F* m_hist_prefetchedROBsPerAlgo;
......@@ -146,8 +156,16 @@ class TrigROBDataProviderSvc_RTT : public TrigROBDataProviderSvc,
TH1F* m_hist_missingRequestPerAlgo_pref;
TH1F* m_hist_missingRequestedROBsPerCall_pref;
// histogrmas for missing declarations, but cached
TH1F* m_hist_missingRequestedROBsPerAlgoButCached;
TH1F* m_hist_missingRequestPerAlgoButCached;
TH1F* m_hist_missingRequestedROBsPerCallButCached;
//hitogrmas for missing declarations during prefetching, but cached
TH1F* m_hist_missingRequestedROBsPerAlgoButCached_pref;
TH1F* m_hist_missingRequestPerAlgoButCached_pref;
TH1F* m_hist_missingRequestedROBsPerCallButCached_pref;
};
#endif
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment