Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/materials/src/G4ElementData.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 /materials/src/G4ElementData.cc (Version 11.3.0) and /materials/src/G4ElementData.cc (Version 10.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 // $Id: G4ElementData.cc 96794 2016-05-09 10:09:30Z gcosmo $
                                                   >>  27 //
 26 //--------------------------------------------     28 //---------------------------------------------------------------------------
 27 //                                                 29 //
 28 // GEANT4 Class file                               30 // GEANT4 Class file
 29 //                                                 31 //
 30 // Description: Data structure for cross secti     32 // Description: Data structure for cross sections, shell cross sections
 31 //              isotope cross sections             33 //              isotope cross sections
 32 //                                                 34 //
 33 // Author:      V.Ivanchenko 10.03.2011            35 // Author:      V.Ivanchenko 10.03.2011
 34 //                                                 36 //
 35 // Modifications:                                  37 // Modifications:
 36 //                                                 38 //
 37 //--------------------------------------------     39 //----------------------------------------------------------------------------
                                                   >>  40 //
                                                   >>  41 
                                                   >>  42 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 38                                                    43 
 39 #include "G4ElementData.hh"                        44 #include "G4ElementData.hh"
 40 #include "G4ElementDataRegistry.hh"            << 
 41                                                    45 
 42 G4ElementData::G4ElementData(G4int length)     <<  46 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 43   : maxNumElm(length)                          <<  47 
                                                   >>  48 G4ElementData::G4ElementData()
 44 {                                                  49 {
 45   elmData.resize(maxNumElm, nullptr);          <<  50   name = "";
 46   G4ElementDataRegistry::Instance()->RegisterM <<  51   for(G4int i=0; i<maxNumElements; ++i) {
                                                   >>  52     elmData[i] = nullptr;
                                                   >>  53     elm2Data[i] = nullptr;
                                                   >>  54     compLength[i] = 0;
                                                   >>  55   }
 47 }                                                  56 }
 48                                                    57 
                                                   >>  58 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
                                                   >>  59 
 49 G4ElementData::~G4ElementData()                    60 G4ElementData::~G4ElementData()
 50 {                                                  61 {
 51   for (auto const & p : elmData) { delete p; } <<  62   for(G4int i=0; i<maxNumElements; ++i) {
 52   for (auto const & p : elm2Data) { delete p;  <<  63     delete elmData[i];
 53   for (auto const & p : compData) {            <<  64     delete elm2Data[i];
 54     if (nullptr != p ) {                       <<  65     size_t n = compLength[i]; 
 55       for (auto const & q : *p) { delete q.sec <<  66     //G4cout << "Z= " << i << " L= " << n << G4endl;
 56       delete p;                                <<  67     for(size_t j=0; j<n; ++j) {
                                                   >>  68       //G4cout << "j= " << j << "  " << (compData[i])[j] << G4endl;
                                                   >>  69       delete (compData[i])[j];
 57     }                                              70     }
 58   }                                                71   }
 59   for (auto const & p : comp2D) {              << 
 60     if (nullptr != p ) {                       << 
 61       for (auto const & q : *p) { delete q.sec << 
 62       delete p;                                << 
 63     }                                          << 
 64   }                                            << 
 65   G4ElementDataRegistry::Instance()->RemoveMe( << 
 66 }                                                  72 }
 67                                                    73 
 68 void G4ElementData::InitialiseForElement(G4int     74 void G4ElementData::InitialiseForElement(G4int Z, G4PhysicsVector* v)
 69 {                                                  75 {
 70   if (Z < 0 || Z >= maxNumElm) {               <<  76   if(Z < 1 || Z >= maxNumElements) {
 71     DataError(Z, "InitialiseForElement");      <<  77     G4cout << "G4ElementData::InitialiseForElement ERROR for " << name 
                                                   >>  78      << "  Z = " << Z << " is out of range!" << G4endl;
                                                   >>  79     G4Exception("G4ElementData::InitialiseForElement()", "mat601", 
                                                   >>  80                  FatalException, "Wrong data handling");
 72     return;                                        81     return;
 73   }                                            <<  82   } 
 74   delete elmData[Z];                           <<  83   if(elmData[Z]) { delete elmData[Z]; }
 75   elmData[Z] = v;                                  84   elmData[Z] = v;
 76 }                                                  85 }
 77                                                    86 
 78 void G4ElementData::InitialiseForElement(G4int     87 void G4ElementData::InitialiseForElement(G4int Z, G4Physics2DVector* v)
 79 {                                                  88 {
 80   if (Z < 0 || Z >= maxNumElm) {               <<  89   if(Z < 1 || Z >= maxNumElements) {
 81     DataError(Z, "InitialiseForElement");      <<  90     G4cout << "G4ElementData::InitialiseForElement ERROR for " << name 
                                                   >>  91      << "  Z = " << Z << " is out of range!" << G4endl;
                                                   >>  92     G4Exception("G4ElementData::InitialiseForElement()", "mat601", 
                                                   >>  93                  FatalException, "Wrong data handling");
 82     return;                                        94     return;
 83   }                                            <<  95   } 
 84   if (0 == elm2Data.size()) {                  <<  96   if(elm2Data[Z]) { delete elm2Data[Z]; }
 85     elm2Data.resize(maxNumElm, nullptr);       << 
 86   }                                            << 
 87   delete elm2Data[Z];                          << 
 88   elm2Data[Z] = v;                                 97   elm2Data[Z] = v;
 89 }                                                  98 }
 90                                                    99 
 91 void G4ElementData::InitialiseForComponent(G4i    100 void G4ElementData::InitialiseForComponent(G4int Z, G4int nComponents)
 92 {                                                 101 {
 93   if (Z < 0 || Z >= maxNumElm) {               << 102   if(Z < 1 || Z >= maxNumElements) {
 94     DataError(Z, "InitialiseForComponent");    << 103     G4cout << "G4ElementData::InitialiseForComponent ERROR for " << name 
 95     return;                                    << 104      << "  Z = " << Z << " is out of range!" << G4endl;
 96   }                                            << 105     G4Exception("G4ElementData::InitialiseForComponent()", "mat602", 
 97   if (0 == compData.size()) {                  << 106                  FatalException, "Wrong data handling");     
 98     compData.resize(maxNumElm, nullptr);       << 
 99   }                                            << 
100   delete compData[Z];                          << 
101   compData[Z] = new std::vector<std::pair<G4in << 
102   if (0 < nComponents) { compData[Z]->reserve( << 
103 }                                              << 
104                                                << 
105 void G4ElementData::InitialiseFor2DComponent(G << 
106 {                                              << 
107   if (Z < 0 || Z >= maxNumElm) {               << 
108     DataError(Z, "InitialiseFor2DComponent");  << 
109     return;                                       107     return;
110   }                                               108   }
111   if (0 == comp2D.size()) {                    << 
112     comp2D.resize(maxNumElm, nullptr);         << 
113   }                                            << 
114   delete comp2D[Z];                            << 
115   comp2D[Z] = new std::vector<std::pair<G4int, << 
116   if (0 < nComponents) { comp2D[Z]->reserve(nC << 
117 }                                              << 
118                                                   109 
119 void G4ElementData::AddComponent(G4int Z, G4in << 110   // reserve a new structure
120 {                                              << 111   size_t n = compLength[Z];
121   if (Z < 0 || Z >= maxNumElm) {               << 112   if(0 < n) { 
122     DataError(Z, "AddComponent");              << 113     for(size_t i=0; i<n; ++i) { delete (compData[Z])[i]; }
123     return;                                    << 114     (compData[Z]).clear();
124   }                                            << 115     (compID[Z]).clear();
125   if (0 == compData.size()) {                  << 
126     compData.resize(maxNumElm, nullptr);       << 
127   }                                               116   }
128   if (nullptr == compData[Z]) {                << 117   (compData[Z]).reserve(nComponents);
129     compData[Z] = new std::vector<std::pair<G4 << 118   (compID[Z]).reserve(nComponents);
130   }                                            << 
131   compData[Z]->emplace_back(id, v);            << 
132 }                                                 119 }
133                                                   120 
134 void G4ElementData::Add2DComponent(G4int Z, G4 << 121 void 
                                                   >> 122 G4ElementData::AddComponent(G4int Z, G4int id, G4PhysicsVector* v)
135 {                                                 123 {
136   if (Z < 0 || Z >= maxNumElm) {               << 124   if(Z < 1 || Z >= maxNumElements) {
137     DataError(Z, "Add2DComponent");            << 125     G4cout << "G4ElementData::AddComponent ERROR for " << name 
                                                   >> 126      << "  Z = " << Z << " is out of range!" << G4endl;
                                                   >> 127     G4Exception("G4ElementData::AddComponent()", "mat603", 
                                                   >> 128                  FatalException, "Wrong data handling");     
138     return;                                       129     return;
139   }                                               130   }
140   if (0 == comp2D.size()) {                    << 131   (compData[Z]).push_back(v);
141     compData.resize(maxNumElm, nullptr);       << 132   (compID[Z]).push_back(id);
142   }                                            << 133   ++compLength[Z];
143   if (nullptr == comp2D[Z]) {                  << 
144     comp2D[Z] = new std::vector<std::pair<G4in << 
145   }                                            << 
146   comp2D[Z]->emplace_back(id, v);              << 
147 }                                              << 
148                                                << 
149 void G4ElementData::DataError(G4int Z, const G << 
150 {                                              << 
151   G4cout << "G4ElementData::" << type << " ERR << 
152          << name << ">  Z = " << Z << " is out << 
153   G4Exception("G4ElementData", "mat603", Fatal << 
154 }                                                 134 }
155                                                   135