diff --git a/Trigger/TrigCost/TrigCostRootAnalysis/Root/Config.cxx b/Trigger/TrigCost/TrigCostRootAnalysis/Root/Config.cxx
index fce9ed7a8bada74f2b5c0fea1c180cf5d02ce62b..647e0765447498a09abe73acbb516fc377bc033e 100644
--- a/Trigger/TrigCost/TrigCostRootAnalysis/Root/Config.cxx
+++ b/Trigger/TrigCost/TrigCostRootAnalysis/Root/Config.cxx
@@ -1057,7 +1057,7 @@ namespace TrigCostRootAnalysis {
break;
case '1':
- // I'm setting the _patternsNoLumiWeight strings
+ // I'm setting the patternsNoLumiWeight strings
patternsNoLumiWeight.push_back(std::string(optarg));
while (optind < argc) {
if (std::string(argv[optind]).substr(0, 1) == "-") { //We're back to arguments
@@ -1068,7 +1068,7 @@ namespace TrigCostRootAnalysis {
break;
case '2':
- // I'm setting the _patternsNoMuLumiWeight strings
+ // I'm setting the patternsNoMuLumiWeight strings
patternsNoMuLumiWeight.push_back(std::string(optarg));
while (optind < argc) {
if (std::string(argv[optind]).substr(0, 1) == "-") { //We're back to arguments
@@ -1079,7 +1079,7 @@ namespace TrigCostRootAnalysis {
break;
case '3':
- // I'm setting the _patternsNoBunchLumiWeight strings
+ // I'm setting the patternsNoBunchLumiWeight strings
patternsNoBunchLumiWeight.push_back(std::string(optarg));
while (optind < argc) {
if (std::string(argv[optind]).substr(0, 1) == "-") { //We're back to arguments
diff --git a/Trigger/TrigCost/TrigCostRootAnalysis/Root/CounterRatesChain.cxx b/Trigger/TrigCost/TrigCostRootAnalysis/Root/CounterRatesChain.cxx
index 2b897d9aeb7d319d4a5050e43605a7fbc70169ba..8a52ae7e8b4f982e6b2004ab573e6d166bb1183d 100644
--- a/Trigger/TrigCost/TrigCostRootAnalysis/Root/CounterRatesChain.cxx
+++ b/Trigger/TrigCost/TrigCostRootAnalysis/Root/CounterRatesChain.cxx
@@ -105,7 +105,7 @@ namespace TrigCostRootAnalysis {
L2->getLumiExtrapolationFactor(m_costData->getLumi(), m_disableEventLumiExtrapolation);
//if (getName() == "HLT_cscmon_L1All") Info("DEBUG", "WL1:%f, NL1:%s, 1-L1: %f, HLT:%f, total: %f, lumi%f",
// m_lowerRates->getLastWeight(), m_lowerRates->getName().c_str(), 1. - L1Weight,
- // L2->getPSWeight(_includeExpress), L2->getPSWeight(_includeExpress) * ( 1. - L1Weight ),
+ // L2->getPSWeight(includeExpress), L2->getPSWeight(includeExpress) * ( 1. - L1Weight ),
// L2->getLumiExtrapolationFactor() );
m_cachedWeight = L2->getPSWeight(includeExpress) * (1. - L1Weight);
} else { // A L1Chain
diff --git a/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorBase.cxx b/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorBase.cxx
index 771a7e4de662ea4d70133488d3b941a2f910a57f..13d52df40e8fa83b5e9cc7c9c338b00ac2f9a41f 100644
--- a/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorBase.cxx
+++ b/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorBase.cxx
@@ -97,7 +97,7 @@ namespace TrigCostRootAnalysis {
}
/**
- * @ param _pass Set which pass through the input files are we on.
+ * @ param pass Set which pass through the input files are we on.
*/
void MonitorBase::setPass(UInt_t pass) {
m_pass = pass;
@@ -253,7 +253,7 @@ namespace TrigCostRootAnalysis {
* @param name reference to the name of counter collection to add (will be created if does not exist)
* @param lumiBlockNumber Current LB, used for bookkeeping for this CounterCollection
* @param lumiLength Length of current LB, used for bookkeeping for this CounterCollection
- * @param _type Conf key specifying the type of this CounterCollection which may be queried later.
+ * @param type Conf key specifying the type of this CounterCollection which may be queried later.
*/
void MonitorBase::addToCollectionsToProcess(const std::string& name, UInt_t lumiBlockNumber, Float_t lumiLength,
const ConfKey_t type) {
diff --git a/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorRates.cxx b/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorRates.cxx
index cd3be03cff6970fc1cbdf69f3b7a5f14dd4d7d96..e6fd547bdbf496cc857b648f8c09e2b688420add 100644
--- a/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorRates.cxx
+++ b/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorRates.cxx
@@ -405,9 +405,9 @@ namespace TrigCostRootAnalysis {
CounterBaseRates* L1Counter = nullptr;
if (itCm != counterMap->end()) L1Counter = (CounterBaseRates*) itCm->second;
- //bool _hasL1Seed = kTRUE;
+ //bool hasL1Seed = kTRUE;
if (L1Name == Config::config().getStr(kBlankString)) {
- //_hasL1Seed = kFALSE;
+ //hasL1Seed = kFALSE;
L1Counter = m_globalRateL1Counter;
}
@@ -452,7 +452,7 @@ namespace TrigCostRootAnalysis {
// Then at the end it subtracts this rate from the global rate. So we need to add *all* chains *but* this one.
CounterBaseRates* thisChainsUniqueCounter = 0;
- if (Config::config().getInt(kDoUniqueRates) == kTRUE /*&& _hasL1Seed == kTRUE*/) {
+ if (Config::config().getInt(kDoUniqueRates) == kTRUE /*&& hasL1Seed == kTRUE*/) {
for (CounterMapIt_t itA = counterMap->begin(); itA != counterMap->end(); ++itA) {
CounterBaseRates* counter = static_cast<CounterBaseRates*>(itA->second);
if (counter->getStrDecoration(kDecType) != "UniqueHLT") continue;
@@ -617,7 +617,7 @@ namespace TrigCostRootAnalysis {
// Debug
// std::stringstream ss;
- // for (UInt_t _group = 0; _group < chainGroups.size(); ++_group) ss << chainGroups.at(_group) << " ";
+ // for (UInt_t group = 0; group < chainGroups.size(); ++group) ss << chainGroups.at(group) << " ";
// ss << TrigConfInterface::getChainCPSGroup(i);
// Info("MonitorRates::createGroupCounters","Chain %s in groups: %s", TrigConfInterface::getChainName(i).c_str(),
// ss.str().c_str());
diff --git a/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorRatesUpgrade.cxx b/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorRatesUpgrade.cxx
index e624ae4514b3883a8417ecd137acb218ed7ec481..6d0533b0095cdfa65689a147aac081c3fe476adc 100644
--- a/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorRatesUpgrade.cxx
+++ b/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorRatesUpgrade.cxx
@@ -262,8 +262,8 @@ namespace TrigCostRootAnalysis {
if (t == 15) triggerLogic.addCondition("TE", 1, sE, 0, 0, 49);
if (t == 16) triggerLogic.addCondition("HT", 1, sE, 0, 0, 49);
- auto _it = m_upgradeChains.insert(ChainInfo(name.str(), 1, triggerLogic, group.str(), "", 1., 1.));
- TriggerLogic* tl = const_cast<TriggerLogic*>(&(_it->m_triggerLogic)); //Why is this const in the first
+ auto it = m_upgradeChains.insert(ChainInfo(name.str(), 1, triggerLogic, group.str(), "", 1., 1.));
+ TriggerLogic* tl = const_cast<TriggerLogic*>(&(it->m_triggerLogic)); //Why is this const in the first
// place?
RatesChainItem* L1 = new RatesChainItem(name.str(), /*chainLevel=*/ 1, 1.);
@@ -276,7 +276,7 @@ namespace TrigCostRootAnalysis {
}
for (std::multiset<ChainInfo>::iterator it = m_upgradeChains.begin(); it != m_upgradeChains.end(); ++it) {
- //for (auto _item : m_upgradeChains) {
+ //for (auto item : m_upgradeChains) {
if (it->m_level == 2) {
continue; // not doing HLT yet
}
@@ -373,18 +373,18 @@ namespace TrigCostRootAnalysis {
// for (int jE = 10; jE <= 25; jE += 5) {
// for (int TE = 250; TE <= 500; TE += 50) {
- // std::string _chainName = "L1_4J" + std::to_string(jE) + "__AND__L1_TE" + std::to_string(TE);
- // CounterRatesIntersection* _L1Chain = new CounterRatesIntersection(m_costData, _chainName, ID++, 10,
+ // std::string chainName = "L1_4J" + std::to_string(jE) + "__AND__L1_TE" + std::to_string(TE);
+ // CounterRatesIntersection* L1Chain = new CounterRatesIntersection(m_costData, chainName, ID++, 10,
// (MonitorBase*)this); // Mint new counter
- // _L1Chain->decorate(kDecRatesGroupName, "Intersection" );
- // _L1Chain->decorate(kDecPrescaleStr, "-");
- // _L1Chain->decorate(kDecType, "Intersection");
- // _L1Chain->addL1Item( m_chainItemsL1["L1_4J" + std::to_string(jE)] );
- // _L1Chain->addL1Item( m_chainItemsL1["L1_TE" + std::to_string(TE)] );
+ // L1Chain->decorate(kDecRatesGroupName, "Intersection" );
+ // L1Chain->decorate(kDecPrescaleStr, "-");
+ // L1Chain->decorate(kDecType, "Intersection");
+ // L1Chain->addL1Item( m_chainItemsL1["L1_4J" + std::to_string(jE)] );
+ // L1Chain->addL1Item( m_chainItemsL1["L1_TE" + std::to_string(TE)] );
// assert( m_chainItemsL1.count("L1_4J" + std::to_string(jE)) + m_chainItemsL1.count("L1_TE" +
// std::to_string(TE)) == 2);
- // (*counterMap)[_chainName] = static_cast<CounterBase*>(_L1Chain); // Insert into the counterMap
- // Info("MonitorRatesUpgrade::createL1Counters","Made a L1 counter for: %s", _L1Chain->getName().c_str() );
+ // (*counterMap)[chainName] = static_cast<CounterBase*>(L1Chain); // Insert into the counterMap
+ // Info("MonitorRatesUpgrade::createL1Counters","Made a L1 counter for: %s", L1Chain->getName().c_str() );
// }
// }
@@ -724,11 +724,11 @@ namespace TrigCostRootAnalysis {
//if ( fabs( m_eventsToMix - round(m_eventsToMix) ) < 0.1) m_eventsToMix = round(m_eventsToMix);
- ////static Int_t _debug2 = 0;
- // if (++_debug2 < 20) Info("MonitorRatesUpgrade::newEvent", "Mixing %i events (f %f)", (Int_t)
+ ////static Int_t debug2 = 0;
+ // if (++debug2 < 20) Info("MonitorRatesUpgrade::newEvent", "Mixing %i events (f %f)", (Int_t)
// round(m_eventsToMix), m_eventsToMix);
// // Add pileup
- // for (Int_t _pu = 0; _pu < (Int_t) round(m_eventsToMix); ++_pu) { // Cast to int rounds down
+ // for (Int_t pu = 0; pu < (Int_t) round(m_eventsToMix); ++pu) { // Cast to int rounds down
// UInt_t pileupLottery = m_R3.Integer( m_pileupDatabase.size() );
// m_thisEventPtr->add( m_pileupDatabase.at( pileupLottery ) );
// }
diff --git a/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorSliceCPU.cxx b/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorSliceCPU.cxx
index bc8bfb74a267b8df362523aeda04895a80602d35..d66c6289d741835f1853d91eadf0926561ec5c71 100644
--- a/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorSliceCPU.cxx
+++ b/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorSliceCPU.cxx
@@ -142,7 +142,7 @@ namespace TrigCostRootAnalysis {
/**
* Construct new counter of correct derived type, pass back as base type.
* This function must be implemented by all derived monitor types.
- * @see MonitorBase::addCounter( const std::string &_name, Int_t _ID )
+ * @see MonitorBase::addCounter( const std::string &_name, Int_t ID )
* @param name Cost reference to name of counter.
* @param ID Reference to ID number of counter.
* @returns Base class pointer to new counter object of correct serived type.
diff --git a/Trigger/TrigCost/TrigCostRootAnalysis/Root/RatesChainItem.cxx b/Trigger/TrigCost/TrigCostRootAnalysis/Root/RatesChainItem.cxx
index f2ba8657c291e75f578e50d3742e7ceba98e3004..e2173479e915e2403b4c99afd00af1cb6085d9bd 100644
--- a/Trigger/TrigCost/TrigCostRootAnalysis/Root/RatesChainItem.cxx
+++ b/Trigger/TrigCost/TrigCostRootAnalysis/Root/RatesChainItem.cxx
@@ -369,7 +369,7 @@ namespace TrigCostRootAnalysis {
}
/**
- * @param _eventTOBs A TOBAccumulator of all TOBs in this event or pseudo-event (simulated high pileup TOB overlay).
+ * @param eventTOBs A TOBAccumulator of all TOBs in this event or pseudo-event (simulated high pileup TOB overlay).
* Note - this function call requires a TriggerLogic pointer to be set, this logic will be used against the set of
*TOBs
*/
diff --git a/Trigger/TrigCost/TrigCostRootAnalysis/Root/TrigConfInterface.cxx b/Trigger/TrigCost/TrigCostRootAnalysis/Root/TrigConfInterface.cxx
index d82ed86d6d990f78a651ac96f46dac06c2463765..37a2b0197519e42a2d2e6f26d16b0326f7ea1212 100644
--- a/Trigger/TrigCost/TrigCostRootAnalysis/Root/TrigConfInterface.cxx
+++ b/Trigger/TrigCost/TrigCostRootAnalysis/Root/TrigConfInterface.cxx
@@ -526,7 +526,7 @@ namespace TrigCostRootAnalysis {
if (Config::config().debug()) Info("TrigConfInterface::dump", "Saving trigger configuration to %s",
fileName.c_str());
- //std::ofstream _foutHtml( std::string(fileName + ".htm").c_str() );
+ //std::ofstream foutHtml( std::string(fileName + ".htm").c_str() );
std::ofstream foutJson(fileName.c_str());
JsonExport* json = new JsonExport();
@@ -541,9 +541,9 @@ namespace TrigCostRootAnalysis {
// CHAIN
for (UInt_t c = 0; c < getTCT()->GetChainN(); ++c) {
Bool_t isL1 = kFALSE;
- //std::string _counter = "</b>, Counter:<i>";
+ //std::string counter = "</b>, Counter:<i>";
if (getTCT()->GetChainLevel(c) == 1) {
- //_counter = "</b>, CTPID:<i>";
+ //counter = "</b>, CTPID:<i>";
isL1 = kTRUE;
} else if (jsonDoingL1 == kTRUE) {
//switch over to HLT
@@ -552,16 +552,16 @@ namespace TrigCostRootAnalysis {
jsonDoingL1 = kFALSE;
}
//foutHtml << "<hr>" << std::endl;
- //foutHtml << "<li>Trigger Chain: Name:<b>" << getTCT()->GetChainName(c) << _counter <<
+ //foutHtml << "<li>Trigger Chain: Name:<b>" << getTCT()->GetChainName(c) << counter <<
// getTCT()->GetChainCounter(c) << "</i></li>" << std::endl;
std::string chainName = getTCT()->GetChainName(c);
json->addNode(foutJson, chainName + " (PS:" + floatToString(getTCT()->GetPrescale(chainName), 2) + ")", "C");
// foutHtml << "<li>Prescale:<i>" << getPrescale( getTCT()->GetChainName(c) ) << "</i></li>" << std::endl;
// if (getTCT()->GetChainGroupNameSize(c)) {
// foutHtml << "<li>Groups:<i>";
- // for (UInt_t _g = 0; _g < getTCT()->GetChainGroupNameSize(c); ++_g) {
- // foutHtml << getTCT()->GetChainGroupName( c, _g );
- // if (_g != getTCT()->GetChainGroupNameSize(c) - 1) foutHtml << ",";
+ // for (UInt_t g = 0; g < getTCT()->GetChainGroupNameSize(c); ++g) {
+ // foutHtml << getTCT()->GetChainGroupName( c, g );
+ // if (g != getTCT()->GetChainGroupNameSize(c) - 1) foutHtml << ",";
// }
// foutHtml << "</i></li>" << std::endl;
// }
diff --git a/Trigger/TrigCost/TrigCostRootAnalysis/Root/TrigCostData_Calculations.cxx b/Trigger/TrigCost/TrigCostRootAnalysis/Root/TrigCostData_Calculations.cxx
index 27f170278938a1afb07ebce4c85e20e93f7a2bb2..08659abc664bf7b59a823b9fd33c384d564c7b88 100644
--- a/Trigger/TrigCost/TrigCostRootAnalysis/Root/TrigCostData_Calculations.cxx
+++ b/Trigger/TrigCost/TrigCostRootAnalysis/Root/TrigCostData_Calculations.cxx
@@ -632,13 +632,13 @@ namespace TrigCostRootAnalysis {
/**
* As algs are already stored under sequences (hence - vector<vector<stuff>>) we cannot go deeper.
* But algs can have many ROI. So we use a linking index to connect seq_alg_roi_index() with a location in seq_roi().
- * At this location we find a vector with size getSeqAlgNRoI(_seq, _alg) which contains a list of ROI ID
- * These can be accessed in the D3PD by calling getRoIIndexFromId( _roiID ) and then looking at the returned D3PD
+ * At this location we find a vector with size getSeqAlgNRoI(seq, alg) which contains a list of ROI ID
+ * These can be accessed in the D3PD by calling getRoIIndexFromId( roiID ) and then looking at the returned D3PD
*index location.
*
* Given this complexity, it is probably better to look at the example below.
*
- * @see getRoIIndexFromId( _roiID )
+ * @see getRoIIndexFromId( roiID )
* @param n Sequence index in D3PD.
* @param a Algorithm index in sequence.
* @param roi Which ROI to get the ID for - this still needs to be mapped to the location in the D3PD using
diff --git a/Trigger/TrigCost/TrigCostRootAnalysis/Root/TrigXMLService.cxx b/Trigger/TrigCost/TrigCostRootAnalysis/Root/TrigXMLService.cxx
index e62829106226524887f9d37fc1f7ff4633573cac..647e40267420e7f7c3af4d2d4d5ba7f26d8cc657 100644
--- a/Trigger/TrigCost/TrigCostRootAnalysis/Root/TrigXMLService.cxx
+++ b/Trigger/TrigCost/TrigCostRootAnalysis/Root/TrigXMLService.cxx
@@ -83,8 +83,8 @@ namespace TrigCostRootAnalysis {
if (mr == Config::config().getInt(kRunNumber)) {
Fatal("TrigXMLService::TrigXMLService",
"If doing MultiRun, provide the 'primary' run's inputs first, followed by the additional runs whose run numbers were speificed to --multiRun");
- //Bool_t _primaryRunOpenedFirstBeforeMultiRunInputFiles = kFALSE;
- //assert(_primaryRunOpenedFirstBeforeMultiRunInputFiles);
+ //Bool_t primaryRunOpenedFirstBeforeMultiRunInputFiles = kFALSE;
+ //assert(primaryRunOpenedFirstBeforeMultiRunInputFiles);
std::abort();
}
parseRunXML(mr, kFALSE);
@@ -1259,7 +1259,7 @@ namespace TrigCostRootAnalysis {
* Read (if not already imported) the XML rates and bunch groups for this run.
* Return the weight for this event and store the event's bunch group setting using the config service.
* @param pass Which pass through the file(s), only increment counters on first pass
- * @param _bcid Current event BCID
+ * @param bcid Current event BCID
* @return The event weight from the EnhancedBias XML.
*/
Float_t TrigXMLService::getEventWeight(UInt_t eventNumber, UInt_t lb, UInt_t pass) {