Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/persistency/ascii/src/G4tgrFileReader.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 /persistency/ascii/src/G4tgrFileReader.cc (Version 11.3.0) and /persistency/ascii/src/G4tgrFileReader.cc (Version 9.2.p4)


  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 // G4tgrFileReader implementation              << 
 27 //                                                 26 //
 28 // Author: P.Arce, CIEMAT (November 2007)      <<  27 // $Id: G4tgrFileReader.cc,v 1.4 2008/11/12 08:44:07 arce Exp $
 29 // ------------------------------------------- <<  28 // GEANT4 tag $Name: geant4-09-02-patch-04 $
                                                   >>  29 //
                                                   >>  30 //
                                                   >>  31 // class G4tgrFileReader
                                                   >>  32 
                                                   >>  33 // History:
                                                   >>  34 // - Created.                                 P.Arce, CIEMAT (November 2007)
                                                   >>  35 // -------------------------------------------------------------------------
 30                                                    36 
 31 #include "G4tgrFileReader.hh"                      37 #include "G4tgrFileReader.hh"
 32 #include "G4tgrParameterMgr.hh"                    38 #include "G4tgrParameterMgr.hh"
 33 #include "G4tgrFileIn.hh"                          39 #include "G4tgrFileIn.hh"
 34 #include "G4tgrElementSimple.hh"                   40 #include "G4tgrElementSimple.hh"
 35 #include "G4tgrElementFromIsotopes.hh"             41 #include "G4tgrElementFromIsotopes.hh"
 36 #include "G4tgrVolume.hh"                          42 #include "G4tgrVolume.hh"
 37 #include "G4tgrPlaceDivRep.hh"                     43 #include "G4tgrPlaceDivRep.hh"
 38 #include "G4tgrPlaceParameterisation.hh"           44 #include "G4tgrPlaceParameterisation.hh"
 39 #include "G4tgrVolumeDivision.hh"                  45 #include "G4tgrVolumeDivision.hh"
 40 #include "G4tgrVolumeMgr.hh"                       46 #include "G4tgrVolumeMgr.hh"
 41 #include "G4tgrUtils.hh"                           47 #include "G4tgrUtils.hh"
 42 #include "G4tgrMaterialFactory.hh"                 48 #include "G4tgrMaterialFactory.hh"
 43 #include "G4tgrRotationMatrixFactory.hh"           49 #include "G4tgrRotationMatrixFactory.hh"
 44 #include "G4tgrLineProcessor.hh"                   50 #include "G4tgrLineProcessor.hh"
 45 #include "G4tgrMessenger.hh"                       51 #include "G4tgrMessenger.hh"
 46                                                    52 
 47 G4ThreadLocal G4tgrFileReader* G4tgrFileReader << 
 48                                                    53 
 49 // ------------------------------------------- <<  54 G4tgrFileReader* G4tgrFileReader::theInstance = 0;
                                                   >>  55 
                                                   >>  56 
                                                   >>  57 //---------------------------------------------------------------
 50 G4tgrFileReader::G4tgrFileReader()                 58 G4tgrFileReader::G4tgrFileReader()
 51 {                                                  59 {
 52   theLineProcessor = new G4tgrLineProcessor;       60   theLineProcessor = new G4tgrLineProcessor;
 53 }                                                  61 }
 54                                                    62 
 55 // ------------------------------------------- <<  63 
                                                   >>  64 //---------------------------------------------------------------
 56 G4tgrFileReader::~G4tgrFileReader()                65 G4tgrFileReader::~G4tgrFileReader()
 57 {                                                  66 {
 58   delete theLineProcessor;                     << 
 59   delete theInstance;                              67   delete theInstance;
 60 }                                                  68 }
 61                                                    69 
 62 // ------------------------------------------- <<  70 
                                                   >>  71 //---------------------------------------------------------------
 63 G4tgrFileReader* G4tgrFileReader::GetInstance(     72 G4tgrFileReader* G4tgrFileReader::GetInstance()
 64 {                                                  73 {
 65   if(theInstance == nullptr)                   <<  74   if( !theInstance ) {
 66   {                                            << 
 67     theInstance = new G4tgrFileReader;             75     theInstance = new G4tgrFileReader;
 68   }                                                76   }
 69   return theInstance;                              77   return theInstance;
 70 }                                                  78 }
 71                                                    79 
 72 // ------------------------------------------- <<  80 //---------------------------------------------------------------
 73 G4bool G4tgrFileReader::ReadFiles()            <<  81 G4bool G4tgrFileReader::ReadFiles() 
 74 {                                                  82 {
 75   std::vector<G4String> wl, wlnew;             << 
 76                                                    83 
                                                   >>  84   std::vector< G4String > wl,wlnew;
                                                   >>  85     
 77 #ifdef G4VERBOSE                                   86 #ifdef G4VERBOSE
 78   if(G4tgrMessenger::GetVerboseLevel() >= 2)   <<  87   if( G4tgrMessenger::GetVerboseLevel() >= 2 )
 79   {                                                88   {
 80     G4cout << "   Number of geometry data file     89     G4cout << "   Number of geometry data files = " << theTextFiles.size()
 81            << G4endl;                              90            << G4endl;
 82   }                                                91   }
 83 #endif                                             92 #endif
 84                                                    93 
 85   if(theTextFiles.size() == 0)                 <<  94   if( theTextFiles.size() == 0 )
 86   {                                                95   {
 87     G4Exception("G4tgrFileReader::ReadFiles()" <<  96     G4Exception("G4tgrFileReader::ReadFiles()", "InvalidInput",
 88                 "No files to read ...");       <<  97                 FatalException, "No files to read ...");
 89   }                                                98   }
 90                                                    99 
 91   for(std::size_t ii = 0; ii < theTextFiles.si << 100   for( size_t ii = 0; ii < theTextFiles.size(); ii++ )
 92   {                                               101   {
 93 #ifdef G4VERBOSE                                  102 #ifdef G4VERBOSE
 94     if(G4tgrMessenger::GetVerboseLevel() >= 1) << 103     if( G4tgrMessenger::GetVerboseLevel() >= 1 )
 95     {                                             104     {
 96       G4cout << "   Reading data file " << the    105       G4cout << "   Reading data file " << theTextFiles[ii] << G4endl;
 97     }                                             106     }
 98 #endif                                            107 #endif
 99                                                << 108     
100     G4tgrFileIn fin = G4tgrFileIn::GetInstance << 109     G4tgrFileIn fin = G4tgrFileIn::GetInstance( theTextFiles[ii] );
101                                                << 110     
102     G4int nlines = 0;                             111     G4int nlines = 0;
103     for(;;)                                       112     for(;;)
104     {                                             113     {
105       ++nlines;                                << 114       nlines++;
106       if(!fin.GetWordsInLine(wlnew))           << 115       if(! fin.GetWordsInLine( wlnew ) )  { break; }
107       {                                        << 
108         break;                                 << 
109       }                                        << 
110       // Check if it is continuation line or f    116       // Check if it is continuation line or first line
111       if(wlnew[0].c_str()[0] != ':')           << 117       if( wlnew[0].c_str()[0] != ':' )
112       {                                           118       {
113         wl.insert(wl.end(), wlnew.begin(), wln << 119         wl.insert( wl.end(), wlnew.begin(), wlnew.end() );
114 #ifdef G4VERBOSE                                  120 #ifdef G4VERBOSE
115         if(G4tgrMessenger::GetVerboseLevel() > << 121         if( G4tgrMessenger::GetVerboseLevel() >= 4 )
116         {                                         122         {
117           G4tgrUtils::DumpVS(wl, "!!!! adding     123           G4tgrUtils::DumpVS(wl, "!!!! adding line");
118         }                                         124         }
119 #endif                                            125 #endif
120         continue;                                 126         continue;
121       }                                           127       }
122       else                                        128       else
123       {                                           129       {
124         //----- Process previous tag              130         //----- Process previous tag
125 #ifdef G4VERBOSE                                  131 #ifdef G4VERBOSE
126         if(G4tgrMessenger::GetVerboseLevel() > << 132         if( G4tgrMessenger::GetVerboseLevel() >= 4 )
127         {                                         133         {
128           G4tgrUtils::DumpVS(wl, "!!!! line re    134           G4tgrUtils::DumpVS(wl, "!!!! line read");
129         }                                         135         }
130 #endif                                            136 #endif
131         if(nlines != 1)  // first line has no  << 137         if( nlines != 1)   // first line has no previous tag
132         {                                         138         {
133           if(!theLineProcessor->ProcessLine(wl << 139           if( ! theLineProcessor->ProcessLine( wl ) )
134           {                                       140           {
135             fin.DumpException("Tag not found:  << 141             fin.DumpException( "Tag not found: " + wl[0]);
136           }                                       142           }
137         }                                         143         }
138         wl = wlnew;                               144         wl = wlnew;
139       }                                           145       }
140     }                                             146     }
141                                                << 147     
142     if(wl.size() != 0)                         << 148     if( wl.size() != 0 )
143     {                                             149     {
144       if(!theLineProcessor->ProcessLine(wl))   << 150       if( ! theLineProcessor->ProcessLine( wl ) )
145       {                                           151       {
146         fin.DumpException("Tag not found: " +  << 152         fin.DumpException( "Tag not found: " + wl[0]);
147       }                                           153       }
148     }                                             154     }
149   }                                            << 155   }  
150   return true;                                 << 156   return 1;
151 }                                                 157 }
152                                                   158