Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/advanced/composite_calorimeter/src/CCalAMaterial.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 /examples/advanced/composite_calorimeter/src/CCalAMaterial.cc (Version 11.3.0) and /examples/advanced/composite_calorimeter/src/CCalAMaterial.cc (Version 8.0.p1)


  1 //                                                  1 //
  2 // *******************************************      2 // ********************************************************************
  3 // * License and Disclaimer                    <<   3 // * DISCLAIMER                                                       *
  4 // *                                                4 // *                                                                  *
  5 // * The  Geant4 software  is  copyright of th <<   5 // * The following disclaimer summarizes all the specific disclaimers *
  6 // * the Geant4 Collaboration.  It is provided <<   6 // * of contributors to this software. The specific disclaimers,which *
  7 // * conditions of the Geant4 Software License <<   7 // * govern, are listed with their locations in:                      *
  8 // * LICENSE and available at  http://cern.ch/ <<   8 // *   http://cern.ch/geant4/license                                  *
  9 // * include a list of copyright holders.      << 
 10 // *                                                9 // *                                                                  *
 11 // * Neither the authors of this software syst     10 // * Neither the authors of this software system, nor their employing *
 12 // * institutes,nor the agencies providing fin     11 // * institutes,nor the agencies providing financial support for this *
 13 // * work  make  any representation or  warran     12 // * work  make  any representation or  warranty, express or implied, *
 14 // * regarding  this  software system or assum     13 // * regarding  this  software system or assume any liability for its *
 15 // * use.  Please see the license in the file  <<  14 // * use.                                                             *
 16 // * for the full disclaimer and the limitatio << 
 17 // *                                               15 // *                                                                  *
 18 // * This  code  implementation is the result  <<  16 // * This  code  implementation is the  intellectual property  of the *
 19 // * technical work of the GEANT4 collaboratio <<  17 // * GEANT4 collaboration.                                            *
 20 // * By using,  copying,  modifying or  distri <<  18 // * By copying,  distributing  or modifying the Program (or any work *
 21 // * any work based  on the software)  you  ag <<  19 // * based  on  the Program)  you indicate  your  acceptance of  this *
 22 // * use  in  resulting  scientific  publicati <<  20 // * statement, and all its terms.                                    *
 23 // * acceptance of all terms of the Geant4 Sof << 
 24 // *******************************************     21 // ********************************************************************
 25 //                                                 22 //
 26 //////////////////////////////////////////////     23 ///////////////////////////////////////////////////////////////////////////////
 27 // File: CCalAMaterial.cc                          24 // File: CCalAMaterial.cc
 28 // Description: Specialised class to store inf     25 // Description: Specialised class to store information to make G4Material 
 29 //              from atomic proportion             26 //              from atomic proportion
 30 //////////////////////////////////////////////     27 ///////////////////////////////////////////////////////////////////////////////
 31 #include "CCalAMaterial.hh"                        28 #include "CCalAMaterial.hh"
 32                                                    29 
 33 CCalAMaterial::CCalAMaterial(G4String mat, G4d <<  30 CCalAMaterial::CCalAMaterial(G4String mat, G4double dens, int nconst, 
 34                              CCalAMaterial** c <<  31            CCalAMaterial** constituents, G4double* weights) {
 35   name=mat;                                        32   name=mat;
 36   nElem=0;                                         33   nElem=0;
 37   G4int i=0;                                   <<  34   int i=0;
 38   for (i=0; i<nconst; i++)                         35   for (i=0; i<nconst; i++)
 39     nElem += (constituents[i]->NElements());       36     nElem += (constituents[i]->NElements());
 40                                                    37 
 41   theElements = new G4String[nElem];               38   theElements = new G4String[nElem];
 42   theWeights  = new G4double[nElem];           <<  39   theWeights  = new double[nElem];
 43                                                    40 
 44   G4double factor;                             <<  41   double factor;
 45   G4int nelem=0;                               <<  42   int nelem=0;
 46   for (i=0; i<nconst; i++) {                       43   for (i=0; i<nconst; i++) {
 47     factor=constituents[i]->Aeff();                44     factor=constituents[i]->Aeff();
 48     for (G4int j=0; j<constituents[i]->NElemen <<  45     for (int j=0; j<constituents[i]->NElements(); j++) {
 49       theElements[nelem] = constituents[i]->El     46       theElements[nelem] = constituents[i]->Element(j);
 50       theWeights[nelem]  = constituents[i]->We     47       theWeights[nelem]  = constituents[i]->Weight(j)* weights[i] * factor;
 51       nelem++;                                     48       nelem++;
 52     }                                              49     }
 53   }                                                50   }
 54                                                    51 
 55   if (dens>0)                                      52   if (dens>0) 
 56     density=dens;                                  53     density=dens;
 57   else //Let's compute density                     54   else //Let's compute density
 58     computeDensity(nconst,(CCalMaterial**)cons     55     computeDensity(nconst,(CCalMaterial**)constituents, weights, FTVolume);
 59                                                    56 
 60   computeAeff(nconst, constituents, weights);      57   computeAeff(nconst, constituents, weights);
 61   closeMaterial();                                 58   closeMaterial();
 62 }                                                  59 }
 63                                                    60 
 64 CCalAMaterial::CCalAMaterial(G4String elemat,  <<  61 CCalAMaterial::CCalAMaterial(G4String elemat, double Aeff, double dens) {
 65   name=elemat;                                     62   name=elemat;
 66   density=dens;                                    63   density=dens;
 67   nElem=1;                                         64   nElem=1;
 68   theElements = new G4String[nElem];               65   theElements = new G4String[nElem];
 69   theWeights  = new G4double[nElem];           <<  66   theWeights  = new double[nElem];
 70                                                    67   
 71   theElements[0] = elemat;                         68   theElements[0] = elemat;
 72   theWeights[0]  = 1;                              69   theWeights[0]  = 1;
 73                                                    70 
 74   aEff=eff;                                    <<  71   aEff=Aeff;
 75 }                                                  72 }
 76                                                    73 
 77 CCalAMaterial::~CCalAMaterial() {                  74 CCalAMaterial::~CCalAMaterial() {
 78   //The base class destructor is called?           75   //The base class destructor is called?
 79 }                                                  76 }
 80                                                    77 
 81 CCalAMaterial::CCalAMaterial(const CCalAMateri     78 CCalAMaterial::CCalAMaterial(const CCalAMaterial& mat) 
 82   : CCalMaterial( mat ) {                          79   : CCalMaterial( mat ) {
 83   name    = mat.name;                              80   name    = mat.name;
 84   density = mat.density;                           81   density = mat.density;
 85   nElem   = mat.nElem;                             82   nElem   = mat.nElem;
 86   theElements = new G4String[nElem];               83   theElements = new G4String[nElem];
 87   theWeights  = new G4double[nElem];           <<  84   theWeights  = new double[nElem];
 88   for (G4int i=0; i<nElem; i++){               <<  85   for (int i=0; i<nElem; i++){
 89     theElements[i]=mat.theElements[i];             86     theElements[i]=mat.theElements[i];
 90     theWeights[i]=mat.theWeights[i];               87     theWeights[i]=mat.theWeights[i];
 91   }                                                88   }
 92 }                                                  89 }
 93                                                    90 
 94 CCalAMaterial& CCalAMaterial::operator=(const      91 CCalAMaterial& CCalAMaterial::operator=(const CCalAMaterial& mat){
 95   if(theElements)                                  92   if(theElements)
 96     delete[] theElements;                          93     delete[] theElements;
 97   if(theWeights)                                   94   if(theWeights)
 98     delete[] theWeights;                           95     delete[] theWeights;
 99                                                    96 
100   name=mat.name;                                   97   name=mat.name;
101   density=mat.density;                             98   density=mat.density;
102   nElem=mat.nElem;                                 99   nElem=mat.nElem;
103   aEff=mat.aEff;                                  100   aEff=mat.aEff;
104                                                   101   
105   theElements = new G4String[nElem];              102   theElements = new G4String[nElem];
106   theWeights  = new G4double[nElem];           << 103   theWeights  = new double[nElem];
107   for (G4int i=0; i<nElem; i++){               << 104   for (int i=0; i<nElem; i++){
108     theElements[i]=mat.theElements[i];            105     theElements[i]=mat.theElements[i];
109     theWeights[i]=mat.theWeights[i];              106     theWeights[i]=mat.theWeights[i];
110   }                                               107   }
111   return *this;                                   108   return *this;
112 }                                                 109 }
113                                                   110 
114 void CCalAMaterial::computeAeff(G4int nconst,  << 111 void CCalAMaterial::computeAeff(int nconst, 
115                                 CCalAMaterial* << 112         CCalAMaterial** constituents, 
116                                 G4double* weig << 113         double* weights){
117   aEff=0;                                         114   aEff=0;
118   for (G4int i=0; i<nconst; i++)               << 115   for (int i=0; i<nconst; i++)
119     aEff += weights[i] * constituents[i]->Aeff    116     aEff += weights[i] * constituents[i]->Aeff();
120 }                                                 117 }
121                                                   118 
122 std::ostream& operator<<(std::ostream& os, con    119 std::ostream& operator<<(std::ostream& os, const CCalAMaterial& mat) {
123   os << mat.name << G4endl;                       120   os << mat.name << G4endl;
124   os << "Density= " << mat.density << " g/cm3.    121   os << "Density= " << mat.density << " g/cm3. Number of Elements: "
125      << mat.nElem                                 122      << mat.nElem 
126      << ". Aeff= " << mat.aEff << G4endl;         123      << ". Aeff= " << mat.aEff << G4endl;
127   for (G4int i=0; i<mat.nElem; i++)            << 124   for (int i=0; i<mat.nElem; i++)
128     os << '\t' << mat.theElements[i] << '\t' <    125     os << '\t' << mat.theElements[i] << '\t' << mat.theWeights[i] << G4endl;
129   return os;                                      126   return os;
130 }                                                 127 }
131                                                   128