Skip to content
Snippets Groups Projects
Commit d9f53820 authored by Marilena Bandieramonte's avatar Marilena Bandieramonte
Browse files

Comment out debug messages controlled by G4VERBOSE - necessary to compile with Geant4.10.6

parent 20dad68b
No related branches found
No related tags found
No related merge requests found
Pipeline #1306624 failed
......@@ -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.
......
......@@ -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:
// **
......
......@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment