Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/g3tog4/src/G4gsvolu.cc

Version: [ ReleaseNotes ] [ 1.0 ] [ 1.1 ] [ 2.0 ] [ 3.0 ] [ 3.1 ] [ 3.2 ] [ 4.0 ] [ 4.0.p1 ] [ 4.0.p2 ] [ 4.1 ] [ 4.1.p1 ] [ 5.0 ] [ 5.0.p1 ] [ 5.1 ] [ 5.1.p1 ] [ 5.2 ] [ 5.2.p1 ] [ 5.2.p2 ] [ 6.0 ] [ 6.0.p1 ] [ 6.1 ] [ 6.2 ] [ 6.2.p1 ] [ 6.2.p2 ] [ 7.0 ] [ 7.0.p1 ] [ 7.1 ] [ 7.1.p1 ] [ 8.0 ] [ 8.0.p1 ] [ 8.1 ] [ 8.1.p1 ] [ 8.1.p2 ] [ 8.2 ] [ 8.2.p1 ] [ 8.3 ] [ 8.3.p1 ] [ 8.3.p2 ] [ 9.0 ] [ 9.0.p1 ] [ 9.0.p2 ] [ 9.1 ] [ 9.1.p1 ] [ 9.1.p2 ] [ 9.1.p3 ] [ 9.2 ] [ 9.2.p1 ] [ 9.2.p2 ] [ 9.2.p3 ] [ 9.2.p4 ] [ 9.3 ] [ 9.3.p1 ] [ 9.3.p2 ] [ 9.4 ] [ 9.4.p1 ] [ 9.4.p2 ] [ 9.4.p3 ] [ 9.4.p4 ] [ 9.5 ] [ 9.5.p1 ] [ 9.5.p2 ] [ 9.6 ] [ 9.6.p1 ] [ 9.6.p2 ] [ 9.6.p3 ] [ 9.6.p4 ] [ 10.0 ] [ 10.0.p1 ] [ 10.0.p2 ] [ 10.0.p3 ] [ 10.0.p4 ] [ 10.1 ] [ 10.1.p1 ] [ 10.1.p2 ] [ 10.1.p3 ] [ 10.2 ] [ 10.2.p1 ] [ 10.2.p2 ] [ 10.2.p3 ] [ 10.3 ] [ 10.3.p1 ] [ 10.3.p2 ] [ 10.3.p3 ] [ 10.4 ] [ 10.4.p1 ] [ 10.4.p2 ] [ 10.4.p3 ] [ 10.5 ] [ 10.5.p1 ] [ 10.6 ] [ 10.6.p1 ] [ 10.6.p2 ] [ 10.6.p3 ] [ 10.7 ] [ 10.7.p1 ] [ 10.7.p2 ] [ 10.7.p3 ] [ 10.7.p4 ] [ 11.0 ] [ 11.0.p1 ] [ 11.0.p2 ] [ 11.0.p3, ] [ 11.0.p4 ] [ 11.1 ] [ 11.1.1 ] [ 11.1.2 ] [ 11.1.3 ] [ 11.2 ] [ 11.2.1 ] [ 11.2.2 ] [ 11.3.0 ]

Diff markup

