| Geant4 Cross Reference |
1 // 1 //
2 // ******************************************* 2 // ********************************************************************
3 // * License and Disclaimer 3 // * License and Disclaimer *
4 // * 4 // * *
5 // * The Geant4 software is copyright of th 5 // * The Geant4 software is copyright of the Copyright Holders of *
6 // * the Geant4 Collaboration. It is provided 6 // * the Geant4 Collaboration. It is provided under the terms and *
7 // * conditions of the Geant4 Software License 7 // * conditions of the Geant4 Software License, included in the file *
8 // * LICENSE and available at http://cern.ch/ 8 // * LICENSE and available at http://cern.ch/geant4/license . These *
9 // * include a list of copyright holders. 9 // * include a list of copyright holders. *
10 // * 10 // * *
11 // * Neither the authors of this software syst 11 // * Neither the authors of this software system, nor their employing *
12 // * institutes,nor the agencies providing fin 12 // * institutes,nor the agencies providing financial support for this *
13 // * work make any representation or warran 13 // * work make any representation or warranty, express or implied, *
14 // * regarding this software system or assum 14 // * regarding this software system or assume any liability for its *
15 // * use. Please see the license in the file 15 // * use. Please see the license in the file LICENSE and URL above *
16 // * for the full disclaimer and the limitatio 16 // * for the full disclaimer and the limitation of liability. *
17 // * 17 // * *
18 // * This code implementation is the result 18 // * This code implementation is the result of the scientific and *
19 // * technical work of the GEANT4 collaboratio 19 // * technical work of the GEANT4 collaboration. *
20 // * By using, copying, modifying or distri 20 // * By using, copying, modifying or distributing the software (or *
21 // * any work based on the software) you ag 21 // * any work based on the software) you agree to acknowledge its *
22 // * use in resulting scientific publicati 22 // * use in resulting scientific publications, and indicate your *
23 // * acceptance of all terms of the Geant4 Sof 23 // * acceptance of all terms of the Geant4 Software license. *
24 // ******************************************* 24 // ********************************************************************
25 // 25 //
26 // 26 //
>> 27 // $Id$
27 // 28 //
28 // by I.Hrivnacova, 13.10.99 29 // by I.Hrivnacova, 13.10.99
29 30
30 #include <iomanip> 31 #include <iomanip>
31 #include "G3VolTable.hh" 32 #include "G3VolTable.hh"
32 #include "globals.hh" 33 #include "globals.hh"
33 #include "G3toG4.hh" 34 #include "G3toG4.hh"
34 #include "G3toG4MakeSolid.hh" 35 #include "G3toG4MakeSolid.hh"
35 36
36 void PG4gsvolu(G4String *tokens) { 37 void PG4gsvolu(G4String *tokens) {
37 // fill the parameter containers 38 // fill the parameter containers
38 G3fillParams(tokens,PTgsvolu); 39 G3fillParams(tokens,PTgsvolu);
39 40
40 // interpret the parameters 41 // interpret the parameters
41 G4String vname = Spar[0]; 42 G4String vname = Spar[0];
42 G4String shape = Spar[1]; 43 G4String shape = Spar[1];
43 G4int nmed = Ipar[0]; 44 G4int nmed = Ipar[0];
44 G4int npar = Ipar[1]; 45 G4int npar = Ipar[1];
45 G4double *pars = Rpar; 46 G4double *pars = Rpar;
46 47
47 G4gsvolu(vname, shape, nmed, pars, npar); 48 G4gsvolu(vname, shape, nmed, pars, npar);
48 } 49 }
49 50
50 G3VolTableEntry* G4CreateVTE(G4String vname, G 51 G3VolTableEntry* G4CreateVTE(G4String vname, G4String shape, G4int nmed,
51 G4double rpar[], 52 G4double rpar[], G4int npar)
52 { 53 {
53 // create the solid 54 // create the solid
54 G4bool hasNegPars; 55 G4bool hasNegPars;
55 G4bool deferred; 56 G4bool deferred;
56 G4bool okAxis[3]; 57 G4bool okAxis[3];
57 G4VSolid* solid 58 G4VSolid* solid
58 = G3toG4MakeSolid(vname, shape, rpar, npar 59 = G3toG4MakeSolid(vname, shape, rpar, npar, hasNegPars, deferred, okAxis);
59 60
60 // if solid has been deferred 61 // if solid has been deferred
61 // VTE is created with hasNegPars = true 62 // VTE is created with hasNegPars = true
62 if (deferred) hasNegPars = true; 63 if (deferred) hasNegPars = true;
63 64
64 // create VTE 65 // create VTE
65 G3VolTableEntry* vte 66 G3VolTableEntry* vte
66 = new G3VolTableEntry(vname, shape, rpar, 67 = new G3VolTableEntry(vname, shape, rpar, npar, nmed, solid, hasNegPars);
67 G3Vol.PutVTE(vte); 68 G3Vol.PutVTE(vte);
68 69
69 return vte; 70 return vte;
70 } 71 }
71 72
72 void G4gsvolu(G4String vname, G4String shape, 73 void G4gsvolu(G4String vname, G4String shape, G4int nmed, G4double* rpar,
73 G4int npar) 74 G4int npar)
74 { 75 {
75 /* 76 /*
76 G4cout << "Creating logical volume " << vnam 77 G4cout << "Creating logical volume " << vname << " shape " << shape
77 << " nmed " << nmed << " #pars "<< npar < 78 << " nmed " << nmed << " #pars "<< npar << " parameters (cm): ";
78 for (int ipar=0; ipar< npar; ipar++) G4cout 79 for (int ipar=0; ipar< npar; ipar++) G4cout << std::setw(8) << rpar[ipar];
79 G4cout << G4endl; 80 G4cout << G4endl;
80 */ 81 */
81 if (G3Vol.GetVTE(vname)) { 82 if (G3Vol.GetVTE(vname)) {
82 // abort if VTE with given name exists 83 // abort if VTE with given name exists
83 G4String text = "G4gsvolu: Attempt to crea 84 G4String text = "G4gsvolu: Attempt to create volume " + vname + " twice.";
84 G4Exception("G4gsvolu()", "G3toG40024", Fa 85 G4Exception("G4gsvolu()", "G3toG40024", FatalException, text);
85 return; 86 return;
86 } 87 }
87 else { 88 else {
88 G4CreateVTE(vname, shape, nmed, rpar, npar 89 G4CreateVTE(vname, shape, nmed, rpar, npar);
89 } 90 }
90 } 91 }
91 92