Geant4 Cross Reference

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


  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 // G4tgbElement                                << 
 27 //                                                 26 //
 28 // Author: P.Arce, CIEMAT (November 2007)      <<  27 //
 29 // ------------------------------------------- <<  28 //
                                                   >>  29 // class G4tgbElement
                                                   >>  30 
                                                   >>  31 // History:
                                                   >>  32 // - Created.                                 P.Arce, CIEMAT (November 2007)
                                                   >>  33 // -------------------------------------------------------------------------
 30                                                    34 
 31 #include "G4tgbElement.hh"                         35 #include "G4tgbElement.hh"
 32 #include "G4tgbMaterialMgr.hh"                     36 #include "G4tgbMaterialMgr.hh"
 33 #include "G4tgrElementSimple.hh"                   37 #include "G4tgrElementSimple.hh"
 34 #include "G4tgrElementFromIsotopes.hh"             38 #include "G4tgrElementFromIsotopes.hh"
 35 #include "G4tgrMessenger.hh"                       39 #include "G4tgrMessenger.hh"
 36                                                    40 
 37 // ------------------------------------------- <<  41 
 38 G4tgbElement::G4tgbElement(G4tgrElement* hg)   <<  42 //----------------------------------------------------------------------
                                                   >>  43 G4tgbElement::G4tgbElement( G4tgrElement* hg )
 39 {                                                  44 {
 40   theTgrElem = hg;                                 45   theTgrElem = hg;
                                                   >>  46   theG4Elem = 0;
 41 }                                                  47 }
 42                                                    48 
 43 // ------------------------------------------- <<  49 
                                                   >>  50 //----------------------------------------------------------------------
 44 G4Element* G4tgbElement::BuildG4ElementSimple(     51 G4Element* G4tgbElement::BuildG4ElementSimple()
 45 {                                                  52 {
 46   G4Element* elem = nullptr;                   <<  53   G4Element* elem = 0;
 47                                                    54 
 48   //-------- if G4Element not found, construct <<  55   //-------- if G4Element not found, construct it 
 49   if(theG4Elem == nullptr)                     <<  56   if( theG4Elem == 0 )
 50   {                                            <<  57   { 
 51     //----- construct new G4Element            <<  58     //----- construct new G4Element 
 52     G4tgrElementSimple* tgrElem = static_cast<     59     G4tgrElementSimple* tgrElem = static_cast<G4tgrElementSimple*>(theTgrElem);
 53                                                    60 
 54     elem = new G4Element(tgrElem->GetName(), t     61     elem = new G4Element(tgrElem->GetName(), tgrElem->GetSymbol(),
 55                          tgrElem->GetZ(), tgrE <<  62                          tgrElem->GetZ(), tgrElem->GetA() );
 56 #ifdef G4VERBOSE                                   63 #ifdef G4VERBOSE
 57     if(G4tgrMessenger::GetVerboseLevel() >= 1) <<  64     if( G4tgrMessenger::GetVerboseLevel() >= 1 )
 58     {                                              65     {
 59       G4cout << " Constructing new G4Element:  <<  66       G4cout << " Constructing new G4Element: " 
                                                   >>  67              << *elem << G4endl;
 60     }                                              68     }
 61 #endif                                             69 #endif
 62     theG4Elem = elem;                              70     theG4Elem = elem;
 63   }                                                71   }
 64   else                                             72   else
 65   {                                                73   {
 66     elem = theG4Elem;                          <<  74     elem = theG4Elem; 
 67   }                                                75   }
 68                                                    76 
 69   return elem;                                     77   return elem;
 70 }                                                  78 }
 71                                                    79 
 72 // ------------------------------------------- <<  80 
                                                   >>  81 //----------------------------------------------------------------------
 73 G4Element* G4tgbElement::BuildG4ElementFromIso     82 G4Element* G4tgbElement::BuildG4ElementFromIsotopes()
 74 {                                                  83 {
 75   G4Element* elem = nullptr;                   <<  84   G4Element* elem = 0;
 76                                                    85 
 77   //-------- if G4Element not found, construct <<  86   //-------- if G4Element not found, construct it 
 78   if(theG4Elem == nullptr)                     <<  87   if( theG4Elem == 0 )
 79   {                                            <<  88   { 
 80     //----- construct new G4Element            <<  89     //----- construct new G4Element 
 81     G4tgrElementFromIsotopes* tgrElem =        <<  90     G4tgrElementFromIsotopes* tgrElem
 82       static_cast<G4tgrElementFromIsotopes*>(t <<  91       = static_cast<G4tgrElementFromIsotopes*>(theTgrElem);
 83                                                    92 
 84     elem = new G4Element(tgrElem->GetName(), t     93     elem = new G4Element(tgrElem->GetName(), tgrElem->GetSymbol(),
 85                          tgrElem->GetNumberOfI <<  94                          tgrElem->GetNumberOfIsotopes() );
 86                                                    95 
 87     //----- add isotopes                           96     //----- add isotopes
 88     G4Isotope* compIsot;                           97     G4Isotope* compIsot;
 89     G4tgbMaterialMgr* mf = G4tgbMaterialMgr::G     98     G4tgbMaterialMgr* mf = G4tgbMaterialMgr::GetInstance();
 90     for(G4int ii = 0; ii < tgrElem->GetNumberO <<  99     for( G4int ii = 0; ii < tgrElem->GetNumberOfIsotopes(); ii++)
 91     {                                             100     {
 92       // Look if this component is a material     101       // Look if this component is a material
 93                                                   102 
 94       compIsot = mf->FindOrBuildG4Isotope(tgrE << 103       compIsot = mf->FindOrBuildG4Isotope( tgrElem->GetComponent(ii) );
 95       if(compIsot != nullptr)                  << 104       if( compIsot != 0 )
 96       {                                        << 105       { 
 97         elem->AddIsotope(compIsot, tgrElem->Ge << 106         elem->AddIsotope( compIsot, tgrElem->GetAbundance(ii) );
 98       }                                           107       }
 99       else                                        108       else
100       {                                           109       {
101         G4String ErrMessage = "Component " + t << 110         G4String ErrMessage = "Component " + tgrElem->GetComponent(ii)
102                               " of element " + << 111                             + " of element " + tgrElem->GetName()
103                               " is not an isot << 112                             + " is not an isotope !";
104         G4Exception("G4tgbElement::BuildG4Elem    113         G4Exception("G4tgbElement::BuildG4ElementFromIsotopes()",
105                     "InvalidSetup", FatalExcep << 114                     "InvalidSetup", FatalException, ErrMessage );
106       }                                           115       }
107     }                                          << 116     } 
108     theG4Elem = elem;                             117     theG4Elem = elem;
109   }                                               118   }
110   else                                            119   else
111   {                                               120   {
112     elem = theG4Elem;                          << 121     elem = theG4Elem; 
113   }                                               122   }
114                                                   123 
                                                   >> 124 
115 #ifdef G4VERBOSE                                  125 #ifdef G4VERBOSE
116   if(G4tgrMessenger::GetVerboseLevel() >= 1)   << 126     if( G4tgrMessenger::GetVerboseLevel() >= 1 )
117   {                                            << 127     {
118     G4cout << " Constructing  new G4Element fr << 128       G4cout << " Constructing  new G4Element from isotopes: "
119   }                                            << 129              << *elem << G4endl;
                                                   >> 130     }
120 #endif                                            131 #endif
121                                                   132 
122   return elem;                                    133   return elem;
123 }                                                 134 }
124                                                   135