diff -u -r1.2 -r1.3
--- MagneticFieldOverlay.cc	2 Jul 2013 21:19:44 -0000	1.2
+++ MagneticFieldOverlay.cc	10 Jul 2013 22:01:21 -0000	1.3
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/src/lcdd/bfield/MagneticFieldOverlay.cc,v 1.2 2013/07/02 21:19:44 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/src/lcdd/bfield/MagneticFieldOverlay.cc,v 1.3 2013/07/10 22:01:21 jeremy Exp $

 
 // LCDD
 #include "lcdd/bfield/MagneticFieldOverlay.hh"

@@ -26,13 +26,8 @@

  */
 void MagneticFieldOverlay::GetFieldValue(const double Point[3], double *Bfield) const
 {

-    //std::cout << "MagneticFieldOverlay::GetFieldValue" << std::endl;
-

     Bfield[0] = Bfield[1] = Bfield[2] = 0.;
     for (std::vector<G4MagneticField*>::const_iterator iter = _fields.begin(); iter != _fields.end(); iter++) {
         (*iter)->GetFieldValue(Point, Bfield);
     }

-
-    //std::cout << "x y z: " << Point[0] << " " << Point[1] << " " << Point[2] << std::endl;
-    //std::cout << "bx, by, bz: " << Bfield[0] << " " << Bfield[1] << " " << Bfield[2] << std::endl << std::endl;

 }

diff -u -r1.2 -r1.3
--- Solenoid.cc	2 Jul 2013 21:19:44 -0000	1.2
+++ Solenoid.cc	10 Jul 2013 22:01:21 -0000	1.3
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/src/lcdd/bfield/Solenoid.cc,v 1.2 2013/07/02 21:19:44 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/src/lcdd/bfield/Solenoid.cc,v 1.3 2013/07/10 22:01:21 jeremy Exp $

 
 // LCDD
 #include "lcdd/bfield/Solenoid.hh"

@@ -17,24 +17,16 @@

 
 /**
  * Apply simple solenoid magnetic field to the given Point.

+ * @todo Use the inner and outer Z values.

  */

-// TODO: use inner/outer Z

 void Solenoid::GetFieldValue(const double Point[3], double* Bfield) const
 {

-    //std::cout << "G4Solenoid::GetFieldValue" << std::endl;
-    //std::cout << "point: " << Point[0] << " " << Point[1] << " " << Point[2] << std::endl;
-    //std::cout << "BEFORE --> bfield " << Bfield[0] << " " << Bfield[1] << " " << Bfield[2] << std::endl;
-

     double this_radius = sqrt(Point[0] * Point[0] + Point[1] * Point[1]);

-

     if (this_radius < _innerR) {
         Bfield[2] += _innerField;
     } else if (this_radius < _outerR) {
         Bfield[2] += _outerField;
     }

-
-    //std::cout << "AFTER --> bfield = " << Bfield[0] << " " << Bfield[1] << " " << Bfield[2] << std::endl << std::endl;
-

     return;
 }
 

diff -u -r1.4 -r1.5
--- GeometryManager.cc	2 Jul 2013 21:19:44 -0000	1.4
+++ GeometryManager.cc	10 Jul 2013 22:01:21 -0000	1.5
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/src/lcdd/core/GeometryManager.cc,v 1.4 2013/07/02 21:19:44 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/src/lcdd/core/GeometryManager.cc,v 1.5 2013/07/10 22:01:21 jeremy Exp $

 
 // LCDD
 #include "lcdd/core/GeometryManager.hh"

