Commit in slic on MAIN | |||
include/LcioHitsCollectionBuilder.hh | +3 | -3 | 1.9 -> 1.10 |
/PackageInfo.hh.in | +25 | -21 | 1.6 -> 1.7 |
src/LcioHitsCollectionBuilder.cc | +12 | -12 | 1.27 -> 1.28 |
+40 | -36 |
update changed method names
diff -u -r1.9 -r1.10 --- LcioHitsCollectionBuilder.hh 1 Jul 2013 21:01:30 -0000 1.9 +++ LcioHitsCollectionBuilder.hh 9 Jul 2013 18:47:14 -0000 1.10 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/include/LcioHitsCollectionBuilder.hh,v 1.9 2013/07/01 21:01:30 jeremy Exp $
+// $Header: /cvs/lcd/slic/include/LcioHitsCollectionBuilder.hh,v 1.10 2013/07/09 18:47:14 jeremy Exp $
#ifndef SLIC_LCIOHITSCOLLECTIONBUILDER_HH #define SLIC_LCIOHITSCOLLECTIONBUILDER_HH
@@ -85,10 +85,10 @@
void setCalFlagDefaults(); // combine Mcp hit contribs using track ID
- void combineMcpHitContribs(const McpHitContribList& long_contrib, McpHitContribList& combined_contrib);
+ void combineMcpHitContribs(const HitContributionList& long_contrib, HitContributionList& combined_contrib);
// find single contrib by track ID in the combined list
- HitContribution* findMcpHitContribByTrackID(int trk_id, McpHitContribList& contribs);
+ HitContribution* findMcpHitContribByTrackID(int trk_id, HitContributionList& contribs);
// set endcap bit in trk or cal flag depending on SD type void setEndcapFlag(SensitiveDetector* g4sd);
diff -u -r1.6 -r1.7 --- PackageInfo.hh.in 11 Apr 2013 18:47:17 -0000 1.6 +++ PackageInfo.hh.in 9 Jul 2013 18:47:14 -0000 1.7 @@ -1,27 +1,36 @@
-// $Header: /cvs/lcd/slic/include/PackageInfo.hh.in,v 1.6 2013/04/11 18:47:17 jeremy Exp $
+// $Header: /cvs/lcd/slic/include/PackageInfo.hh.in,v 1.7 2013/07/09 18:47:14 jeremy Exp $
#ifndef SLIC_PACKAGE_INFO_HH #define SLIC_PACKAGE_INFO_HH 1 namespace slic {
- class PackageInfo {
+class PackageInfo {
- public:
+public:
- static std::string& getVersionString() { - static std::string ver_str = "@SLIC_VERSION@"; - return ver_str; - } - - static std::string& getNameString() { - static std::string name_str = "Simulation for the Linear Collider"; - return name_str; - }
+ static std::string& getVersionString() + { + static std::string ver_str = "@SLIC_VERSION@"; + return ver_str; + } + + static std::string& getNameString() + { + static std::string name_str = "Simulation for the Linear Collider"; + return name_str; + }
- static std::string& getAbbrevString() { - static std::string abbrev_str = "slic"; - return abbrev_str; - }
+ static std::string& getAbbrevString() + { + static std::string abbrev_str = "slic"; + return abbrev_str; + } + + static std::string getFullApplicationString() + { + static std::string fullVerStr = getNameString() + " " + getVersionString(); + return fullVerStr; + }
/* static std::string& getAuthorString()
@@ -71,11 +80,6 @@
} */
- static std::string getFullApplicationString() { - static std::string fullVerStr = getNameString() + " " + getVersionString(); - return fullVerStr; - } -
}; }
diff -u -r1.27 -r1.28 --- LcioHitsCollectionBuilder.cc 1 Jul 2013 21:01:31 -0000 1.27 +++ LcioHitsCollectionBuilder.cc 9 Jul 2013 18:47:14 -0000 1.28 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/LcioHitsCollectionBuilder.cc,v 1.27 2013/07/01 21:01:31 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/LcioHitsCollectionBuilder.cc,v 1.28 2013/07/09 18:47:14 jeremy Exp $
// SLIC #include "LcioHitsCollectionBuilder.hh"
@@ -248,9 +248,9 @@
// compare edep of calHit with simHit when debugging //#ifdef SLIC_DEBUG
- const McpHitContribList& contribs = calHit->getMcpHitContribList();
+ const HitContributionList& contribs = calHit->getHitContributions();
double totE = 0;
- for (McpHitContribList::const_iterator iter = contribs.begin(); iter != contribs.end(); iter++) {
+ for (HitContributionList::const_iterator iter = contribs.begin(); iter != contribs.end(); iter++) {
totE += (*iter).getEdep(); }
@@ -320,21 +320,21 @@
void LcioHitsCollectionBuilder::addMcpContribs(CalorimeterHit* g4CalHit, IMPL::SimCalorimeterHitImpl* simCalHit) { // Create empty hit contrib list.
- McpHitContribList contribs;
+ HitContributionList contribs;
// Use aggregation of contribs by track ID if CHBIT_PDG is not set. if (!m_calCollFlag.bitSet(LCIO::CHBIT_PDG)) { // Pass a ref to contrib list, which will get filled.
- combineMcpHitContribs(g4CalHit->getMcpHitContribList(), contribs);
+ combineMcpHitContribs(g4CalHit->getHitContributions(), contribs);
} // Otherwise, use the complete list from the CalHit. else {
- contribs = g4CalHit->getMcpHitContribList();
+ contribs = g4CalHit->getHitContributions();
} // Add contribs to the LCIO MCParticle. size_t ncontrib = 0;
- for (McpHitContribList::const_iterator iter = contribs.begin(); iter != contribs.end(); iter++) {
+ for (HitContributionList::const_iterator iter = contribs.begin(); iter != contribs.end(); iter++) {
// This contrib. const HitContribution& contrib = (*iter);
@@ -375,12 +375,12 @@
#endif }
-void LcioHitsCollectionBuilder::combineMcpHitContribs(const McpHitContribList& longContrib, - McpHitContribList& combinedContrib) {
+void LcioHitsCollectionBuilder::combineMcpHitContribs(const HitContributionList& longContrib, + HitContributionList& combinedContrib) {
combinedContrib.clear(); // iterate over long list (one entry for every hit)
- for (McpHitContribList::const_iterator iter = longContrib.begin(); iter != longContrib.end(); iter++) {
+ for (HitContributionList::const_iterator iter = longContrib.begin(); iter != longContrib.end(); iter++) {
int trkId = (*iter).getTrackID(); //log().debug("Combining hits on trk_id: " + StringUtil::toString( trk_id ) );
@@ -404,9 +404,9 @@
} HitContribution* LcioHitsCollectionBuilder::findMcpHitContribByTrackID(int trk_id,
- McpHitContribList& contribs) {
+ HitContributionList& contribs) {
HitContribution* c = 0;
- for (McpHitContribList::iterator iter = contribs.begin(); iter != contribs.end(); iter++) {
+ for (HitContributionList::iterator iter = contribs.begin(); iter != contribs.end(); iter++) {
if ((*iter).getTrackID() == trk_id) { c = &(*iter); break;
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1