Fix compilation errors

carolhungwt · Aug 29, 2017 · e903340 · e903340
1 parent 589a72b
commit e903340
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Fireworks/Geometry/src/TGeoFromDddService.cc b/Fireworks/Geometry/src/TGeoFromDddService.cc
@@ -205,7 +205,7 @@ TGeoFromDddService::createManager(int level)
 	 for(unsigned int i=0; i<parentStack.size();++i) {
 	    std::cout <<" ";
 	 }
-	 std::cout << info.first.name()<<" "<<info.second->copyno_<<" "
+	 std::cout << info.first.name()<<" "<<info.second->copyno()<<" "
 		   << DDSolidShapesName::name(info.first.solid().shape())<<std::endl;
       }
 
@@ -216,7 +216,7 @@ TGeoFromDddService::createManager(int level)
       if (0!=child && info.second != 0)
       {
 	 parentStack.back()->AddNode(child,
-				 info.second->copyno_,
+				     info.second->copyno(),
 				 createPlacement(info.second->rotation(),
 						 info.second->translation()));
 	 child->SetLineColor(kBlue);

diff --git a/Fireworks/Geometry/src/TGeoMgrFromDdd.cc b/Fireworks/Geometry/src/TGeoMgrFromDdd.cc
@@ -140,7 +140,7 @@ TGeoMgrFromDdd::produce(const DisplayGeomRecord& iRecord)
 	 for(unsigned int i=0; i<parentStack.size();++i) {
 	    std::cout <<" ";
 	 }
-	 std::cout << info.first.name()<<" "<<info.second->copyno_<<" "
+	 std::cout << info.first.name()<<" "<<info.second->copyno()<<" "
 		   << DDSolidShapesName::name(info.first.solid().shape())<<std::endl;
       }
 
@@ -151,7 +151,7 @@ TGeoMgrFromDdd::produce(const DisplayGeomRecord& iRecord)
       if (0!=child && info.second != 0)
       {
 	 parentStack.back()->AddNode(child,
-				 info.second->copyno_,
+				     info.second->copyno(),
 				 createPlacement(info.second->rotation(),
 						 info.second->translation()));
 	 child->SetLineColor(kBlue);

diff --git a/SimG4Core/Geometry/src/DDG4Builder.cc b/SimG4Core/Geometry/src/DDG4Builder.cc
@@ -147,9 +147,9 @@ DDGeometryReturnType DDG4Builder::BuildGeometry() {
 	  edm::LogInfo("SimG4CoreGeometry") << ">>Reflection encountered: " 
 					    << gra.edgeData(cit->second)->ddrot()  
 					    << ">>Placement d=" << gra.nodeData(cit->first).ddname() 
-					    << " m=" << ddLP.ddname() << " cp=" << gra.edgeData(cit->second)->copyno_
+					    << " m=" << ddLP.ddname() << " cp=" << gra.edgeData(cit->second)->copyno()
 					    << " r=" << gra.edgeData(cit->second)->ddrot().ddname();     
-	G4ThreeVector tempTran(gra.edgeData(cit->second)->trans_.X(), gra.edgeData(cit->second)->trans_.Y(), gra.edgeData(cit->second)->trans_.Z());
+	G4ThreeVector tempTran(gra.edgeData(cit->second)->trans().X(), gra.edgeData(cit->second)->trans().Y(), gra.edgeData(cit->second)->trans().Z());
 	G4Translate3D transl = tempTran;
 	CLHEP::HepRep3x3 temp( x.X(), x.Y(), x.Z(), y.X(), y.Y(), y.Z(), z.X(), z.Y(), z.Z() ); //matrix representation
 	CLHEP::HepRotation hr ( temp );
@@ -162,7 +162,7 @@ DDGeometryReturnType DDG4Builder::BuildGeometry() {
 		       convertLV(gra.nodeData(cit->first)), 		// daugther
 		       g4LV, 				 		// mother
 		       false,                 		 		// 'ONLY'
-		       gra.edgeData(cit->second)->copyno_+offset+tag, 	// copy number
+		       gra.edgeData(cit->second)->copyno()+offset+tag, 	// copy number
 		       check_);
       } // iterate over children
     } // if (children)