@@ -79,9 +79,10 @@

 
 void GeometryManager::checkOverlaps(G4LogicalVolume* lvolume, bool recurse) const
 {

-    if (lvolume==0) return;

+    if (lvolume == 0)
+        return;

-    for (G4int i=0; i<lvolume->GetNoDaughters(); i++) {

+    for (G4int i = 0; i < lvolume->GetNoDaughters(); i++) {

 
         G4PVPlacement* dau = static_cast<G4PVPlacement*>(lvolume->GetDaughter(i));
 

@@ -100,14 +101,12 @@

 void GeometryManager::checkOverlaps(const G4String& name, bool recurse) const
 {
     G4LogicalVolumeStore* store = G4LogicalVolumeStore::GetInstance();

-    bool found=false;
-    for (std::vector<G4LogicalVolume*>::iterator it = store->begin();
-            it != store->end();
-            it++) {

+    bool found = false;
+    for (std::vector<G4LogicalVolume*>::iterator it = store->begin(); it != store->end(); it++) {

         G4LogicalVolume* vol = (*it);
         if (vol->GetName() == name) {
             checkOverlaps(vol, recurse);

-            found=true;

+            found = true;

             break;
         }
     }

diff -u -r1.3 -r1.4
--- LCDDMessenger.cc	10 Jul 2013 16:49:47 -0000	1.3
+++ LCDDMessenger.cc	10 Jul 2013 22:01:21 -0000	1.4
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/src/lcdd/core/LCDDMessenger.cc,v 1.3 2013/07/10 16:49:47 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/src/lcdd/core/LCDDMessenger.cc,v 1.4 2013/07/10 22:01:21 jeremy Exp $

 
 // LCDD
 #include "lcdd/core/LCDDMessenger.hh"

@@ -15,142 +15,142 @@

 // STL
 #include <cassert>
 

-LCDDMessenger::LCDDMessenger() {
-	// define UI commands
-	defineCommands();

+LCDDMessenger::LCDDMessenger()
+{
+    // define UI commands
+    defineCommands();

 }
 

-LCDDMessenger::~LCDDMessenger() {
-	delete _setupCmd;
-	delete _setURICmd;
-	delete _setSetupNameCmd;
-	delete _setVersionCmd;
-	delete _lcddDir;

+LCDDMessenger::~LCDDMessenger()
+{
+    delete _setupCmd;
+    delete _setURICmd;
+    delete _setSetupNameCmd;
+    delete _setVersionCmd;
+    delete _lcddDir;

 }
 

-void LCDDMessenger::SetNewValue(G4UIcommand *cmd, G4String newVals) {
-	LCDDParser* parser = LCDDParser::instance();
-
-	G4String singleArg = newVals;
-	std::istringstream is((const char*) newVals);
-
-	if (cmd == _setURICmd) {
-		parser->setURI(singleArg);
-	} else if (cmd == _setSetupNameCmd) {
-		parser->setSetupName(singleArg);
-	} else if (cmd == _setVersionCmd) {
-		parser->setVersion(singleArg);
-	} else if (cmd == _setupCmd) {
-		G4String uri, setup, version;
-
-		is >> uri >> setup >> version;
-
-		parser->setURI(uri);
-		parser->setSetupName(setup);
-		parser->setVersion(version);
-	} else if (cmd == _dumpCmd) {
-		//std::cout<<"arg: "<<singleArg<<std::endl;
-		NistElementsDump::writeXml(singleArg);
-	} else if (cmd == _checkOverlapsCmd || cmd == _checkOverlapsRecurseCmd) {
-
-		bool recurse = false;
-
-		if (cmd == _checkOverlapsRecurseCmd) {
-			recurse = true;
-		}
-
-		G4String vol("");
-		is >> vol;
-
-		G4cout << "vol=" << vol << G4endl;
-		G4cout << "recurse=" << recurse << G4endl;
-
-		if (newVals != "") {
-			// Check the named volume with optional recursion.
-			GeometryManager::instance()->checkOverlaps(vol, recurse);
-		} else {
-			// No volume.  Check the world, which is always done recursively!
-			GeometryManager::instance()->checkOverlaps();
-		}
-	} else {
-		G4cerr << "WARNING: Unknown cmd to LCDDMessenger - " << cmd << G4endl;
-	}

+void LCDDMessenger::SetNewValue(G4UIcommand *cmd, G4String newVals)
+{
+    LCDDParser* parser = LCDDParser::instance();
+
+    G4String singleArg = newVals;
+    std::istringstream is((const char*) newVals);
+
+    if (cmd == _setURICmd) {
+        parser->setURI(singleArg);
+    } else if (cmd == _setSetupNameCmd) {
+        parser->setSetupName(singleArg);
+    } else if (cmd == _setVersionCmd) {
+        parser->setVersion(singleArg);
+    } else if (cmd == _setupCmd) {
+        G4String uri, setup, version;
+
+        is >> uri >> setup >> version;
+
+        parser->setURI(uri);
+        parser->setSetupName(setup);
+        parser->setVersion(version);
+    } else if (cmd == _dumpCmd) {
+        //std::cout<<"arg: "<<singleArg<<std::endl;
+        NistElementsDump::writeXml(singleArg);
+    } else if (cmd == _checkOverlapsCmd || cmd == _checkOverlapsRecurseCmd) {
+
+        bool recurse = false;
+
+        if (cmd == _checkOverlapsRecurseCmd) {
+            recurse = true;
+        }
+
+        G4String vol("");
+        is >> vol;
+
+        G4cout << "vol=" << vol << G4endl;
+        G4cout << "recurse=" << recurse << G4endl;
+
+        if (newVals != "") {
+            // Check the named volume with optional recursion.
+            GeometryManager::instance()->checkOverlaps(vol, recurse);
+        } else {
+            // No volume.  Check the world, which is always done recursively!
+            GeometryManager::instance()->checkOverlaps();
+        }
+    } else {
+        G4cerr << "WARNING: Unknown cmd to LCDDMessenger - " << cmd << G4endl;
+    }

 }
 

-G4String LCDDMessenger::GetCurrentValue(G4UIcommand *) {
-	return G4String("");

+G4String LCDDMessenger::GetCurrentValue(G4UIcommand *)
+{
+    return G4String("");

 }
 

-void LCDDMessenger::defineCommands() {
-	G4UIparameter *p;
-
-	// LCDD directory
-	_lcddDir = new G4UIdirectory("/lcdd/");
-	_lcddDir->SetGuidance(
-			"XML detector description and geometry commands. [LCDD]");
-
-	// set URL for input geometry file
-	_setURICmd = new G4UIcommand("/lcdd/url", this);
-	_setURICmd->SetGuidance(
-			"Set the Uniform Resource Locator (URL) for the input geometry file.");
-	_setURICmd->AvailableForStates(G4State_PreInit);
-
-	p = new G4UIparameter("URI", 's', false);
-	_setURICmd->SetParameter(p);
-
-	// set name of GDML setup
-	_setSetupNameCmd = new G4UIcommand("/lcdd/setupName", this);
-	_setSetupNameCmd->SetGuidance("Set GDML setup name.");
-	_setSetupNameCmd->AvailableForStates(G4State_PreInit);
-
-	p = new G4UIparameter("SetupName", 's', false);
-	_setSetupNameCmd->SetParameter(p);
-
-	// set version of GDML setup
-	_setVersionCmd = new G4UIcommand("/lcdd/version", this);
-	_setVersionCmd->SetGuidance("Set GDML version tag.");
-	_setVersionCmd->AvailableForStates(G4State_PreInit);
-
-	p = new G4UIparameter("Version", 's', false);
-	_setVersionCmd->SetParameter(p);
-
-	// setup URI, Setup and Version in one command
-	_setupCmd = new G4UIcommand("/lcdd/setup", this);
-	_setupCmd->SetGuidance(
-			"Set URI, SetupName and Version with a single command.");
-	_setupCmd->AvailableForStates(G4State_PreInit);
-
-	p = new G4UIparameter("URI", 's', false);
-	p->SetGuidance(
-			"URI is a URL to the input file.  It MUST NOT contain unescaped spaces.");
-	_setupCmd->SetParameter(p);
-
-	p = new G4UIparameter("SetupName", 's', true);
-	_setupCmd->SetParameter(p);
-
-	p = new G4UIparameter("Version", 's', true);
-	_setupCmd->SetParameter(p);
-
-	_dumpCmd = new G4UIcommand("/lcdd/dumpNistElements", this);
-	_dumpCmd->SetGuidance(
-			"Dump NIST elements to file as GDML fragment, including lambda and X0.");
-	p = new G4UIparameter("Filename", 's', true);
-	p->SetDefaultValue("NistElements.xml");
-	_dumpCmd->SetParameter(p);
-
-	// Check overlaps.
-	_checkOverlapsCmd = new G4UIcommand("/lcdd/checkOverlaps",this);
-	_checkOverlapsCmd->SetGuidance("Call CheckOverlaps on a given volume or the world volume (no arguments).");
-
-	p = new G4UIparameter("Volume",'s',true);
-	p->SetDefaultValue("");
-	_checkOverlapsCmd->SetParameter(p);
-
-	// Check overlaps with recursion to daughters.
-	_checkOverlapsRecurseCmd = new G4UIcommand("/lcdd/checkOverlapsRecurse",this);
-	_checkOverlapsRecurseCmd->SetGuidance("Call CheckOverlaps on a given volume and recursively check daughters.");
-
-	p = new G4UIparameter("Volume",'s',true);
-	p->SetDefaultValue("");
-	_checkOverlapsRecurseCmd->SetParameter(p);

+void LCDDMessenger::defineCommands()
+{
+    G4UIparameter *p;
+
+    // LCDD directory
+    _lcddDir = new G4UIdirectory("/lcdd/");
+    _lcddDir->SetGuidance("XML detector description and geometry commands. [LCDD]");
+
+    // set URL for input geometry file
+    _setURICmd = new G4UIcommand("/lcdd/url", this);
+    _setURICmd->SetGuidance("Set the Uniform Resource Locator (URL) for the input geometry file.");
+    _setURICmd->AvailableForStates(G4State_PreInit);
+
+    p = new G4UIparameter("URI", 's', false);
+    _setURICmd->SetParameter(p);
+
+    // set name of GDML setup
+    _setSetupNameCmd = new G4UIcommand("/lcdd/setupName", this);
+    _setSetupNameCmd->SetGuidance("Set GDML setup name.");
+    _setSetupNameCmd->AvailableForStates(G4State_PreInit);
+
+    p = new G4UIparameter("SetupName", 's', false);
+    _setSetupNameCmd->SetParameter(p);
+
+    // set version of GDML setup
+    _setVersionCmd = new G4UIcommand("/lcdd/version", this);
+    _setVersionCmd->SetGuidance("Set GDML version tag.");
+    _setVersionCmd->AvailableForStates(G4State_PreInit);
+
+    p = new G4UIparameter("Version", 's', false);
+    _setVersionCmd->SetParameter(p);
+
+    // setup URI, Setup and Version in one command
+    _setupCmd = new G4UIcommand("/lcdd/setup", this);
+    _setupCmd->SetGuidance("Set URI, SetupName and Version with a single command.");
+    _setupCmd->AvailableForStates(G4State_PreInit);
+
+    p = new G4UIparameter("URI", 's', false);
+    p->SetGuidance("URI is a URL to the input file.  It MUST NOT contain unescaped spaces.");
+    _setupCmd->SetParameter(p);
+
+    p = new G4UIparameter("SetupName", 's', true);
+    _setupCmd->SetParameter(p);
+
+    p = new G4UIparameter("Version", 's', true);
+    _setupCmd->SetParameter(p);
+
+    _dumpCmd = new G4UIcommand("/lcdd/dumpNistElements", this);
+    _dumpCmd->SetGuidance("Dump NIST elements to file as GDML fragment, including lambda and X0.");
+    p = new G4UIparameter("Filename", 's', true);
+    p->SetDefaultValue("NistElements.xml");
+    _dumpCmd->SetParameter(p);
+
+    // Check overlaps.
+    _checkOverlapsCmd = new G4UIcommand("/lcdd/checkOverlaps", this);
+    _checkOverlapsCmd->SetGuidance("Call CheckOverlaps on a given volume or the world volume (no arguments).");
+
+    p = new G4UIparameter("Volume", 's', true);
+    p->SetDefaultValue("");
+    _checkOverlapsCmd->SetParameter(p);
+
+    // Check overlaps with recursion to daughters.
+    _checkOverlapsRecurseCmd = new G4UIcommand("/lcdd/checkOverlapsRecurse", this);
+    _checkOverlapsRecurseCmd->SetGuidance("Call CheckOverlaps on a given volume and recursively check daughters.");
+
+    p = new G4UIparameter("Volume", 's', true);
+    p->SetDefaultValue("");
+    _checkOverlapsRecurseCmd->SetParameter(p);

 }

diff -u -r1.2 -r1.3
--- Cerenkov.cc	10 Jul 2013 16:49:47 -0000	1.2
+++ Cerenkov.cc	10 Jul 2013 22:01:21 -0000	1.3
@@ -22,15 +22,12 @@

 {
     Initialize();
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 
 Cerenkov::~Cerenkov()
 {
 
 }
 

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-

 void Cerenkov::Initialize()
 {
     //

diff -u -r1.2 -r1.3
--- NonprojectiveCylinderSegmentation.cc	3 Jul 2013 20:03:49 -0000	1.2
+++ NonprojectiveCylinderSegmentation.cc	10 Jul 2013 22:01:21 -0000	1.3
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/NonprojectiveCylinderSegmentation.cc,v 1.2 2013/07/03 20:03:49 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/NonprojectiveCylinderSegmentation.cc,v 1.3 2013/07/10 22:01:21 jeremy Exp $

 
 // LCDD
 #include "lcdd/detectors/NonprojectiveCylinderSegmentation.hh"

@@ -29,11 +29,6 @@

     // global cell pos
     G4ThreeVector globalCellPos = ReadoutUtil::transformLocalToGlobal(aStep, localCellPos);
 

-    // DEBUG: print local, global cell pos
-    //G4cout << "localCellPos " << localCellPos << G4endl;
-    //G4cout << "globalCellPos " << globalCellPos << G4endl;
-    //
-

     return localCellPos;
 }
 

@@ -86,17 +81,6 @@

 
     G4ThreeVector cellCenter(cellX, cellY, cellZ);
 

-    // DEBUG: print all
-    //G4cout << G4endl;
-    //G4cout << "rcyl <" << rcyl << ">" << G4endl;
-    //G4cout << "deltaPhi <" << deltaPhi << ">" << G4endl;
-    //G4cout << "iphi <" << iphi << ">" << G4endl;
-    //G4cout << "iz <" << iz << ">" << G4endl;
-    //G4cout << "cellPhi <" << cellPhi << ">" << G4endl;
-    //G4cout << "cellCenter " << cellCenter << G4endl;
-    //G4cout << G4endl;
-    //
-

     return cellCenter;
 }
 

@@ -131,17 +115,6 @@

 
     G4ThreeVector cellCenter(cellX, cellY, cellZ);
 

-    // DEBUG: print all
-    //G4cout << G4endl;
-    //G4cout << "rcyl <" << rcyl << ">" << G4endl;
-    //G4cout << "deltaPhi <" << deltaPhi << ">" << G4endl;
-    //G4cout << "iphi <" << iphi << ">" << G4endl;
-    //G4cout << "iz <" << iz << ">" << G4endl;
-    //G4cout << "cellPhi <" << cellPhi << ">" << G4endl;
-    //G4cout << "cellCenter " << cellCenter << G4endl;
-    //G4cout << G4endl;
-    //
-

     return cellCenter;
 }
 

@@ -245,9 +218,6 @@

 
 int NonprojectiveCylinderSegmentation::computeBinZ(const G4ThreeVector& localStepPos)
 {

-    //G4cout << "localStepPos.z() <" << localStepPos.z() << ">" << G4endl;
-    //G4cout << "m_gridSizeZ <" << m_gridSizeZ << ">" << G4endl;
-

     return computeBin(localStepPos.z(), _gridSizeZ);
 }
 

diff -u -r1.4 -r1.5
--- ProjectiveSegmentation.cc	9 Jul 2013 18:51:54 -0000	1.4
+++ ProjectiveSegmentation.cc	10 Jul 2013 22:01:21 -0000	1.5
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/ProjectiveSegmentation.cc,v 1.4 2013/07/09 18:51:54 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/ProjectiveSegmentation.cc,v 1.5 2013/07/10 22:01:21 jeremy Exp $

 
 // LCDD
 #include "lcdd/detectors/ProjectiveSegmentation.hh"

@@ -14,11 +14,7 @@

 ProjectiveSegmentation::ProjectiveSegmentation(G4int ntheta, G4int nphi) :
         Segmentation(Segmentation::eProjective), _ntheta(ntheta), _nphi(nphi)
 {

-    //G4cout << "G4ProjectiveSegmentation" << G4endl;
-    //G4cout << "ntheta, nphi: " << ntheta << ", " << nphi << G4endl;
-

     computeDivisions();

-

     setBinNames();
 }
 

@@ -34,10 +30,6 @@

 
 G4ThreeVector ProjectiveSegmentation::getGlobalHitPos(const G4Step* aStep)
 {

-    // DEBUG
-    //G4cout << "G4ProjectiveSegmentation::getGlobalHitPos()" << G4endl;
-    //
-

     // divide entire theta, phi range into bins; bins always positive
     // theta, phi coord of step midpoint
     // compute bin numbers

@@ -58,20 +50,6 @@

 
     //G4ThreeVector midPos = ReadoutUtil::computeMidPos( aStep );
 

-    // DEBUG: print all
-    //G4cout << "sphi <" << midPos.phi() << ">" << G4endl;
-    //G4cout << "cphi <" << cphi << ">" << G4endl;
-    //G4cout << "sphi - cphi = " << midPos.phi() - cphi << G4endl;
-
-    //G4cout << "stheta <" << midPos.theta() << ">" << G4endl;
-    //G4cout << "ctheta <" << getThetaDim( aStep ) << ">" << G4endl;
-    //G4cout << "stheta - ctheta = " << midPos.theta() - getThetaDim( aStep ) << G4endl;
-
-    //G4cout << "rcyl <" << rcyl << ">" << G4endl;
-    //G4cout << "zcell <" << zcell << ">" << G4endl;
-    //G4cout << "globalCellPos <" << pos << ">" << G4endl;
-    //
-

     return pos;
 }
 

diff -u -r1.4 -r1.5
--- Segmentation.cc	10 Jul 2013 16:49:47 -0000	1.4
+++ Segmentation.cc	10 Jul 2013 22:01:21 -0000	1.5
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/Segmentation.cc,v 1.4 2013/07/10 16:49:47 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/Segmentation.cc,v 1.5 2013/07/10 22:01:21 jeremy Exp $

 
 // LCDD
 #include "lcdd/detectors/Segmentation.hh"

@@ -51,7 +51,7 @@

 
 G4ThreeVector Segmentation::getLocalHitPos(const G4ThreeVector& localStepPos)
 {

-	return localStepPos;

+    return localStepPos;

 }
 
 void Segmentation::resetBins()

@@ -79,7 +79,6 @@

     return valid;
 }
 

-

 const G4String& Segmentation::getTypeString()
 {
     static G4String typestr;

@@ -103,7 +102,6 @@

     return _binNames.at(idx);
 }
 

-

 void Segmentation::addBinName(const std::string& binName)
 {
     _binNames.push_back(binName);

diff -u -r1.2 -r1.3
--- IdField.cc	10 Jul 2013 21:39:09 -0000	1.2
+++ IdField.cc	10 Jul 2013 22:01:21 -0000	1.3
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/src/lcdd/id/IdField.cc,v 1.2 2013/07/10 21:39:09 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/src/lcdd/id/IdField.cc,v 1.3 2013/07/10 22:01:21 jeremy Exp $

 
 // LCDD
 #include "lcdd/id/IdField.hh"

@@ -11,19 +11,16 @@

 {
 }
 

-

 IdField::IdField(const std::string& label, SizeType start, SizeType length, bool isSigned) :
             _label(label), _start(start), _length(length), _isSigned(isSigned)
 {
 }
 

-

 void IdField::setLabel(const std::string& l)
 {
     _label = l;
 }
 

-

 void IdField::setStart(SizeType st)
 {
     _start = st;

diff -u -r1.3 -r1.4
--- IdManager.cc	10 Jul 2013 20:49:06 -0000	1.3
+++ IdManager.cc	10 Jul 2013 22:01:21 -0000	1.4
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/src/lcdd/id/IdManager.cc,v 1.3 2013/07/10 20:49:06 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/src/lcdd/id/IdManager.cc,v 1.4 2013/07/10 22:01:21 jeremy Exp $

 
 // LCDD
 #include "lcdd/id/IdManager.hh"

@@ -87,13 +87,11 @@

     os << std::endl;
 }
 

-

 bool IdManager::hasPhysVolIds(G4VPhysicalVolume* pv) const
 {
    return _physVolIdMap.hasPhysVolIds(pv);
 }
 

-

 const PhysVolIdMap& IdManager::getPhysVolIdMap() const
 {
    return _physVolIdMap;

diff -u -r1.3 -r1.4
--- IdSpec.cc	10 Jul 2013 18:06:19 -0000	1.3
+++ IdSpec.cc	10 Jul 2013 22:01:21 -0000	1.4
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/src/lcdd/id/IdSpec.cc,v 1.3 2013/07/10 18:06:19 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/src/lcdd/id/IdSpec.cc,v 1.4 2013/07/10 22:01:21 jeremy Exp $

 
 // LCDD
 #include "lcdd/id/IdSpec.hh"

@@ -17,13 +17,11 @@

     deleteIdFields();
 }
 

-

 void IdSpec::setName(const std::string& n)
 {
     _name = n;
 }
 

-

 void IdSpec::setBitLength(SizeType st)
 {
     _bitLength = st;

@@ -51,7 +49,6 @@

     _idFields.push_back(f);
 }
 

-

 IdField* IdSpec::getIdField(const std::string& n) const
 {
     IdField* f = 0;

@@ -69,7 +66,6 @@

     return _idFields[st];
 }
 

-

 const IdSpec::IdFields& IdSpec::getIdFields() const
 {
     return _idFields;