Differences between /g3tog4/src/G4gsvolu.cc (Version 11.3.0) and /g3tog4/src/G4gsvolu.cc (Version 9.4)


  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: G4gsvolu.cc,v 1.10 2006/06/29 18:15:06 gunter Exp $
                                                   >>  28 // GEANT4 tag $Name: geant4-09-02 $
 27 //                                                 29 //
 28 // by I.Hrivnacova, 13.10.99                       30 // by I.Hrivnacova, 13.10.99
 29                                                    31 
 30 #include <iomanip>                                 32 #include <iomanip>
 31 #include "G3VolTable.hh"                           33 #include "G3VolTable.hh"
 32 #include "globals.hh"                              34 #include "globals.hh"
 33 #include "G3toG4.hh"                               35 #include "G3toG4.hh"
 34 #include "G3toG4MakeSolid.hh"                      36 #include "G3toG4MakeSolid.hh"
 35                                                    37 
 36 void PG4gsvolu(G4String *tokens) {             <<  38 void PG4gsvolu(G4String tokens[]) {
 37     // fill the parameter containers               39     // fill the parameter containers
 38     G3fillParams(tokens,PTgsvolu);                 40     G3fillParams(tokens,PTgsvolu);
 39                                                    41 
 40     // interpret the parameters                    42     // interpret the parameters
 41     G4String vname = Spar[0];                      43     G4String vname = Spar[0];
 42     G4String shape = Spar[1];                      44     G4String shape = Spar[1];
 43     G4int nmed = Ipar[0];                          45     G4int nmed = Ipar[0];
 44     G4int npar = Ipar[1];                          46     G4int npar = Ipar[1];
 45     G4double *pars = Rpar;                         47     G4double *pars = Rpar;
 46                                                    48 
 47     G4gsvolu(vname, shape, nmed, pars, npar);      49     G4gsvolu(vname, shape, nmed, pars, npar);
 48 }                                                  50 }
 49                                                    51 
 50 G3VolTableEntry* G4CreateVTE(G4String vname, G     52 G3VolTableEntry* G4CreateVTE(G4String vname, G4String shape, G4int nmed,
 51                              G4double rpar[],  <<  53                              G4double Rpar[], G4int npar)
 52 {                                                  54 {    
 53   // create the solid                              55   // create the solid
 54   G4bool hasNegPars;                               56   G4bool hasNegPars;
 55   G4bool deferred;                                 57   G4bool deferred;   
 56   G4bool okAxis[3];                                58   G4bool okAxis[3];
 57   G4VSolid* solid                                  59   G4VSolid* solid
 58     = G3toG4MakeSolid(vname, shape, rpar, npar <<  60     = G3toG4MakeSolid(vname, shape, Rpar, npar, hasNegPars, deferred, okAxis);  
 59                                                    61 
 60   // if solid has been deferred                    62   // if solid has been deferred 
 61   // VTE is created with hasNegPars = true         63   // VTE is created with hasNegPars = true  
 62   if (deferred) hasNegPars = true;                 64   if (deferred) hasNegPars = true;   
 63                                                    65 
 64   // create VTE                                    66   // create VTE
 65   G3VolTableEntry* vte                             67   G3VolTableEntry* vte 
 66      = new G3VolTableEntry(vname, shape, rpar, <<  68      = new G3VolTableEntry(vname, shape, Rpar, npar, nmed, solid, hasNegPars);
 67   G3Vol.PutVTE(vte);                               69   G3Vol.PutVTE(vte);
 68                                                    70   
 69   return vte;                                      71   return vte;
 70 }                                                  72 }
 71                                                    73 
 72 void G4gsvolu(G4String vname, G4String shape,  <<  74 void G4gsvolu(G4String vname, G4String shape, G4int nmed, G4double* Rpar,
 73               G4int npar)                          75               G4int npar)
 74 {                                                  76 {
 75   /*                                               77   /*
 76   G4cout << "Creating logical volume " << vnam     78   G4cout << "Creating logical volume " << vname << " shape " << shape
 77      << " nmed " << nmed << " #pars "<< npar <     79      << " nmed " << nmed << " #pars "<< npar << " parameters (cm): ";
 78   for (int ipar=0; ipar< npar; ipar++) G4cout  <<  80   for (int ipar=0; ipar< npar; ipar++) G4cout << std::setw(8) << Rpar[ipar];
 79   G4cout << G4endl;                                81   G4cout << G4endl;
 80   */                                               82   */
 81   if (G3Vol.GetVTE(vname)) {                       83   if (G3Vol.GetVTE(vname)) {
 82     // abort if VTE with given name exists         84     // abort if VTE with given name exists
 83     G4String text = "G4gsvolu: Attempt to crea <<  85     G4Exception("G4gsvolu: Attempt to create volume " + vname + " twice.");
 84     G4Exception("G4gsvolu()", "G3toG40024", Fa << 
 85     return;                                    << 
 86   }                                                86   }
 87   else {                                           87   else {  
 88     G4CreateVTE(vname, shape, nmed, rpar, npar <<  88     G4CreateVTE(vname, shape, nmed, Rpar, npar);
 89   }                                                89   }  
 90 }                                                  90 }
 91                                                    91