Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/g3tog4/src/G3MatTable.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/G3MatTable.cc (Version 11.3.0) and /g3tog4/src/G3MatTable.cc (Version 10.2)


  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: G3MatTable.cc 67982 2013-03-13 10:36:03Z gcosmo $
 27 //                                                 28 //
 28 // by I.Hrivnacova, 27 Sep 99                      29 // by I.Hrivnacova, 27 Sep 99
 29                                                    30 
 30 #include "G3MatTable.hh"                           31 #include "G3MatTable.hh"
 31                                                    32 
 32 G3MatTable::G3MatTable()                           33 G3MatTable::G3MatTable()
 33 {                                                  34 {
 34   fMatVector = new G3MaterialVector();             35   fMatVector = new G3MaterialVector();
 35 }                                                  36 }
 36                                                    37 
 37 G3MatTable::~G3MatTable()                          38 G3MatTable::~G3MatTable()
 38 {                                                  39 {
 39   Clear();                                         40   Clear();
 40   delete fMatVector;                               41   delete fMatVector;
 41 }                                                  42 }
 42                                                    43 
 43 G4Material* G3MatTable::get(G4int id) const        44 G4Material* G3MatTable::get(G4int id) const
 44 {                                                  45 {
 45   for (size_t i=0; i< fMatVector->size(); i++)     46   for (size_t i=0; i< fMatVector->size(); i++) {
 46     G3MatTableEntry* mte = (*fMatVector)[i];       47     G3MatTableEntry* mte = (*fMatVector)[i];
 47     if (id == mte->GetID()) return mte->GetMat     48     if (id == mte->GetID()) return mte->GetMaterial();
 48   }                                                49   }
 49   return 0;                                        50   return 0;
 50 }                                                  51 }    
 51                                                    52 
 52 void G3MatTable::put(G4int id, G4Material* mat     53 void G3MatTable::put(G4int id, G4Material* material)
 53 {                                                  54 {
 54   G3MatTableEntry* mte = new G3MatTableEntry(i     55   G3MatTableEntry* mte = new G3MatTableEntry(id, material);
 55   fMatVector->push_back(mte);                      56   fMatVector->push_back(mte);
 56 }                                                  57 }
 57                                                    58 
 58 void G3MatTable::Clear()                           59 void G3MatTable::Clear()
 59 {                                                  60 {
 60   G3MatTableEntry* a;                              61   G3MatTableEntry* a;
 61   while (fMatVector->size()>0) {                   62   while (fMatVector->size()>0) {
 62     a = fMatVector->back();                        63     a = fMatVector->back();
 63     fMatVector->pop_back();                        64     fMatVector->pop_back();
 64     for (G3MaterialVector::iterator i=fMatVect     65     for (G3MaterialVector::iterator i=fMatVector->begin();
 65                                     i!=fMatVec     66                                     i!=fMatVector->end();){
 66       if (*i==a) {                                 67       if (*i==a) {
 67   i = fMatVector->erase(i);                        68   i = fMatVector->erase(i);
 68       }                                            69       }
 69       else {                                       70       else {
 70   ++i;                                             71   ++i;
 71       }                                            72       }
 72     }                                              73     } 
 73     if ( a )  delete a;                            74     if ( a )  delete a;    
 74   }                                                75   } 
 75 }                                                  76 }
 76                                                    77