Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/advanced/composite_calorimeter/src/CCalG4Hall.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/CCalG4Hall.cc (Version 11.3.0) and /examples/advanced/composite_calorimeter/src/CCalG4Hall.cc (Version 7.1.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: CCalG4Hall.cc                             24 // File: CCalG4Hall.cc
 28 // Description: CCalG4Hall Geometry factory cl     25 // Description: CCalG4Hall Geometry factory class to construct G4 geometry 
 29 //              of the experimental hall           26 //              of the experimental hall
 30 //////////////////////////////////////////////     27 ///////////////////////////////////////////////////////////////////////////////
 31 #include "CCalG4Hall.hh"                           28 #include "CCalG4Hall.hh"
 32                                                    29 
 33 #include "CCalMaterialFactory.hh"                  30 #include "CCalMaterialFactory.hh"
 34                                                    31 
 35 #include "CCalG4Hcal.hh"                           32 #include "CCalG4Hcal.hh"
 36 #include "CCalG4Ecal.hh"                           33 #include "CCalG4Ecal.hh"
 37                                                    34 
 38 #include "CCalutils.hh"                            35 #include "CCalutils.hh"
 39                                                    36 
 40 #include "G4SystemOfUnits.hh"                  << 
 41 #include "G4LogicalVolume.hh"                      37 #include "G4LogicalVolume.hh"
 42 #include "G4ThreeVector.hh"                        38 #include "G4ThreeVector.hh"
 43 #include "G4PVPlacement.hh"                        39 #include "G4PVPlacement.hh"
 44 #include "G4Box.hh"                                40 #include "G4Box.hh"
 45                                                    41 
 46 //#define debug                                    42 //#define debug
 47 //#define pdebug                                   43 //#define pdebug
 48                                                    44 
                                                   >>  45 ////////////////////////////////////////////////////////////////////
                                                   >>  46 // CCalG4Hall constructor & destructor...
                                                   >>  47 ////////////////////////////////////////////////////////////////////
 49                                                    48 
 50 CCalG4Hall::CCalG4Hall( const G4String &name ) <<  49 CCalG4Hall::CCalG4Hall(const G4String &name):
 51                                                <<  50   CCalHall(name),CCalG4Able(name) {}
 52                                                    51 
 53 CCalG4Hall::~CCalG4Hall() {}                       52 CCalG4Hall::~CCalG4Hall() {}
 54                                                    53 
                                                   >>  54 ////////////////////////////////////////////////////////////////////
                                                   >>  55 // CCalG4Hall methods...
                                                   >>  56 ////////////////////////////////////////////////////////////////////
 55                                                    57 
 56 G4VPhysicalVolume* CCalG4Hall::constructIn( G4 <<  58 G4VPhysicalVolume* CCalG4Hall::constructIn(G4VPhysicalVolume* mother) {
 57                                                    59 
 58   G4cout << "==>> Constructing CCalG4Hall..."      60   G4cout << "==>> Constructing CCalG4Hall..." << G4endl;
 59                                                    61 
                                                   >>  62   ///////////////////////////////////////////////////////////////
 60   //Pointers to the Rotation Matrices and to t     63   //Pointers to the Rotation Matrices and to the Materials
 61   CCalMaterialFactory* matfact       = CCalMat     64   CCalMaterialFactory* matfact       = CCalMaterialFactory::getInstance();
 62                                                    65 
 63   //Experimental Hall. The mother volume....       66   //Experimental Hall. The mother volume....
 64 #ifdef debug                                       67 #ifdef debug
 65   G4cout << tab << "Building experimental Hall     68   G4cout << tab << "Building experimental Hall geometry...." << G4endl;
 66 #endif                                             69 #endif
 67                                                    70 
 68   G4Box* solid = new G4Box(Name(), getDx_2Hall     71   G4Box* solid = new G4Box(Name(), getDx_2Hall()*mm, getDy_2Hall()*mm,
 69                            getDy_2Hall()*mm);  <<  72          getDy_2Hall()*mm);
 70 #ifdef debug                                       73 #ifdef debug
 71   G4cout << solid->GetName() << " made of " <<     74   G4cout << solid->GetName() << " made of " << getMaterial() << " of dimension " 
 72        << getDx_2Hall()*mm << " " << getDy_2Ha     75        << getDx_2Hall()*mm << " " << getDy_2Hall()*mm << " " 
 73        << getDy_2Hall()*mm << " (all in mm)" <     76        << getDy_2Hall()*mm << " (all in mm)" << G4endl;
 74 #endif                                             77 #endif
 75                                                    78 
 76   G4Material* matter = matfact->findMaterial(g     79   G4Material* matter = matfact->findMaterial(getMaterial());
 77   G4LogicalVolume* glog = new G4LogicalVolume      80   G4LogicalVolume* glog = new G4LogicalVolume (solid, matter, Name(), 0, 0, 0);
 78   setVisType(CCalVisualisable::PseudoVolumes,g     81   setVisType(CCalVisualisable::PseudoVolumes,glog);
 79                                                    82 
 80   G4VPhysicalVolume* volume = new G4PVPlacemen     83   G4VPhysicalVolume* volume = new G4PVPlacement(0,G4ThreeVector(),Name(),
 81                                                    84                                                 glog,mother,false,0);
 82 #ifdef pdebug                                      85 #ifdef pdebug
 83   G4String name("Null");                           86   G4String name("Null");
 84   if (mother != 0) name = mother->GetName();       87   if (mother != 0) name = mother->GetName();
 85   G4cout << glog->GetName() << " number 1 posi     88   G4cout << glog->GetName() << " number 1 positioned in " << name
 86        << " at (0,0,0) with no rotation" << G4     89        << " at (0,0,0) with no rotation" << G4endl;
 87 #endif                                             90 #endif  
 88                                                    91 
 89   G4cout << "<<== End of CCalG4Hall constructi     92   G4cout << "<<== End of CCalG4Hall construction ..." << G4endl;
 90                                                    93 
 91   return volume;                                   94   return volume;
 92 }                                                  95 }
 93                                                    96 
 94                                                <<  97 void CCalG4Hall::constructDaughters(){
 95 void CCalG4Hall::constructDaughters() {        << 
 96   //Hadron Calorimeter                             98   //Hadron Calorimeter
 97   CCalG4Hcal* hcal = new CCalG4Hcal("HadronCal     99   CCalG4Hcal* hcal = new CCalG4Hcal("HadronCalorimeter");
 98   addDetector(hcal);                              100   addDetector(hcal);
 99   AddCCalG4Able(hcal);                            101   AddCCalG4Able(hcal);
100                                                   102 
101   //Crystal matrix                                103   //Crystal matrix
102   CCalG4Ecal* ecal = new CCalG4Ecal("CrystalMa    104   CCalG4Ecal* ecal = new CCalG4Ecal("CrystalMatrixModule");
103   ecal->setType(CCalG4Ecal::module1);             105   ecal->setType(CCalG4Ecal::module1);
104   addDetector(ecal);                              106   addDetector(ecal);
105   AddCCalG4Able(ecal);                            107   AddCCalG4Able(ecal);
106 }                                                 108 }
107                                                << 
108                                                << 
109 void CCalG4Hall::constructSensitive() {}       << 
110                                                   109