5 modified files
projects/lcdd/branches/v00-00-01_LCDD-104-dev
--- projects/lcdd/branches/v00-00-01_LCDD-104-dev/CMakeLists.txt 2014-02-18 22:44:52 UTC (rev 3011)
+++ projects/lcdd/branches/v00-00-01_LCDD-104-dev/CMakeLists.txt 2014-02-18 23:39:47 UTC (rev 3012)
@@ -13,7 +13,7 @@
# project version
SET( LCDD_VERSION_MAJOR 3 )
SET( LCDD_VERSION_MINOR 3 )
-SET( LCDD_VERSION_PATCH 0 )
+SET( LCDD_VERSION_PATCH 1 )
# find ilcutil
FIND_PACKAGE( ILCUTIL COMPONENTS ILCSOFT_CMAKE_MODULES REQUIRED )
projects/lcdd/branches/v00-00-01_LCDD-104-dev/include/lcdd/segmentation
--- projects/lcdd/branches/v00-00-01_LCDD-104-dev/include/lcdd/segmentation/Segmentation.hh 2014-02-18 22:44:52 UTC (rev 3011)
+++ projects/lcdd/branches/v00-00-01_LCDD-104-dev/include/lcdd/segmentation/Segmentation.hh 2014-02-18 23:39:47 UTC (rev 3012)
@@ -70,11 +70,6 @@
G4ThreeVector getLocalHitPosition(const G4ThreeVector& localStepPos);
/**
- * Reset the bins values to all zero.
- */
- void resetBins();
-
- /**
* Get the type of this segmentation.
* @return The Segmentation type as an enum.
*/
projects/lcdd/branches/v00-00-01_LCDD-104-dev/src/lcdd/detectors
--- projects/lcdd/branches/v00-00-01_LCDD-104-dev/src/lcdd/detectors/LegacyCalorimeterHitProcessor.cc 2014-02-18 22:44:52 UTC (rev 3011)
+++ projects/lcdd/branches/v00-00-01_LCDD-104-dev/src/lcdd/detectors/LegacyCalorimeterHitProcessor.cc 2014-02-18 23:39:47 UTC (rev 3012)
@@ -38,7 +38,7 @@
G4ThreeVector globalCellPosition = segmentation->getGlobalHitPosition(step);
// Set the segmentation bin values from the step.
- segmentation->resetBins();
+ //segmentation->resetBins();
segmentation->setBins(step);
// Create a 64-bit ID from the step information.
projects/lcdd/branches/v00-00-01_LCDD-104-dev/src/lcdd/detectors
--- projects/lcdd/branches/v00-00-01_LCDD-104-dev/src/lcdd/detectors/OpticalCalorimeterHitProcessor.cc 2014-02-18 22:44:52 UTC (rev 3011)
+++ projects/lcdd/branches/v00-00-01_LCDD-104-dev/src/lcdd/detectors/OpticalCalorimeterHitProcessor.cc 2014-02-18 23:39:47 UTC (rev 3012)
@@ -52,8 +52,6 @@
G4double theEdep = double(NCerenPhotons);
// get global cell pos from seg
G4ThreeVector globalCellPos = getGlobalHitPosition(apreStepPoint);
- // reset the seg bins
- _calorimeter->getSegmentation()->resetBins();
// set the seg bins
_calorimeter->getSegmentation()->setBins(step);
projects/lcdd/branches/v00-00-01_LCDD-104-dev/src/lcdd/segmentation
--- projects/lcdd/branches/v00-00-01_LCDD-104-dev/src/lcdd/segmentation/Segmentation.cc 2014-02-18 22:44:52 UTC (rev 3011)
+++ projects/lcdd/branches/v00-00-01_LCDD-104-dev/src/lcdd/segmentation/Segmentation.cc 2014-02-18 23:39:47 UTC (rev 3012)
@@ -6,12 +6,10 @@
Segmentation::Segmentation(EType segType, int nbins) :
_numBins(nbins), _type(segType) {
-
- // reserve nbins
- _bins.reserve(_numBins);
-
- // fill in 0 vals
- resetBins();
+ // Fill bins with zeros.
+ for (int i=0; i<_numBins; i++) {
+ _bins.push_back(0);
+ }
}
Segmentation::~Segmentation() {
@@ -37,15 +35,6 @@
return localStepPos;
}
-void Segmentation::resetBins() {
-
- // Clear the bin values.
- _bins.clear();
-
- // Re-reserve space for new bin values, just in case.
- _bins.reserve(_numBins);
-}
-
void Segmentation::printOutBins(std::ostream& os, const std::vector<int>& bins) {
os << "segmentationBins <" << bins.size() << "> :: ";
for (std::vector<int>::const_iterator iter = bins.begin(); iter != bins.end(); iter++) {
@@ -56,11 +45,9 @@
bool Segmentation::isValidSolid(G4VSolid* s) {
bool valid = true;
-
if (0 == s) {
valid = false;
}
-
return valid;
}
SVNspam 0.1