diff --git a/GeoMaterial2G4/src/Geo2G4MaterialFactory.cxx b/GeoMaterial2G4/src/Geo2G4MaterialFactory.cxx index 05d71ad4d971bddf86d91ffe07b59e9d5f6610d4..3cd1e81f346bdd0dfee6d75f7425ac86ed0bf8f5 100644 --- a/GeoMaterial2G4/src/Geo2G4MaterialFactory.cxx +++ b/GeoMaterial2G4/src/Geo2G4MaterialFactory.cxx @@ -13,7 +13,6 @@ #include "G4Material.hh" - // Geo2G4MaterialFactory::Geo2G4MaterialFactory(): m_msg("Geo2G4MaterialFactory") Geo2G4MaterialFactory::Geo2G4MaterialFactory() { @@ -92,15 +91,11 @@ G4Material* Geo2G4MaterialFactory::Build(const GeoMaterial* theMat) m_definedMaterials[theMat->getName()]=newmaterial; - if(G4VERBOSE>1) { - std::cout <<" ...... DEBUG of m_definedMaterials --- START ---" <<std::endl; - for (auto& t : m_definedMaterials) - std::cout <<"GeoModelMaterialName: "<< t.first << " --- G4MaterialName: " - << t.second->GetName() << std::endl; - - std::cout <<" ...... DEBUG of m_definedMaterials --- END ---" <<std::endl; - } - +// std::cout <<" ...... DEBUG of m_definedMaterials --- START ---" <<std::endl; +// for (auto& t : m_definedMaterials) +// std::cout <<"GeoModelMaterialName: "<< t.first << " --- G4MaterialName: " +// << t.second->GetName() << std::endl; +// std::cout <<" ...... DEBUG of m_definedMaterials --- END ---" <<std::endl; // Check if we have the situation when on GeoModel side two different // materials share the same name. diff --git a/GeoModel2G4/src/ExtParameterisedVolumeBuilder.cxx b/GeoModel2G4/src/ExtParameterisedVolumeBuilder.cxx index b819071e3058b5eb072d7bdd567b0cf34c908e06..b5af51bb087b3a3b393f796bbc73393499258500 100644 --- a/GeoModel2G4/src/ExtParameterisedVolumeBuilder.cxx +++ b/GeoModel2G4/src/ExtParameterisedVolumeBuilder.cxx @@ -44,14 +44,13 @@ G4LogicalVolume* ExtParameterisedVolumeBuilder::Build(const PVConstLink theGeoPh if(m_getMatEther) getMatEther(); static Geo2G4LVFactory LVFactory; - if(G4VERBOSE>1) std::cout<<" ----->ExtParameterisedVolumeBuilder::Build()"<<std::endl; + //std::cout<<" ----->ExtParameterisedVolumeBuilder::Build()"<<std::endl; G4LogicalVolume* theG4LogVolume = LVFactory.Build(theGeoPhysVolume,descend); - if(G4VERBOSE>1) std::cout<<" ----->LVFactory built"<<std::endl; + //std::cout<<" ----->LVFactory built"<<std::endl; if(!descend) return theG4LogVolume; numChildNodes = theGeoPhysVolume->getNChildVolAndST(); - - if(G4VERBOSE>1) std::cout<<" ----->numChildNodes"<<numChildNodes<<std::endl; + //std::cout<<" ----->numChildNodes"<<numChildNodes<<std::endl; // ***************************************************************** // ** @@ -73,7 +72,7 @@ G4LogicalVolume* ExtParameterisedVolumeBuilder::Build(const PVConstLink theGeoPh break; } } - if(G4VERBOSE>1) std::cout<<" -----> Next steps:"<<std::endl; + //if(G4VERBOSE>1) std::cout<<" -----> Next steps:"<<std::endl; // *************************************************************************** // ** Next steps: // ** diff --git a/GeoModel2G4/src/Geo2G4LVFactory.cxx b/GeoModel2G4/src/Geo2G4LVFactory.cxx index 9ad9bf559984448976e93dde87ee9f2bfe404168..d4d0cfe43b2e2ff1a3ae568a78a9876bae68d9af 100644 --- a/GeoModel2G4/src/Geo2G4LVFactory.cxx +++ b/GeoModel2G4/src/Geo2G4LVFactory.cxx @@ -32,7 +32,7 @@ G4LogicalVolume* Geo2G4LVFactory::Build(const PVConstLink thePhys, static leafVMap sharedLeafLV; static branchVMap sharedBranchLV; static fullPVMap clonedLV; - if(G4VERBOSE>1) std::cout<<" ----->Geo2G4LVFactory::Build"<<std::endl; + //std::cout<<" ----->Geo2G4LVFactory::Build"<<std::endl; const GeoFullPhysVol* fullPV = dynamic_cast<const GeoFullPhysVol*>(&(*thePhys)); const GeoFullPhysVol* clonePV=0; @@ -49,7 +49,7 @@ G4LogicalVolume* Geo2G4LVFactory::Build(const PVConstLink thePhys, // Check if it is a leaf node of Geo tree if(thePhys->getNChildVols() == 0) { - if(G4VERBOSE>1) std::cout<<" ----->NChildVols() == 0"<<std::endl; + //std::cout<<" ----->NChildVols() == 0"<<std::endl; descend=false; if(sharedLeafLV.find(theLog) != sharedLeafLV.end()) @@ -60,7 +60,7 @@ G4LogicalVolume* Geo2G4LVFactory::Build(const PVConstLink thePhys, // Work with the Full Physical Volumes else if(fullPV) { - if(G4VERBOSE>1) std::cout<<" ----->Full Physical Volume"<<std::endl; + //std::cout<<" ----->Full Physical Volume"<<std::endl; clonePV = fullPV->cloneOrigin(); if (clonedLV.find(clonePV)==clonedLV.end()) { @@ -74,7 +74,7 @@ G4LogicalVolume* Geo2G4LVFactory::Build(const PVConstLink thePhys, } else { - if(G4VERBOSE>1) std::cout<<" ----->else"<<std::endl; + //std::cout<<" ----->else"<<std::endl; if(sharedBranchLV.find(&(*thePhys)) == sharedBranchLV.end()) putBranch = true; else @@ -84,16 +84,16 @@ G4LogicalVolume* Geo2G4LVFactory::Build(const PVConstLink thePhys, } } // Actually build the G4Log - if (G4VERBOSE > 1) std::cout<<" ----->Actually build the G4Mat: "<<theLog->getMaterial()->getName()<<std::endl; + //std::cout<<" ----->Actually build the G4Mat: "<<theLog->getMaterial()->getName()<<std::endl; theG4Mat=theMaterialFactory.Build(theLog->getMaterial()); - if (G4VERBOSE > 1) std::cout<<" ----->Actually build the G4Solid"<<std::endl; + //std::cout<<" ----->Actually build the G4Solid"<<std::endl; theG4Solid = theSolidFactory.Build(theLog->getShape(),theLog->getName()); - if (G4VERBOSE > 1) std::cout<<" ----->Actually build the G4Log: "<<theLog->getName()<<std::endl; + //std::cout<<" ----->Actually build the G4Log: "<<theLog->getName()<<std::endl; theG4Log = new G4LogicalVolume(theG4Solid, theG4Mat, theLog->getName(), 0,0,0); - if (G4VERBOSE > 1) std::cout<<" ----->G4Log successfully built!!!"<<std::endl; + //std::cout<<" ----->G4Log successfully built!!!"<<std::endl; if(putLeaf) sharedLeafLV[theLog] = theG4Log; if(putBranch) sharedBranchLV[&(*thePhys)] = theG4Log;