Geant4 Cross Reference

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


  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 // File: CCalEcal.cc                               27 // File: CCalEcal.cc
 28 // Description: CCalEcal Geometry factory clas     28 // Description: CCalEcal Geometry factory class for crystal matrix
 29 //////////////////////////////////////////////     29 ///////////////////////////////////////////////////////////////////////////////
 30 #include "CCalEcal.hh"                             30 #include "CCalEcal.hh"
 31                                                    31 
 32 #include <fstream>                                 32 #include <fstream>
 33 #include "CCalutils.hh"                            33 #include "CCalutils.hh"
 34 #include "G4SystemOfUnits.hh"                  << 
 35                                                    34 
 36 //#define debug                                    35 //#define debug
 37                                                    36 
 38 CCalEcal::~CCalEcal() {}                           37 CCalEcal::~CCalEcal() {}
 39                                                    38 
 40 G4int CCalEcal::readFile() {                   <<  39 int CCalEcal::readFile() {
 41   ////////////////////////////////////////////     40   ///////////////////////////////////////////////////////////////
 42   //Let's open the file                            41   //Let's open the file
 43   G4cout << " ==> Opening file " << File() <<      42   G4cout << " ==> Opening file " << File() << " to read elements..."
 44        << G4endl;                                  43        << G4endl;
 45                                                    44 
 46   std::ifstream is;                                45   std::ifstream is;
 47   G4bool ok = openGeomFile(is, pathName, File( <<  46   bool ok = openGeomFile(is, pathName, File());
 48   if (!ok)                                         47   if (!ok)
 49     return 0;                                      48     return 0;
 50                                                    49 
 51   // Find *DO CrystalMatrix                        50   // Find *DO CrystalMatrix 
 52   findDO(is, G4String("CrystalMatrix"));           51   findDO(is, G4String("CrystalMatrix"));
 53                                                    52 
 54   //Let's read overall box dimensions and posi     53   //Let's read overall box dimensions and positions
 55   readName(is,genMat);                             54   readName(is,genMat);
 56   is >> widBox >> lengBox >> xpos >> ypos >> z     55   is >> widBox >> lengBox >> xpos >> ypos >> zpos >> thetaX >> phiX
 57      >> thetaY >> phiY >> thetaZ >> phiZ >> ju     56      >> thetaY >> phiY >> thetaZ >> phiZ >> jump;
 58 #ifdef debug                                       57 #ifdef debug
 59   G4cout << tab << "General material: " << gen     58   G4cout << tab << "General material: " << genMat << "\tBox dimensions "
 60        << widBox << ", " << lengBox << G4endl;     59        << widBox << ", " << lengBox << G4endl;
 61   G4cout << tab << "Positioned at (" << xpos <     60   G4cout << tab << "Positioned at (" << xpos << ", " << ypos << ", " << zpos
 62        << ") with rotation (" << thetaX << ",      61        << ") with rotation (" << thetaX << ", " << phiX << ", " << thetaY
 63        << ", " << phiY << ", " << thetaZ << ",     62        << ", " << phiY << ", " << thetaZ << ", " << phiZ << ")" << G4endl;
 64 #endif                                             63 #endif
 65                                                    64 
 66   //Then the layer positions                       65   //Then the layer positions
 67   G4int i=0;                                   <<  66   int i=0;
 68   readName(is,layMat);                             67   readName(is,layMat);
 69   is >> layNum >> layRadius >> layAngle >> len     68   is >> layNum >> layRadius >> layAngle >> lengFront;
 70   for (i=0; i<5; i++)                              69   for (i=0; i<5; i++) 
 71     is >> layPar[i];                               70     is >> layPar[i];
 72 #ifdef debug                                       71 #ifdef debug
 73   G4cout << tab << "Layer material: " << layMa     72   G4cout << tab << "Layer material: " << layMat << " Number " << layNum
 74        << " Radius " << layRadius << " Angle "     73        << " Radius " << layRadius << " Angle " << layAngle/deg 
 75        << " front dist " << lengFront << " Par     74        << " front dist " << lengFront << " Parameters ";
 76   for (i=0; i<5; i++)                              75   for (i=0; i<5; i++)
 77     G4cout << layPar[i] << " ";                    76     G4cout << layPar[i] << " ";
 78   G4cout << G4endl;                                77   G4cout << G4endl;
 79 #endif                                             78 #endif
 80                                                    79 
 81   //Then the crystal positions                     80   //Then the crystal positions
 82   readName(is,crystMat);                           81   readName(is,crystMat);
 83   is >> crystNum >> crystLength >> crystTol;       82   is >> crystNum >> crystLength >> crystTol;
 84   for (i=0; i<5; i++)                              83   for (i=0; i<5; i++) 
 85     is >> crystPar[i];                             84     is >> crystPar[i];
 86 #ifdef debug                                       85 #ifdef debug
 87   G4cout << tab << "Crystal material: " << cry     86   G4cout << tab << "Crystal material: " << crystMat << " Number " << crystNum
 88        << " Length " << crystLength << " Toler     87        << " Length " << crystLength << " Tolerance " << crystTol
 89        << " Parameters ";                          88        << " Parameters ";
 90   for (i=0; i<5; i++)                              89   for (i=0; i<5; i++)
 91     G4cout << crystPar[i] << " ";                  90     G4cout << crystPar[i] << " ";
 92   G4cout << G4endl;                                91   G4cout << G4endl;
 93 #endif                                             92 #endif
 94                                                    93 
 95   //Then the support material                      94   //Then the support material
 96   readName(is,suppMat);                            95   readName(is,suppMat);
 97   is >> dxSupp >> dySupp >> dzSupp >> distSupp     96   is >> dxSupp >> dySupp >> dzSupp >> distSupp >> jump;
 98 #ifdef debug                                       97 #ifdef debug
 99   G4cout << tab << "Support material: " << sup     98   G4cout << tab << "Support material: " << suppMat << " Dimensions " << dxSupp
100        << ", " << dySupp << ", " << dzSupp <<      99        << ", " << dySupp << ", " << dzSupp << " Distance " << distSupp << G4endl;
101 #endif                                            100 #endif
102                                                   101    
103   ////////////////////////////////////////////    102   ///////////////////////////////////////////////////////////////
104   // Close the file                               103   // Close the file
105   G4cout << " ==> Closing file " << File() <<     104   G4cout << " ==> Closing file " << File() << G4endl;
106   is.close();                                     105   is.close();
107                                                   106 
108   return 1;                                       107   return 1;
109                                                   108 
110 }                                                 109 }
111                                                   110 
112 void CCalEcal::constructDaughters() {}            111 void CCalEcal::constructDaughters() {}
113                                                   112