Ignore:
Timestamp:
Dec 22, 2010, 3:52:27 PM (14 years ago)
Author:
garnier
Message:

geant4 tag 9.4

Location:
trunk/source/geometry/solids/test
Files:
43 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/geometry/solids/test/OpticalEscape/AXPETDemonstrator.cc

    r1316 r1347  
    2626//
    2727// $Id: AXPETDemonstrator.cc,v 1.1 2008/09/03 13:34:03 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/OpticalEscape/src/AXPETDetectorConstruction.cc

    r1316 r1347  
    2424// ********************************************************************
    2525//
    26 // $Id: AXPETDetectorConstruction.cc,v 1.1 2008/09/03 13:34:03 gcosmo Exp $
     26// $Id: AXPETDetectorConstruction.cc,v 1.2 2010/11/16 13:35:53 tnikitin Exp $
    2727// ------------------------------------------------------------
    2828// Geant4 class implementation file
    … …  
    5252#include "G4Trd.hh"
    5353#include "G4Tet.hh"
     54#include "G4GenericTrap.hh"
     55#include "G4TessellatedSolid.hh"
     56#include "G4ExtrudedSolid.hh"
    5457
    5558#include "G4Polycone.hh"
    … …  
    6063#include "G4TwistedTrd.hh"
    6164#include "G4TwistedTrap.hh"
     65
     66#include "G4TwoVector.hh"
     67#include "G4TriangularFacet.hh"
     68#include "G4QuadrangularFacet.hh"
    6269
    6370#include "G4BooleanSolid.hh"
    … …  
    488495  else if ( val == "Tet" )
    489496  {
    490 
    491       G4ThreeVector pzero(0,0,0);
    492       G4ThreeVector pnt1(1.,0.,0.),pnt2(0,1.,0.), pnt3(0,0.,1.);
    493       G4Tet   t1( "aTet", pzero, pnt1, pnt2, pnt3);
     497    G4ThreeVector anchor = G4ThreeVector(  0,    0, 0);
     498    G4ThreeVector     p2 = G4ThreeVector(1.0,  0.5, 0);
     499    G4ThreeVector     p3 = G4ThreeVector(0.5,  1.0, 0);
     500    G4ThreeVector     p4 = G4ThreeVector(0.5,  0.5, 1.0);
     501   
     502    aVolume = new G4Tet("aTet",anchor,p2,p3,p4);
    494503  }
    495504  else if ( val == "Trap")
    … …  
    539548
    540549  }
     550
     551 else if (val == "TwistedBox")
     552  {
     553    aVolume = new G4TwistedBox("aTwistedBox",40*deg,0.5,1.0,1.5);
     554  }
     555  else if (val == "TwistedTrd")
     556  {
     557    aVolume = new G4TwistedTrd("aTwistedTrd",0.5,1.0,0.8,1.5,1.8,20*deg);
     558  }
     559  else if (val == "TwistedTrap")
     560  {
     561    aVolume = new G4TwistedTrap("aTwistedTrap",40*deg,0.5,1.0,0.8,1.5);
     562  }
     563  else if ( val == "TwistedTrap2")
     564  {
     565    aVolume = new G4TwistedTrap("aTwistedTrap2",
     566                                   20*deg,    // twist angle
     567                                   0.80,         // half z length
     568                                   10*deg,      // direction between end planes
     569                                   40*deg,        // defined by polar and azimutal angles.
     570                                   0.8,        // half y length at -pDz
     571                                   1.1,        // half x length at -pDz,-pDy
     572                                   1.6,        // half x length at -pDz,+pDy
     573                                   0.8,        // half y length at +pDz
     574                                   1.1,         // half x length at +pDz,-pDy
     575                                   1.6,        // half x length at +pDz,+pDy
     576                                   -50*deg        // tilt angle at +pDz
     577                                   ) ;
     578  }
     579  else if ( val == "TwistedTubs")
     580  {
     581    aVolume = new G4TwistedTubs("aTwistedTubs",10.*deg,1.0,2.,4.,171.*deg);
     582
     583  }
     584 else if (val == "GenericTrap" ){
     585   std::vector<G4TwoVector> vertices;
     586   vertices.push_back(G4TwoVector( -4.5, -4.5));
     587   vertices.push_back(G4TwoVector( -4.5,  4.5));
     588   vertices.push_back(G4TwoVector(  4.5,  4.5));
     589   vertices.push_back(G4TwoVector(  4.5, -4.5));
     590   vertices.push_back(G4TwoVector( -3.5, -3.5));
     591   vertices.push_back(G4TwoVector( -3.5,  3.5));
     592   vertices.push_back(G4TwoVector(  3.5,  3.5));
     593   vertices.push_back(G4TwoVector(  3.5, -2.5));     
     594   aVolume = new G4GenericTrap("aGenTrd",4.,vertices);
     595  }
     596else if(val == "TessellatedSolid")
     597  {
     598    G4double targetSize = 2.;
     599    G4TessellatedSolid* aVolume1 = new G4TessellatedSolid("aTessellatedSolid");
     600    G4TriangularFacet *facet1 = new
     601    G4TriangularFacet (G4ThreeVector(-targetSize,-targetSize,        0.0),
     602                     G4ThreeVector(+targetSize,-targetSize,        0.0),
     603                     G4ThreeVector(        0.0,        0.0,+targetSize),
     604                     ABSOLUTE);
     605    G4TriangularFacet *facet2 = new
     606    G4TriangularFacet (G4ThreeVector(+targetSize,-targetSize,        0.0),
     607                     G4ThreeVector(+targetSize,+targetSize,        0.0),
     608                     G4ThreeVector(        0.0,        0.0,+targetSize),
     609                     ABSOLUTE);
     610    G4TriangularFacet *facet3 = new
     611    G4TriangularFacet (G4ThreeVector(+targetSize,+targetSize,        0.0),
     612                     G4ThreeVector(-targetSize,+targetSize,        0.0),
     613                     G4ThreeVector(        0.0,        0.0,+targetSize),
     614                     ABSOLUTE);
     615    G4TriangularFacet *facet4 = new
     616    G4TriangularFacet (G4ThreeVector(-targetSize,+targetSize,        0.0),
     617                     G4ThreeVector(-targetSize,-targetSize,        0.0),
     618                     G4ThreeVector(        0.0,        0.0,+targetSize),
     619                     ABSOLUTE);
     620    G4QuadrangularFacet *facet5 = new
     621    G4QuadrangularFacet (G4ThreeVector(-targetSize,-targetSize,        0.0),
     622                     G4ThreeVector(-targetSize,+targetSize,        0.0),
     623                     G4ThreeVector(+targetSize,+targetSize,        0.0),
     624                     G4ThreeVector(+targetSize,-targetSize,        0.0),
     625                     ABSOLUTE);
     626
     627    aVolume1->AddFacet((G4VFacet*) facet1);
     628    aVolume1->AddFacet((G4VFacet*) facet2);
     629    aVolume1->AddFacet((G4VFacet*) facet3);
     630    aVolume1->AddFacet((G4VFacet*) facet4);
     631    aVolume1->AddFacet((G4VFacet*) facet5);
     632 
     633    aVolume1->SetSolidClosed(true);
     634
     635    aVolume = aVolume1;
     636
     637  }
     638  else if (val == "ExtrudedSolid")
     639  {
     640   std::vector<G4TwoVector> polygon;
     641   polygon.push_back(G4TwoVector(-3., -3.0));
     642   polygon.push_back(G4TwoVector(-3.,  3.0));
     643   polygon.push_back(G4TwoVector( 3.,  3.0));
     644   polygon.push_back(G4TwoVector( 3., -3.0));
     645   polygon.push_back(G4TwoVector( 1.5, -3.0));
     646   polygon.push_back(G4TwoVector( 1.5,  1.5));
     647   polygon.push_back(G4TwoVector(-1.5,  1.5));
     648   polygon.push_back(G4TwoVector(-1.5, -3.0));
     649 
     650   std::vector<G4ExtrudedSolid::ZSection> zsections;
     651   zsections.push_back(G4ExtrudedSolid::ZSection(-4.0, G4TwoVector(-2.0, 1.0), 1.5));
     652   zsections.push_back(G4ExtrudedSolid::ZSection( 1.0, G4TwoVector(  0,  0), 0.5));
     653   zsections.push_back(G4ExtrudedSolid::ZSection( 1.5, G4TwoVector(  0,  0), 0.7));
     654   zsections.push_back(G4ExtrudedSolid::ZSection( 4.0, G4TwoVector( 2.0, 2.0), 0.9));
     655
     656   aVolume = new G4ExtrudedSolid("aExtrudedSolid", polygon, zsections);
     657  }
     658
     659
    541660  else
    542661    { G4cout <<"DetectorConstruction tried to select "<<val<<G4endl;

  • trunk/source/geometry/solids/test/OpticalEscape/src/AXPETDetectorMessenger.cc

    r1316 r1347  
    2424// ********************************************************************
    2525//
    26 // $Id: AXPETDetectorMessenger.cc,v 1.1 2008/09/03 13:34:03 gcosmo Exp $
     26// $Id: AXPETDetectorMessenger.cc,v 1.2 2010/11/16 13:36:00 tnikitin Exp $
    2727// ------------------------------------------------------------
    2828// Geant4 class implementation file
    … …  
    5656  selDetCmd->SetDefaultValue("Tubs");
    5757
    58  selDetCmd->SetCandidates("Trap Trd Tet Sphere HalfSphere HollowSphere HalfHollowSphere  Ring Shell Orb Box Cons manyCons Tubs Hype Torus Para Paraboloid Polycone PolyconeGen PolyconeGenComplex Polyhedra PolyhedraGen PolyhedraGenComplex BREPBox Trd b1Ib2 b1Ub2 b1Sb2 b1Ub1 b1Ib1 b1Sb1 Ellipsoid EllipticalCone EllipticalTube");
     58 selDetCmd->SetCandidates("Trap Trd Tet Sphere HalfSphere HollowSphere HalfHollowSphere  Ring Shell Orb Box Cons manyCons Tubs Hype Torus Para Paraboloid Polycone PolyconeGen PolyconeGenComplex Polyhedra PolyhedraGen PolyhedraGenComplex BREPBox Trd b1Ib2 b1Ub2 b1Sb2 b1Ub1 b1Ib1 b1Sb1 Ellipsoid EllipticalCone EllipticalTube Tet GenericTrap TwistedBox TwistedTrd TwistedTrap TwistedTubs TessellatedSolid ExtrudedSolid");
    5959  selDetCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
    6060

  • trunk/source/geometry/solids/test/OpticalEscape/src/AXPETPhysicsList.cc

    r1316 r1347  
    2424// ********************************************************************
    2525//
    26 // $Id: AXPETPhysicsList.cc,v 1.1 2008/09/03 13:34:03 gcosmo Exp $
     26// $Id: AXPETPhysicsList.cc,v 1.2 2010/11/16 13:38:09 tnikitin Exp $
    2727// ------------------------------------------------------------
    2828// Geant4 class implementation file
    … …  
    129129#include "G4PhotoElectricEffect.hh"
    130130
    131 #include "G4MultipleScattering.hh"
     131#include "G4eMultipleScattering.hh"
     132#include "G4MuMultipleScattering.hh"
     133#include "G4hMultipleScattering.hh"
    132134
    133135#include "G4eIonisation.hh"
    … …  
    159161    //electron
    160162      // Construct processes for electron
    161       pmanager->AddProcess(new G4MultipleScattering(),-1, 1, 1);
     163      pmanager->AddProcess(new G4eMultipleScattering(),-1, 1, 1);
    162164      pmanager->AddProcess(new G4eIonisation(),       -1, 2, 2);
    163165      pmanager->AddProcess(new G4eBremsstrahlung(),   -1, 3, 3);
    … …  
    166168    //positron
    167169      // Construct processes for positron
    168       pmanager->AddProcess(new G4MultipleScattering(),-1, 1, 1);
     170      pmanager->AddProcess(new G4eMultipleScattering(),-1, 1, 1);
    169171      pmanager->AddProcess(new G4eIonisation(),       -1, 2, 2);
    170172      pmanager->AddProcess(new G4eBremsstrahlung(),   -1, 3, 3);
    … …  
    175177    //muon
    176178     // Construct processes for muon
    177      pmanager->AddProcess(new G4MultipleScattering(),-1, 1, 1);
     179     pmanager->AddProcess(new G4MuMultipleScattering(),-1, 1, 1);
    178180     pmanager->AddProcess(new G4MuIonisation(),      -1, 2, 2);
    179181     pmanager->AddProcess(new G4MuBremsstrahlung(),  -1, 3, 3);
    … …  
    184186          (particle->GetParticleName() != "chargedgeantino")) {
    185187     // all others charged particles except geantino
    186        pmanager->AddProcess(new G4MultipleScattering(),-1,1,1);
     188       pmanager->AddProcess(new G4hMultipleScattering(),-1,1,1);
    187189       pmanager->AddProcess(new G4hIonisation(),       -1,2,2);
    188190     }
    … …  
    222224    G4String particleName = particle->GetParticleName();
    223225    if (theCerenkovProcess->IsApplicable(*particle)) {
    224       // pmanager->AddContinuousProcess(theCerenkovProcess);
    225226        pmanager->AddProcess(theCerenkovProcess);
    226227        pmanager->SetProcessOrdering(theCerenkovProcess,idxPostStep);

  • trunk/source/geometry/solids/test/SolidsChecker/SolidsChecker.cc

    r1316 r1347  
    2626//
    2727// $Id: SolidsChecker.cc,v 1.4 2006/10/20 14:51:40 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/SolidsChecker/include/Sc01EventActionMessenger.hh

    r1316 r1347  
    2626//
    2727// $Id: Sc01EventActionMessenger.hh,v 1.2 2006/06/29 18:53:42 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/SolidsChecker/include/Sc01VisManager.hh

    r1316 r1347  
    2626//
    2727// $Id: Sc01VisManager.hh,v 1.2 2006/06/29 18:53:51 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/SolidsChecker/include/SteppingAction.hh

    r1316 r1347  
    2626//
    2727// $Id: SteppingAction.hh,v 1.2 2006/06/29 18:53:53 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/SolidsChecker/src/Sc01EventActionMessenger.cc

    r1316 r1347  
    2626//
    2727// $Id: Sc01EventActionMessenger.cc,v 1.2 2006/06/29 18:54:02 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/SolidsChecker/src/Sc01VisManager.cc

    r1316 r1347  
    2626//
    2727// $Id: Sc01VisManager.cc,v 1.3 2007/05/18 11:03:28 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/SolidsChecker/src/SteppingAction.cc

    r1316 r1347  
    2626//
    2727// $Id: SteppingAction.cc,v 1.3 2006/06/29 18:54:14 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/SurfaceChecker/SurfaceChecker.cc

    r1316 r1347  
    2626//
    2727// $Id: SurfaceChecker.cc,v 1.3 2006/10/20 14:43:18 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/SurfaceChecker/include/SCDetectorConstruction.hh

    r1316 r1347  
    2626//
    2727// $Id: SCDetectorConstruction.hh,v 1.6 2006/12/13 15:43:46 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/include/SCEventAction.hh

    r1316 r1347  
    2626//
    2727// $Id: SCEventAction.hh,v 1.2 2006/06/29 18:54:24 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/include/SCMagneticField.hh

    r1316 r1347  
    2626//
    2727// $Id: SCMagneticField.hh,v 1.2 2006/06/29 18:54:27 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/SurfaceChecker/include/SCPhysicsList.hh

    r1316 r1347  
    2626//
    2727// $Id: SCPhysicsList.hh,v 1.2 2006/06/29 18:54:29 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/include/SCPrimaryGeneratorAction.hh

    r1316 r1347  
    2626//
    2727// $Id: SCPrimaryGeneratorAction.hh,v 1.3 2006/06/29 18:54:31 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/include/SCRunAction.hh

    r1316 r1347  
    2626//
    2727// $Id: SCRunAction.hh,v 1.2 2006/06/29 18:54:33 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/include/SCSteppingAction.hh

    r1316 r1347  
    2626//
    2727// $Id: SCSteppingAction.hh,v 1.2 2006/06/29 18:54:35 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/include/SCSteppingVerbose.hh

    r1316 r1347  
    2626//
    2727// $Id: SCSteppingVerbose.hh,v 1.2 2006/06/29 18:54:37 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//   This class manages the verbose outputs in G4SteppingManager.

  • trunk/source/geometry/solids/test/SurfaceChecker/include/SCTrackerHit.hh

    r1316 r1347  
    2626//
    2727// $Id: SCTrackerHit.hh,v 1.2 2006/06/29 18:54:39 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/include/SCTrackerSD.hh

    r1316 r1347  
    2626//
    2727// $Id: SCTrackerSD.hh,v 1.2 2006/06/29 18:54:41 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/include/SCVisManager.hh

    r1316 r1347  
    2626//
    2727// $Id: SCVisManager.hh,v 1.2 2006/06/29 18:54:44 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/SurfaceChecker/src/SCDetectorConstruction.cc

    r1316 r1347  
    2626//
    2727// $Id: SCDetectorConstruction.cc,v 1.9 2007/07/18 14:38:48 tnikitin Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/src/SCEventAction.cc

    r1316 r1347  
    2626//
    2727// $Id: SCEventAction.cc,v 1.2 2006/06/29 18:54:51 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/src/SCMagneticField.cc

    r1316 r1347  
    2626//
    2727// $Id: SCMagneticField.cc,v 1.2 2006/06/29 18:54:53 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929// 
    3030//   User Field class implementation.

  • trunk/source/geometry/solids/test/SurfaceChecker/src/SCPhysicsList.cc

    r1316 r1347  
    2626//
    2727// $Id: SCPhysicsList.cc,v 1.2 2006/06/29 18:54:55 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/src/SCPrimaryGeneratorAction.cc

    r1316 r1347  
    2626//
    2727// $Id: SCPrimaryGeneratorAction.cc,v 1.8 2006/12/13 15:43:52 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/src/SCRunAction.cc

    r1316 r1347  
    2626//
    2727// $Id: SCRunAction.cc,v 1.2 2006/06/29 18:54:59 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/src/SCSteppingAction.cc

    r1316 r1347  
    2626//
    2727// $Id: SCSteppingAction.cc,v 1.2 2006/06/29 18:55:01 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/src/SCSteppingVerbose.cc

    r1316 r1347  
    2626//
    2727// $Id: SCSteppingVerbose.cc,v 1.2 2006/06/29 18:55:03 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/src/SCSurfacePoint.hh

    r1316 r1347  
    2626//
    2727// $Id: SCSurfacePoint.hh,v 1.2 2006/06/29 18:55:06 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/src/SCTrackerHit.cc

    r1316 r1347  
    2626//
    2727// $Id: SCTrackerHit.cc,v 1.2 2006/06/29 18:55:09 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/src/SCTrackerSD.cc

    r1316 r1347  
    2626//
    2727// $Id: SCTrackerSD.cc,v 1.2 2006/06/29 18:55:12 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/src/SCVisManager.cc

    r1316 r1347  
    2626//
    2727// $Id: SCVisManager.cc,v 1.3 2007/05/18 11:04:23 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/SurfaceVisTest/SurfaceVisTest.cc

    r1316 r1347  
    4141
    4242//a pre-built physics list
    43 #include "QGSP_EMV.hh"
     43#include "QGSP_BERT_EMV.hh"
    4444
    4545//My includes
    … …  
    6969
    7070        //Set mandatory initialization and user action classes
    71         runManager->SetUserInitialization(new QGSP_EMV);
     71        runManager->SetUserInitialization(new QGSP_BERT_EMV);
    7272       
    7373        runManager->SetUserInitialization(new DetectorConstruction);

  • trunk/source/geometry/solids/test/SurfaceVisTest/src/DetectorConstruction.cc

    r1316 r1347  
    5151#include "G4Trd.hh"
    5252#include "G4Tet.hh"
     53#include "G4GenericTrap.hh"
     54#include "G4TessellatedSolid.hh"
     55#include "G4ExtrudedSolid.hh"
    5356
    5457#include "G4Polycone.hh"
    … …  
    6871
    6972#include "G4BREPSolidBox.hh"
     73#include "G4TwoVector.hh"
     74#include "G4TriangularFacet.hh"
     75#include "G4QuadrangularFacet.hh"
    7076
    7177#include "G4LogicalVolume.hh"
    … …  
    497503  else if ( val == "Tet" )
    498504  {
    499 
     505    //   G4ThreeVector anchor = G4ThreeVector(0, 0, 0);
     506    //G4ThreeVector     p2 = G4ThreeVector(10*cm, 5*cm , 0);
     507    //G4ThreeVector     p3 = G4ThreeVector(5*cm,10*cm,0);
     508    //G4ThreeVector     p4 = G4ThreeVector(5*cm,5*cm  ,10*cm);
     509   
     510    //aVolume = new G4Tet("aTet",anchor,p2,p3,p4);
    500511      G4ThreeVector pzero(0,0,0);
    501512      G4ThreeVector pnt1(10.*cm,0.*cm,0.*cm),pnt2(5.0*cm,10.*cm,0.*cm), pnt3(5.*cm,5.*cm,10.*cm);
    502513      G4bool  goodTet;
    503       G4Tet   t1( "aTet", pzero, pnt1, pnt2, pnt3, &goodTet);
     514      aVolume= new G4Tet( "aTet", pzero, pnt1, pnt2, pnt3, &goodTet);
    504515  }
    505516  else if ( val == "Trap")
    … …  
    549560
    550561  }
     562  else if (val == "GenericTrap" ){
     563   std::vector<G4TwoVector> vertices;
     564   vertices.push_back(G4TwoVector( -4.5*cm, -4.5*cm));
     565   vertices.push_back(G4TwoVector( -4.5*cm,  4.5*cm));
     566   vertices.push_back(G4TwoVector(  4.5*cm,  4.5*cm));
     567   vertices.push_back(G4TwoVector(  4.5*cm, -4.5*cm));
     568   vertices.push_back(G4TwoVector( -3.5*cm, -3.5*cm));
     569   vertices.push_back(G4TwoVector( -3.5*cm,  3.5*cm));
     570   vertices.push_back(G4TwoVector(  3.5*cm,  3.5*cm));
     571   vertices.push_back(G4TwoVector(  3.5*cm, -2.5*cm));     
     572   aVolume = new G4GenericTrap("aGenTrd",14.*cm,vertices);
     573  }
     574
     575 else if(val == "TessellatedSolid")
     576  {
     577    G4double targetSize = 10.*cm;
     578    G4TessellatedSolid* aVolume1 = new G4TessellatedSolid("aTessellatedSolid");
     579    G4TriangularFacet *facet1 = new
     580    G4TriangularFacet (G4ThreeVector(-targetSize,-targetSize,        0.0),
     581                     G4ThreeVector(+targetSize,-targetSize,        0.0),
     582                     G4ThreeVector(        0.0,        0.0,+targetSize),
     583                     ABSOLUTE);
     584    G4TriangularFacet *facet2 = new
     585    G4TriangularFacet (G4ThreeVector(+targetSize,-targetSize,        0.0),
     586                     G4ThreeVector(+targetSize,+targetSize,        0.0),
     587                     G4ThreeVector(        0.0,        0.0,+targetSize),
     588                     ABSOLUTE);
     589    G4TriangularFacet *facet3 = new
     590    G4TriangularFacet (G4ThreeVector(+targetSize,+targetSize,        0.0),
     591                     G4ThreeVector(-targetSize,+targetSize,        0.0),
     592                     G4ThreeVector(        0.0,        0.0,+targetSize),
     593                     ABSOLUTE);
     594    G4TriangularFacet *facet4 = new
     595    G4TriangularFacet (G4ThreeVector(-targetSize,+targetSize,        0.0),
     596                     G4ThreeVector(-targetSize,-targetSize,        0.0),
     597                     G4ThreeVector(        0.0,        0.0,+targetSize),
     598                     ABSOLUTE);
     599    G4QuadrangularFacet *facet5 = new
     600    G4QuadrangularFacet (G4ThreeVector(-targetSize,-targetSize,        0.0),
     601                     G4ThreeVector(-targetSize,+targetSize,        0.0),
     602                     G4ThreeVector(+targetSize,+targetSize,        0.0),
     603                     G4ThreeVector(+targetSize,-targetSize,        0.0),
     604                     ABSOLUTE);
     605
     606    aVolume1->AddFacet((G4VFacet*) facet1);
     607    aVolume1->AddFacet((G4VFacet*) facet2);
     608    aVolume1->AddFacet((G4VFacet*) facet3);
     609    aVolume1->AddFacet((G4VFacet*) facet4);
     610    aVolume1->AddFacet((G4VFacet*) facet5);
     611 
     612    aVolume1->SetSolidClosed(true);
     613
     614    aVolume = aVolume1;
     615
     616  }
     617  else if (val == "ExtrudedSolid")
     618  {
     619   std::vector<G4TwoVector> polygon;
     620   polygon.push_back(G4TwoVector(-3.*cm, -3.0*cm));
     621   polygon.push_back(G4TwoVector(-3.*cm,  3.0*cm));
     622   polygon.push_back(G4TwoVector( 3.*cm,  3.0*cm));
     623   polygon.push_back(G4TwoVector( 3.*cm, -3.0*cm));
     624   polygon.push_back(G4TwoVector( 1.5*cm, -3.0*cm));
     625   polygon.push_back(G4TwoVector( 1.5*cm,  1.5*cm));
     626   polygon.push_back(G4TwoVector(-1.5*cm,  1.5*cm));
     627   polygon.push_back(G4TwoVector(-1.5*cm, -3.0*cm));
     628 
     629   std::vector<G4ExtrudedSolid::ZSection> zsections;
     630   zsections.push_back(G4ExtrudedSolid::ZSection(-4.0*cm, G4TwoVector(-2.0*cm, 1.0*cm), 1.5));
     631   zsections.push_back(G4ExtrudedSolid::ZSection( 1.0*cm, G4TwoVector(  0*cm,  0*cm), 0.5));
     632   zsections.push_back(G4ExtrudedSolid::ZSection( 1.5*cm, G4TwoVector(  0*cm,  0*cm), 0.7));
     633   zsections.push_back(G4ExtrudedSolid::ZSection( 4.0*cm, G4TwoVector( 2.0*cm, 2.0*cm), 0.9));
     634
     635   aVolume = new G4ExtrudedSolid("aExtrudedSolid", polygon, zsections);
     636  }
     637   else if (val == "TwistedBox")
     638  {
     639    aVolume = new G4TwistedBox("aTwistedBox",40*deg,5*cm,10*cm,15*cm);
     640  }
     641  else if (val == "TwistedTrd")
     642  {
     643    aVolume = new G4TwistedTrd("aTwistedTrd",5*cm,10*cm,8*cm,15*cm,18*cm,20*deg);
     644  }
     645  else if (val == "TwistedTrap")
     646  {
     647    aVolume = new G4TwistedTrap("aTwistedTrap",40*deg,5*cm,10*cm,8*cm,15*cm);
     648  }
     649  else if ( val == "TwistedTrap2")
     650  {
     651    aVolume = new G4TwistedTrap("aTwistedTrap2",
     652                                   20*deg,    // twist angle
     653                                   80*cm,         // half z length
     654                                   10*deg,      // direction between end planes
     655                                   40*deg,        // defined by polar and azimutal angles.
     656                                   8*cm,        // half y length at -pDz
     657                                   11*cm,        // half x length at -pDz,-pDy
     658                                   16*cm,        // half x length at -pDz,+pDy
     659                                   8*cm,        // half y length at +pDz
     660                                   11*cm,         // half x length at +pDz,-pDy
     661                                   16*cm,        // half x length at +pDz,+pDy
     662                                   -50*deg        // tilt angle at +pDz
     663                                   ) ;
     664  }
     665  else if ( val == "TwistedTubs")
     666  {
     667    aVolume = new G4TwistedTubs("aTwistedTubs",10.*deg,1*cm,2*cm,4*cm,171.*deg);
     668
     669  }
    551670  else
    552671    { G4cout <<"DetectorConstruction tried to select "<<val<<G4endl;

  • trunk/source/geometry/solids/test/SurfaceVisTest/src/DetectorMessenger.cc

    r1316 r1347  
    4848  selDetCmd->SetDefaultValue("Polyhedra");
    4949
    50  selDetCmd->SetCandidates("Trap Trd Tet Sphere HalfSphere HollowSphere HalfHollowSphere  Ring Shell Orb Box Cons manyCons Tubs Hype Torus Para Paraboloid Polycone PolyconeGen PolyconeGenComplex Polyhedra PolyhedraGen PolyhedraGenComplex BREPBox Trd b1Ib2 b1Ub2 b1Sb2 b1Ub1 b1Ib1 b1Sb1 Ellipsoid EllipticalCone EllipticalTube");
     50 selDetCmd->SetCandidates("Trap Trd Tet Sphere HalfSphere HollowSphere HalfHollowSphere  Ring Shell Orb Box Cons manyCons Tubs Hype Torus Para Paraboloid Polycone PolyconeGen PolyconeGenComplex Polyhedra PolyhedraGen PolyhedraGenComplex BREPBox Trd b1Ib2 b1Ub2 b1Sb2 b1Ub1 b1Ib1 b1Sb1 Ellipsoid EllipticalCone EllipticalTube GenericTrap TwistedBox TwistedTrd TwistedTrap TwistedTubs TessellatedSolid ExtrudedSolid Tet ");
    5151  selDetCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
    5252

  • trunk/source/geometry/solids/test/SurfaceVisTest/src/RunMessenger.cc

    r1316 r1347  
    2626//
    2727// $Id: RunMessenger.cc,v 1.1 2008/05/15 14:01:08 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/testPointOnSurface.cc

    r1316 r1347  
    2626//
    2727// $Id: testPointOnSurface.cc,v 1.5 2007/02/12 11:29:23 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/testSolidComparisons.cc

    r1316 r1347  
    2626//
    2727// $Id: testSolidComparisons.cc,v 1.6 2007/05/18 11:06:34 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/testSurfaceArea.cc

    r1316 r1347  
    2626//
    2727// $Id: testSurfaceArea.cc,v 1.2 2007/02/12 11:29:23 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/solids/test/testSurfaceAreaCube.cc

    r1316 r1347  
    2626//
    2727// $Id: testSurfaceAreaCube.cc,v 1.1 2006/10/20 14:38:52 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.