diff -uNr v01-10.ORIG/Mokka/mokka-07-06/source/Geometry/Tesla/src/TubeX00.cc v01-10/Mokka/mokka-07-06/source/Geometry/Tesla/src/TubeX00.cc --- v01-10.ORIG/Mokka/mokka-07-06/source/Geometry/Tesla/src/TubeX00.cc 2011-01-27 00:37:29.000000000 +0900 +++ v01-10/Mokka/mokka-07-06/source/Geometry/Tesla/src/TubeX00.cc 2011-01-27 05:09:14.000000000 +0900 @@ -138,7 +138,11 @@ // placement as a daughter volume of the tube, will appear in both placements of the tube G4PVPlacement *wallPhys = 0; // one-liner would give a compiler warning +#if 0 wallPhys = new G4PVPlacement(0, 0, wallLog, volName + "_wall", tubeLog, false, 0); +#else + wallPhys = new G4PVPlacement(0, G4ThreeVector(0, 0, 0), wallLog, volName + "_wall", tubeLog, false, 0); +#endif } else if (crossType == kUpstreamClipped || crossType == kDnstreamClipped) { // a volume on the upstream or donwstream branch, but with the front face parallel to the xy-plane (!) @@ -190,8 +194,13 @@ // placement as a daughter volumes of the tube G4PVPlacement *wallPhys = 0; +#if 0 wallPhys = new G4PVPlacement(0, 0, wallLog0, volName + "_wall", tubeLog0, false, 0); wallPhys = new G4PVPlacement(0, 0, wallLog1, volName + "_wall", tubeLog1, false, 1); +#else + wallPhys = new G4PVPlacement(0, G4ThreeVector(0, 0, 0), wallLog0, volName + "_wall", tubeLog0, false, 0); + wallPhys = new G4PVPlacement(0, G4ThreeVector(0, 0, 0), wallLog1, volName + "_wall", tubeLog1, false, 1); +#endif } else if (crossType == kPunched) { // a volume on the z-axis with two inner holes @@ -243,8 +252,13 @@ // placement as a daughter volumes of the tube G4PVPlacement *wallPhys; +#if 0 wallPhys = new G4PVPlacement(0, 0, wallLog0, volName + "_wall", tubeLog0, false, 0); wallPhys = new G4PVPlacement(0, 0, wallLog1, volName + "_wall", tubeLog1, false, 1); +#else + wallPhys = new G4PVPlacement(0, G4ThreeVector(0, 0, 0), wallLog0, volName + "_wall", tubeLog0, false, 0); + wallPhys = new G4PVPlacement(0, G4ThreeVector(0, 0, 0), wallLog1, volName + "_wall", tubeLog1, false, 1); +#endif } } delete db; diff -uNr v01-10.ORIG/Mokka/mokka-07-06/source/Geometry/Tesla/src/TubeX01.cc v01-10/Mokka/mokka-07-06/source/Geometry/Tesla/src/TubeX01.cc --- v01-10.ORIG/Mokka/mokka-07-06/source/Geometry/Tesla/src/TubeX01.cc 2011-01-27 00:37:29.000000000 +0900 +++ v01-10/Mokka/mokka-07-06/source/Geometry/Tesla/src/TubeX01.cc 2011-01-27 05:09:14.000000000 +0900 @@ -221,7 +221,11 @@ wallLog->SetVisAttributes(wallVisAttrib); // placement as a daughter volume of the tube, will appear in both placements of the tube +#if 0 new G4PVPlacement(0, 0, wallLog, volName + "_wall", tubeLog, false, 0); +#else + new G4PVPlacement( 0, G4ThreeVector(0, 0, 0), wallLog, volName + "_wall", tubeLog, false, 0); +#endif } break; } @@ -285,8 +289,13 @@ wallLog1->SetVisAttributes(wallVisAttrib); // placement as a daughter volumes of the tube +#if 0 new G4PVPlacement(0, 0, wallLog0, volName + "_wall", tubeLog0, false, 0); new G4PVPlacement(0, 0, wallLog1, volName + "_wall", tubeLog1, false, 1); +#else + new G4PVPlacement( 0, G4ThreeVector(0, 0, 0), wallLog0, volName + "_wall", tubeLog0, false, 0); + new G4PVPlacement( 0, G4ThreeVector(0, 0, 0), wallLog1, volName + "_wall", tubeLog1, false, 1); +#endif break; } case kPunchedUpstream: @@ -335,8 +344,13 @@ wallLog1->SetVisAttributes(wallVisAttrib); // placement as a daughter volumes of the tube +#if 0 new G4PVPlacement(0, 0, wallLog0, volName + "_wall", tubeLog0, false, 0); new G4PVPlacement(0, 0, wallLog1, volName + "_wall", tubeLog1, false, 1); +#else + new G4PVPlacement( 0, G4ThreeVector(0, 0, 0), wallLog0, volName + "_wall", tubeLog0, false, 0); + new G4PVPlacement( 0, G4ThreeVector(0, 0, 0), wallLog1, volName + "_wall", tubeLog1, false, 1); +#endif break; } case kUpstreamClippedFront: @@ -393,8 +407,13 @@ wallLog1->SetVisAttributes(wallVisAttrib); // placement as a daughter volumes of the tube +#if 0 new G4PVPlacement(0, 0, wallLog0, volName + "_wall", tubeLog0, false, 0); new G4PVPlacement(0, 0, wallLog1, volName + "_wall", tubeLog1, false, 1); +#else + new G4PVPlacement( 0, G4ThreeVector(0, 0, 0), wallLog0, volName + "_wall", tubeLog0, false, 0); + new G4PVPlacement( 0, G4ThreeVector(0, 0, 0), wallLog1, volName + "_wall", tubeLog1, false, 1); +#endif } break; } @@ -452,8 +471,13 @@ wallLog1->SetVisAttributes(wallVisAttrib); // placement as a daughter volumes of the tube +#if 0 new G4PVPlacement(0, 0, wallLog0, volName + "_wall", tubeLog0, false, 0); new G4PVPlacement(0, 0, wallLog1, volName + "_wall", tubeLog1, false, 1); +#else + new G4PVPlacement( 0, G4ThreeVector(0, 0, 0), wallLog0, volName + "_wall", tubeLog0, false, 0); + new G4PVPlacement( 0, G4ThreeVector(0, 0, 0), wallLog1, volName + "_wall", tubeLog1, false, 1); +#endif } break; } @@ -518,8 +542,13 @@ wallLog1->SetVisAttributes(wallVisAttrib); // placement as a daughter volumes of the tube +#if 0 new G4PVPlacement(0, 0, wallLog0, volName + "_wall", tubeLog0, false, 0); new G4PVPlacement(0, 0, wallLog1, volName + "_wall", tubeLog1, false, 1); +#else + new G4PVPlacement( 0, G4ThreeVector(0, 0, 0), wallLog0, volName + "_wall", tubeLog0, false, 0); + new G4PVPlacement( 0, G4ThreeVector(0, 0, 0), wallLog1, volName + "_wall", tubeLog1, false, 1); +#endif } break; }