Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/extended/hadronic/Hadr01/src/HistoManager.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/extended/hadronic/Hadr01/src/HistoManager.cc (Version 11.3.0) and /examples/extended/hadronic/Hadr01/src/HistoManager.cc (Version 10.7.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 /// \file hadronic/Hadr01/src/HistoManager.cc      26 /// \file hadronic/Hadr01/src/HistoManager.cc
 27 /// \brief Implementation of the HistoManager      27 /// \brief Implementation of the HistoManager class
 28 //                                                 28 //
 29 //--------------------------------------------     29 //---------------------------------------------------------------------------
 30 //                                                 30 //
 31 // ClassName:   HistoManager                       31 // ClassName:   HistoManager
 32 //                                                 32 //
 33 //                                                 33 //
 34 // Author:      V.Ivanchenko 30/01/01              34 // Author:      V.Ivanchenko 30/01/01
 35 //                                                 35 //
 36 // Modified:                                       36 // Modified:
 37 // 04.06.2006 Adoptation of Hadr01 (V.Ivanchen     37 // 04.06.2006 Adoptation of Hadr01 (V.Ivanchenko)
 38 // 16.11.2006 Add beamFlag (V.Ivanchenko)          38 // 16.11.2006 Add beamFlag (V.Ivanchenko)
 39 //                                                 39 //
 40 //--------------------------------------------     40 //----------------------------------------------------------------------------
 41 //                                                 41 //
 42                                                    42 
 43 //....oooOO0OOooo........oooOO0OOooo........oo     43 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 44 //....oooOO0OOooo........oooOO0OOooo........oo     44 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 45                                                    45 
 46 #include "HistoManager.hh"                         46 #include "HistoManager.hh"
 47                                                <<  47 #include "G4Track.hh"
 48 #include "Histo.hh"                            <<  48 #include "G4Step.hh"
 49                                                <<  49 #include "G4UnitsTable.hh"
 50 #include "G4Alpha.hh"                          <<  50 #include "G4Neutron.hh"
                                                   >>  51 #include "G4Proton.hh"
 51 #include "G4AntiProton.hh"                         52 #include "G4AntiProton.hh"
 52 #include "G4Deuteron.hh"                       << 
 53 #include "G4Electron.hh"                       << 
 54 #include "G4Gamma.hh"                              53 #include "G4Gamma.hh"
 55 #include "G4He3.hh"                            <<  54 #include "G4Electron.hh"
 56 #include "G4KaonMinus.hh"                      <<  55 #include "G4Positron.hh"
 57 #include "G4KaonPlus.hh"                       << 
 58 #include "G4KaonZeroLong.hh"                   << 
 59 #include "G4KaonZeroShort.hh"                  << 
 60 #include "G4MuonMinus.hh"                      << 
 61 #include "G4MuonPlus.hh"                           56 #include "G4MuonPlus.hh"
 62 #include "G4Neutron.hh"                        <<  57 #include "G4MuonMinus.hh"
 63 #include "G4PhysicalConstants.hh"              << 
 64 #include "G4PionMinus.hh"                      << 
 65 #include "G4PionPlus.hh"                           58 #include "G4PionPlus.hh"
                                                   >>  59 #include "G4PionMinus.hh"
 66 #include "G4PionZero.hh"                           60 #include "G4PionZero.hh"
 67 #include "G4Positron.hh"                       <<  61 #include "G4KaonPlus.hh"
 68 #include "G4Proton.hh"                         <<  62 #include "G4KaonMinus.hh"
 69 #include "G4Step.hh"                           <<  63 #include "G4KaonZeroShort.hh"
 70 #include "G4SystemOfUnits.hh"                  <<  64 #include "G4KaonZeroLong.hh"
 71 #include "G4Track.hh"                          <<  65 #include "G4Deuteron.hh"
 72 #include "G4Triton.hh"                             66 #include "G4Triton.hh"
 73 #include "G4UnitsTable.hh"                     <<  67 #include "G4He3.hh"
                                                   >>  68 #include "G4Alpha.hh"
                                                   >>  69 #include "Histo.hh"
 74 #include "globals.hh"                              70 #include "globals.hh"
                                                   >>  71 #include "G4SystemOfUnits.hh"
                                                   >>  72 #include "G4PhysicalConstants.hh"
 75                                                    73 
 76 //....oooOO0OOooo........oooOO0OOooo........oo     74 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 77                                                    75 
 78 HistoManager* HistoManager::fManager = nullptr <<  76 HistoManager* HistoManager::fManager = 0;
 79                                                    77 
 80 //....oooOO0OOooo........oooOO0OOooo........oo     78 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 81                                                    79 
 82 HistoManager* HistoManager::GetPointer()           80 HistoManager* HistoManager::GetPointer()
 83 {                                                  81 {
 84   if (nullptr == fManager) {                   <<  82   if(!fManager) {
 85     static HistoManager manager;                   83     static HistoManager manager;
 86     fManager = &manager;                           84     fManager = &manager;
 87   }                                                85   }
 88   return fManager;                                 86   return fManager;
 89 }                                                  87 }
 90                                                    88 
 91 //....oooOO0OOooo........oooOO0OOooo........oo     89 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 92                                                    90 
 93 HistoManager::HistoManager()                       91 HistoManager::HistoManager()
 94   : fPrimaryDef(nullptr),                      <<  92 : fPrimaryDef(nullptr),
 95     fRadius(10 * CLHEP::cm),                   <<  93   fEdepMax(1.0*GeV),
 96     fLength(300. * CLHEP::mm),                 <<  94   fLength (300.*mm),
 97     fEdepMax(1.0 * CLHEP::GeV)                 <<  95   fPrimaryKineticEnergy(0.0),  
                                                   >>  96   fVerbose(0),  
                                                   >>  97   fNBinsE (100),
                                                   >>  98   fNSlices(300),
                                                   >>  99   fNHisto (28),
                                                   >> 100   fBeamFlag(true),
                                                   >> 101   fHistoBooked(false)
 98 {                                                 102 {
 99   fHisto = new Histo();                        << 103   fHisto     = new Histo();
100   fHisto->SetVerbose(fVerbose);                   104   fHisto->SetVerbose(fVerbose);
101   fNeutron = G4Neutron::Neutron();             << 105   BookHisto();
                                                   >> 106   fNeutron   = G4Neutron::Neutron();
102 }                                                 107 }
103                                                   108 
104 //....oooOO0OOooo........oooOO0OOooo........oo    109 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
105                                                   110 
106 HistoManager::~HistoManager()                     111 HistoManager::~HistoManager()
107 {                                                 112 {
108   delete fHisto;                                  113   delete fHisto;
109 }                                                 114 }
110                                                   115 
111 //....oooOO0OOooo........oooOO0OOooo........oo    116 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
112                                                   117 
113 void HistoManager::BookHisto()                    118 void HistoManager::BookHisto()
114 {                                                 119 {
115   fHistoBooked = true;                            120   fHistoBooked = true;
116   fHisto->Add1D("1", "Energy deposition (MeV/m << 121   fHisto->Add1D("1","Energy deposition (MeV/mm/event) in the target",
117                 MeV / mm);                     << 122                fNSlices,0.0,fLength/mm,MeV/mm);
118   fHisto->Add1D("2", "Log10 Energy (MeV) of ga << 123   fHisto->Add1D("2","Log10 Energy (MeV) of gammas",fNBinsE,-5.,5.,1.0);
119   fHisto->Add1D("3", "Log10 Energy (MeV) of el << 124   fHisto->Add1D("3","Log10 Energy (MeV) of electrons",fNBinsE,-5.,5.,1.0);
120   fHisto->Add1D("4", "Log10 Energy (MeV) of po << 125   fHisto->Add1D("4","Log10 Energy (MeV) of positrons",fNBinsE,-5.,5.,1.0);
121   fHisto->Add1D("5", "Log10 Energy (MeV) of pr << 126   fHisto->Add1D("5","Log10 Energy (MeV) of protons",fNBinsE,-5.,5.,1.0);
122   fHisto->Add1D("6", "Log10 Energy (MeV) of ne << 127   fHisto->Add1D("6","Log10 Energy (MeV) of neutrons",fNBinsE,-5.,5.,1.0);
123   fHisto->Add1D("7", "Log10 Energy (MeV) of ch << 128   fHisto->Add1D("7","Log10 Energy (MeV) of charged pions",fNBinsE,-4.,6.,1.0);
124   fHisto->Add1D("8", "Log10 Energy (MeV) of pi << 129   fHisto->Add1D("8","Log10 Energy (MeV) of pi0",fNBinsE,-4.,6.,1.0);
125   fHisto->Add1D("9", "Log10 Energy (MeV) of ch << 130   fHisto->Add1D("9","Log10 Energy (MeV) of charged kaons",fNBinsE,-4.,6.,1.0);
126   fHisto->Add1D("10", "Log10 Energy (MeV) of n << 131   fHisto->Add1D("10","Log10 Energy (MeV) of neutral kaons",fNBinsE,-4.,6.,1.0);
127   fHisto->Add1D("11", "Log10 Energy (MeV) of d << 132   fHisto->Add1D("11","Log10 Energy (MeV) of deuterons and tritons",
128   fHisto->Add1D("12", "Log10 Energy (MeV) of H << 133                 fNBinsE,-5.,5.,1.0);
129   fHisto->Add1D("13", "Log10 Energy (MeV) of G << 134   fHisto->Add1D("12","Log10 Energy (MeV) of He3 and alpha",fNBinsE,-5.,5.,1.0);
130   fHisto->Add1D("14", "Log10 Energy (MeV) of m << 135   fHisto->Add1D("13","Log10 Energy (MeV) of Generic Ions",fNBinsE,-5.,5.,1.0);
131   fHisto->Add1D("15", "log10 Energy (MeV) of s << 136   fHisto->Add1D("14","Log10 Energy (MeV) of muons",fNBinsE,-4.,6.,1.0);
132   fHisto->Add1D("16", "log10 Energy (MeV) of f << 137   fHisto->Add1D("15","log10 Energy (MeV) of side-leaked neutrons",
133   fHisto->Add1D("17", "log10 Energy (MeV) of b << 138                 fNBinsE,-5.,5.,1.0);
134   fHisto->Add1D("18", "log10 Energy (MeV) of l << 139   fHisto->Add1D("16","log10 Energy (MeV) of forward-leaked neutrons",
135   fHisto->Add1D("19", "log10 Energy (MeV) of l << 140                 fNBinsE,-5.,5.,1.0);
136   fHisto->Add1D("20", "Log10 Energy (MeV) of p << 141   fHisto->Add1D("17","log10 Energy (MeV) of backward-leaked neutrons",
137   fHisto->Add1D("21", "Log10 Energy (MeV) of p << 142                 fNBinsE,-5.,5.,1.0);
138   fHisto->Add1D("22", "Energy deposition in th << 143   fHisto->Add1D("18","log10 Energy (MeV) of leaking protons",
139                 1.0);                          << 144                 fNBinsE,-4.,6.,1.0);
140   fHisto->Add1D("23", "EM energy deposition in << 145   fHisto->Add1D("19","log10 Energy (MeV) of leaking charged pions",
141                 1.0);                          << 146                 fNBinsE,-4.,6.,1.0);
142   fHisto->Add1D("24", "Pion energy deposition  << 147   fHisto->Add1D("20","Log10 Energy (MeV) of pi+",fNBinsE,-4.,6.,1.0);
143                 1.1, 1.0);                     << 148   fHisto->Add1D("21","Log10 Energy (MeV) of pi-",fNBinsE,-4.,6.,1.0);
144   fHisto->Add1D("25", "Proton energy depositio << 149   fHisto->Add1D("22",
145                 1.1, 1.0);                     << 150                 "Energy deposition in the target normalized to beam energy",
146   fHisto->Add1D("26", "Energy (MeV) of pi+", f << 151                 110,0.0,1.1,1.0);
147   fHisto->Add1D("27", "Energy (MeV) of pi-", f << 152   fHisto->Add1D("23",
148   fHisto->Add1D("28", "Energy (MeV) of pi0", f << 153                 "EM energy deposition in the target normalized to beam energy",
                                                   >> 154                 110,0.0,1.1,1.0);
                                                   >> 155   fHisto->Add1D("24",
                                                   >> 156                "Pion energy deposition in the target normalized to beam energy",
                                                   >> 157                 110,0.0,1.1,1.0);
                                                   >> 158   fHisto->Add1D("25",
                                                   >> 159              "Proton energy deposition in the target normalized to beam energy",
                                                   >> 160                 110,0.0,1.1,1.0);
                                                   >> 161   fHisto->Add1D("26","Energy (MeV) of pi+",fNBinsE,0.,500.,1.0);
                                                   >> 162   fHisto->Add1D("27","Energy (MeV) of pi-",fNBinsE,0.,500.,1.0);
                                                   >> 163   fHisto->Add1D("28","Energy (MeV) of pi0",fNBinsE,0.,500.,1.0);
                                                   >> 164 
149 }                                                 165 }
150                                                   166 
151 //....oooOO0OOooo........oooOO0OOooo........oo    167 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
152                                                   168 
153 void HistoManager::BeginOfRun()                   169 void HistoManager::BeginOfRun()
154 {                                                 170 {
155   fR2 = fRadius * fRadius;                     << 171   fAbsZ0       = -0.5*fLength;
156   fAbsZ0 = 0.5 * fLength;                      << 172   fNevt       = 0;
157   fNevt = 0;                                   << 173   fNelec      = 0;
158   fNelec = 0;                                  << 174   fNposit     = 0;
159   fNposit = 0;                                 << 175   fNgam       = 0;
160   fNgam = 0;                                   << 176   fNstep      = 0;
161   fNstep = 0;                                  << 
162   fNprot_leak = 0;                                177   fNprot_leak = 0;
163   fNpiofNleak = 0;                                178   fNpiofNleak = 0;
164   fNions = 0;                                  << 179   fNions      = 0;
165   fNdeut = 0;                                  << 180   fNdeut      = 0;
166   fNalpha = 0;                                 << 181   fNalpha     = 0;
167   fNkaons = 0;                                 << 182   fNkaons     = 0;
168   fNmuons = 0;                                 << 183   fNmuons     = 0;
169   fNcpions = 0;                                << 184   fNcpions    = 0;
170   fNpi0 = 0;                                   << 185   fNpi0       = 0;
171   fNneutron = 0;                               << 186   fNneutron   = 0;
172   fNproton = 0;                                << 187   fNproton    = 0;
173   fNaproton = 0;                               << 188   fNaproton   = 0;
174   fNneu_forw = 0;                              << 189   fNneu_forw  = 0;
175   fNneu_leak = 0;                              << 190   fNneu_leak  = 0;
176   fNneu_back = 0;                              << 191   fNneu_back  = 0;
177                                                   192 
178   fEdepSum = 0.0;                              << 193   fEdepSum     = 0.0;
179   fEdepSum2 = 0.0;                             << 194   fEdepSum2    = 0.0;
180                                                   195 
181   if (!fHistoBooked) {                         << 196   if(!fHistoBooked) { BookHisto(); }
182     BookHisto();                               << 
183   }                                            << 
184   fHisto->Book();                                 197   fHisto->Book();
185                                                   198 
186   if (fVerbose > 0) {                          << 199   if(fVerbose > 0) {
187     G4cout << "HistoManager: Histograms are bo << 200     G4cout << "HistoManager: Histograms are booked and run has been started"
                                                   >> 201            <<G4endl;
188   }                                               202   }
189 }                                                 203 }
190                                                   204 
191 //....oooOO0OOooo........oooOO0OOooo........oo    205 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
192                                                   206 
193 void HistoManager::EndOfRun()                     207 void HistoManager::EndOfRun()
194 {                                                 208 {
                                                   >> 209 
195   G4cout << "HistoManager: End of run actions     210   G4cout << "HistoManager: End of run actions are started" << G4endl;
196                                                   211 
197   // Average values                               212   // Average values
198   G4cout << "================================= << 213   G4cout<<"========================================================"<<G4endl;
199                                                   214 
200   G4double x = (G4double)fNevt;                   215   G4double x = (G4double)fNevt;
201   if (fNevt > 0) {                             << 216   if(fNevt > 0) { x = 1.0/x; }
202     x = 1.0 / x;                               << 
203   }                                            << 
204                                                   217 
205   G4double xe = x * (G4double)fNelec;          << 218   G4double xe = x*(G4double)fNelec;
206   G4double xg = x * (G4double)fNgam;           << 219   G4double xg = x*(G4double)fNgam;
207   G4double xp = x * (G4double)fNposit;         << 220   G4double xp = x*(G4double)fNposit;
208   G4double xs = x * (G4double)fNstep;          << 221   G4double xs = x*(G4double)fNstep;
209   G4double xn = x * (G4double)fNneutron;       << 222   G4double xn = x*(G4double)fNneutron;
210   G4double xpn = x * (G4double)fNproton;       << 223   G4double xpn = x*(G4double)fNproton;
211   G4double xap = x * (G4double)fNaproton;      << 224   G4double xap = x*(G4double)fNaproton;
212   G4double xnf = x * (G4double)fNneu_forw;     << 225   G4double xnf = x*(G4double)fNneu_forw;
213   G4double xnb = x * (G4double)fNneu_leak;     << 226   G4double xnb = x*(G4double)fNneu_leak;
214   G4double xnbw = x * (G4double)fNneu_back;    << 227   G4double xnbw= x*(G4double)fNneu_back;
215   G4double xpl = x * (G4double)fNprot_leak;    << 228   G4double xpl = x*(G4double)fNprot_leak;
216   G4double xal = x * (G4double)fNpiofNleak;    << 229   G4double xal = x*(G4double)fNpiofNleak;
217   G4double xpc = x * (G4double)fNcpions;       << 230   G4double xpc = x*(G4double)fNcpions;
218   G4double xp0 = x * (G4double)fNpi0;          << 231   G4double xp0 = x*(G4double)fNpi0;
219   G4double xpk = x * (G4double)fNkaons;        << 232   G4double xpk = x*(G4double)fNkaons;
220   G4double xpm = x * (G4double)fNmuons;        << 233   G4double xpm = x*(G4double)fNmuons;
221   G4double xid = x * (G4double)fNdeut;         << 234   G4double xid = x*(G4double)fNdeut;
222   G4double xia = x * (G4double)fNalpha;        << 235   G4double xia = x*(G4double)fNalpha;
223   G4double xio = x * (G4double)fNions;         << 236   G4double xio = x*(G4double)fNions;
224                                                   237 
225   fEdepSum *= x;                               << 238   fEdepSum  *= x;
226   fEdepSum2 *= x;                                 239   fEdepSum2 *= x;
227   fEdepSum2 -= fEdepSum * fEdepSum;            << 240   fEdepSum2 -= fEdepSum*fEdepSum;
228   if (fEdepSum2 > 0.0) {                       << 241   if(fEdepSum2 > 0.0) { fEdepSum2 = std::sqrt(fEdepSum2); }
229     fEdepSum2 = std::sqrt(fEdepSum2);          << 242   else                { fEdepSum2 = 0.0; }
230   }                                            << 243 
231   else {                                       << 244   G4cout                         << "Beam particle                        "
232     fEdepSum2 = 0.0;                           << 245                                  << fPrimaryDef->GetParticleName() <<G4endl;
233   }                                            << 246   G4cout                         << "Beam Energy(MeV)                     " 
234                                                << 247                                  << fPrimaryKineticEnergy/MeV <<G4endl;
235   G4cout << "Beam particle                     << 248   G4cout                         << "Number of events                     " 
236   G4cout << "Beam Energy(MeV)                  << 249                                  << fNevt <<G4endl;
237   G4cout << "Number of events                  << 250   G4cout << std::setprecision(4) << "Average energy deposit (MeV)         " 
238   G4cout << std::setprecision(4) << "Average e << 251          << fEdepSum/MeV 
239          << "   RMS(MeV) " << fEdepSum2 / MeV  << 252          << "   RMS(MeV) " << fEdepSum2/MeV << G4endl;
240   G4cout << std::setprecision(4) << "Average n << 253   G4cout << std::setprecision(4) << "Average number of steps              " 
241   G4cout << std::setprecision(4) << "Average n << 254          << xs << G4endl;
242   G4cout << std::setprecision(4) << "Average n << 255   G4cout << std::setprecision(4) << "Average number of gamma              " 
243   G4cout << std::setprecision(4) << "Average n << 256          << xg << G4endl;
244   G4cout << std::setprecision(4) << "Average n << 257   G4cout << std::setprecision(4) << "Average number of e-                 " 
245   G4cout << std::setprecision(4) << "Average n << 258          << xe << G4endl;
246   G4cout << std::setprecision(4) << "Average n << 259   G4cout << std::setprecision(4) << "Average number of e+                 " 
247   G4cout << std::setprecision(4) << "Average n << 260          << xp << G4endl;
248   G4cout << std::setprecision(4) << "Average n << 261   G4cout << std::setprecision(4) << "Average number of neutrons           " 
249   G4cout << std::setprecision(4) << "Average n << 262          << xn << G4endl;
250   G4cout << std::setprecision(4) << "Average n << 263   G4cout << std::setprecision(4) << "Average number of protons            " 
251   G4cout << std::setprecision(4) << "Average n << 264          << xpn << G4endl;
252   G4cout << std::setprecision(4) << "Average n << 265   G4cout << std::setprecision(4) << "Average number of antiprotons        " 
253   G4cout << std::setprecision(4) << "Average n << 266          << xap << G4endl;
254   G4cout << std::setprecision(4) << "Average n << 267   G4cout << std::setprecision(4) << "Average number of pi+ & pi-          " 
255   G4cout << std::setprecision(4) << "Average n << 268          << xpc << G4endl;
256   G4cout << std::setprecision(4) << "Average n << 269   G4cout << std::setprecision(4) << "Average number of pi0                " 
257   G4cout << std::setprecision(4) << "Average n << 270          << xp0 << G4endl;
258   G4cout << std::setprecision(4) << "Average n << 271   G4cout << std::setprecision(4) << "Average number of kaons              " 
259   G4cout << "================================= << 272          << xpk << G4endl;
260   G4cout << G4endl;                            << 273   G4cout << std::setprecision(4) << "Average number of muons              " 
                                                   >> 274          << xpm << G4endl;
                                                   >> 275   G4cout << std::setprecision(4) << "Average number of deuterons+tritons  " 
                                                   >> 276          << xid << G4endl;
                                                   >> 277   G4cout << std::setprecision(4) << "Average number of He3+alpha          " 
                                                   >> 278          << xia << G4endl;
                                                   >> 279   G4cout << std::setprecision(4) << "Average number of ions               " 
                                                   >> 280          << xio << G4endl;
                                                   >> 281   G4cout << std::setprecision(4) << "Average number of forward neutrons   " 
                                                   >> 282          << xnf << G4endl;
                                                   >> 283   G4cout << std::setprecision(4) << "Average number of reflected neutrons " 
                                                   >> 284          << xnb << G4endl;
                                                   >> 285   G4cout << std::setprecision(4) << "Average number of leaked neutrons    " 
                                                   >> 286          << xnbw << G4endl;
                                                   >> 287   G4cout << std::setprecision(4) << "Average number of proton leak        " 
                                                   >> 288          << xpl << G4endl;
                                                   >> 289   G4cout << std::setprecision(4) << "Average number of pion leak          " 
                                                   >> 290          << xal << G4endl;
                                                   >> 291   G4cout<<"========================================================"<<G4endl;
                                                   >> 292   G4cout<<G4endl;
261                                                   293 
262   // normalise histograms                         294   // normalise histograms
263   for (G4int i = 0; i < fNHisto; i++) {        << 295   for(G4int i=0; i<fNHisto; i++) { 
264     fHisto->ScaleH1(i, x);                     << 296     fHisto->ScaleH1(i,x);
265   }                                               297   }
266                                                   298 
267   fHisto->Save();                                 299   fHisto->Save();
268 }                                                 300 }
269                                                   301 
270 //....oooOO0OOooo........oooOO0OOooo........oo    302 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
271                                                   303 
272 void HistoManager::BeginOfEvent()                 304 void HistoManager::BeginOfEvent()
273 {                                                 305 {
274   fEdepEvt = 0.0;                                 306   fEdepEvt = 0.0;
275   fEdepEM = 0.0;                               << 307   fEdepEM  = 0.0;
276   fEdepPI = 0.0;                               << 308   fEdepPI  = 0.0;
277   fEdepP = 0.0;                                << 309   fEdepP   = 0.0;
278 }                                                 310 }
279                                                   311 
280 //....oooOO0OOooo........oooOO0OOooo........oo    312 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
281                                                   313 
282 void HistoManager::EndOfEvent()                   314 void HistoManager::EndOfEvent()
283 {                                                 315 {
284   fEdepSum += fEdepEvt;                        << 316   fEdepSum  += fEdepEvt;
285   fEdepSum2 += fEdepEvt * fEdepEvt;            << 317   fEdepSum2 += fEdepEvt*fEdepEvt;
286   fHisto->Fill(21, fEdepEvt / fPrimaryKineticE << 318   fHisto->Fill(21,fEdepEvt/fPrimaryKineticEnergy,1.0);
287   fHisto->Fill(22, fEdepEM / fPrimaryKineticEn << 319   fHisto->Fill(22,fEdepEM/fPrimaryKineticEnergy,1.0);
288   fHisto->Fill(23, fEdepPI / fPrimaryKineticEn << 320   fHisto->Fill(23,fEdepPI/fPrimaryKineticEnergy,1.0);
289   fHisto->Fill(24, fEdepP / fPrimaryKineticEne << 321   fHisto->Fill(24,fEdepP/fPrimaryKineticEnergy,1.0);
290 }                                                 322 }
291                                                   323 
292 //....oooOO0OOooo........oooOO0OOooo........oo    324 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
293                                                   325 
294 void HistoManager::ScoreNewTrack(const G4Track    326 void HistoManager::ScoreNewTrack(const G4Track* track)
295 {                                                 327 {
296   const G4ParticleDefinition* pd = track->GetD    328   const G4ParticleDefinition* pd = track->GetDefinition();
297   const G4String name = pd->GetParticleName(); << 329   G4String name = pd->GetParticleName();
298   const G4double ee = track->GetKineticEnergy( << 330   G4double ee = track->GetKineticEnergy();
299   G4double e = ee;                                331   G4double e = ee;
300                                                   332 
301   // Primary track                                333   // Primary track
302   if (0 == track->GetParentID()) {             << 334   if(0 == track->GetParentID()) {
                                                   >> 335 
303     fNevt++;                                      336     fNevt++;
304     fPrimaryKineticEnergy = e;                    337     fPrimaryKineticEnergy = e;
305     fPrimaryDef = pd;                             338     fPrimaryDef = pd;
306     G4ThreeVector dir = track->GetMomentumDire    339     G4ThreeVector dir = track->GetMomentumDirection();
307     if (1 < fVerbose)                          << 340     if(1 < fVerbose) 
308       G4cout << "### Primary " << name << " ki << 341       G4cout << "### Primary " << name 
309              << "; m(MeV)= " << pd->GetPDGMass << 342              << " kinE(MeV)= " << e/MeV
310              << ";  dir= " << track->GetMoment << 343              << "; m(MeV)= " << pd->GetPDGMass()/MeV
                                                   >> 344              << "; pos(mm)= " << track->GetPosition()/mm 
                                                   >> 345              << ";  dir= " << track->GetMomentumDirection() 
                                                   >> 346              << G4endl;
311                                                   347 
312     // Secondary track                            348     // Secondary track
313   }                                            << 349   } else {
314   else {                                       << 350     if(1 < fVerbose) 
315     if (1 < fVerbose)                          << 351       G4cout << "=== Secondary " << name 
316       G4cout << "=== Secondary " << name << "  << 352              << " kinE(MeV)= " << e/MeV
317              << "; m(MeV)= " << pd->GetPDGMass << 353              << "; m(MeV)= " << pd->GetPDGMass()/MeV
318              << ";  dir= " << track->GetMoment << 354              << "; pos(mm)= " << track->GetPosition()/mm 
319     e = (e > 0.0) ? std::log10(e / MeV) : -100 << 355              << ";  dir= " << track->GetMomentumDirection() 
320     if (pd == G4Gamma::Gamma()) {              << 356              << G4endl;
                                                   >> 357     e = std::log10(e/MeV);
                                                   >> 358     if(pd == G4Gamma::Gamma()) {
321       fNgam++;                                    359       fNgam++;
322       fHisto->Fill(1, e, 1.0);                 << 360       fHisto->Fill(1,e,1.0);
323     }                                          << 361     } else if ( pd == G4Electron::Electron()) {
324     else if (pd == G4Electron::Electron()) {   << 
325       fNelec++;                                   362       fNelec++;
326       fHisto->Fill(2, e, 1.0);                 << 363       fHisto->Fill(2,e,1.0);
327     }                                          << 364     } else if ( pd == G4Positron::Positron()) {
328     else if (pd == G4Positron::Positron()) {   << 
329       fNposit++;                                  365       fNposit++;
330       fHisto->Fill(3, e, 1.0);                 << 366       fHisto->Fill(3,e,1.0);
331     }                                          << 367     } else if ( pd == G4Proton::Proton()) {
332     else if (pd == G4Proton::Proton()) {       << 
333       fNproton++;                                 368       fNproton++;
334       fHisto->Fill(4, e, 1.0);                 << 369       fHisto->Fill(4,e,1.0);
335     }                                          << 370     } else if ( pd == fNeutron) {
336     else if (pd == fNeutron) {                 << 
337       fNneutron++;                                371       fNneutron++;
338       fHisto->Fill(5, e, 1.0);                 << 372       fHisto->Fill(5,e,1.0);
339     }                                          << 373     } else if ( pd == G4AntiProton::AntiProton()) {
340     else if (pd == G4AntiProton::AntiProton()) << 
341       fNaproton++;                                374       fNaproton++;
342     }                                          << 375     } else if ( pd == G4PionPlus::PionPlus() ) {
343     else if (pd == G4PionPlus::PionPlus()) {   << 
344       fNcpions++;                                 376       fNcpions++;
345       fHisto->Fill(6, e, 1.0);                 << 377       fHisto->Fill(6,e,1.0);
346       fHisto->Fill(19, e, 1.0);                << 378       fHisto->Fill(19,e,1.0);
347       fHisto->Fill(25, ee, 1.0);               << 379       fHisto->Fill(25,ee,1.0);
348     }                                          << 380 
349     else if (pd == G4PionMinus::PionMinus()) { << 381     } else if ( pd == G4PionMinus::PionMinus()) {
350       fNcpions++;                                 382       fNcpions++;
351       fHisto->Fill(6, e, 1.0);                 << 383       fHisto->Fill(6,e,1.0);
352       fHisto->Fill(20, e, 1.0);                << 384       fHisto->Fill(20,e,1.0);
353       fHisto->Fill(26, ee, 1.0);               << 385       fHisto->Fill(26,ee,1.0);
354     }                                          << 386 
355     else if (pd == G4PionZero::PionZero()) {   << 387     } else if ( pd == G4PionZero::PionZero()) {
356       fNpi0++;                                    388       fNpi0++;
357       fHisto->Fill(7, e, 1.0);                 << 389       fHisto->Fill(7,e,1.0);
358       fHisto->Fill(27, ee, 1.0);               << 390       fHisto->Fill(27,ee,1.0);
359     }                                          << 391 
360     else if (pd == G4KaonPlus::KaonPlus() || p << 392     } else if ( pd == G4KaonPlus::KaonPlus() || 
                                                   >> 393                 pd == G4KaonMinus::KaonMinus()) {
361       fNkaons++;                                  394       fNkaons++;
362       fHisto->Fill(8, e, 1.0);                 << 395       fHisto->Fill(8,e,1.0);
363     }                                          << 396     } else if ( pd == G4KaonZeroShort::KaonZeroShort() || 
364     else if (pd == G4KaonZeroShort::KaonZeroSh << 397                 pd == G4KaonZeroLong::KaonZeroLong()) {
365       fNkaons++;                                  398       fNkaons++;
366       fHisto->Fill(9, e, 1.0);                 << 399       fHisto->Fill(9,e,1.0);
367     }                                          << 400     } else if ( pd == G4Deuteron::Deuteron() || pd == G4Triton::Triton()) {
368     else if (pd == G4Deuteron::Deuteron() || p << 
369       fNdeut++;                                   401       fNdeut++;
370       fHisto->Fill(10, e, 1.0);                << 402       fHisto->Fill(10,e,1.0);
371     }                                          << 403     } else if ( pd == G4He3::He3() || pd == G4Alpha::Alpha()) {
372     else if (pd == G4He3::He3() || pd == G4Alp << 
373       fNalpha++;                                  404       fNalpha++;
374       fHisto->Fill(11, e, 1.0);                << 405       fHisto->Fill(11,e,1.0);
375     }                                          << 406     } else if ( pd->GetParticleType() == "nucleus") {
376     else if (pd->GetParticleType() == "nucleus << 
377       fNions++;                                   407       fNions++;
378       fHisto->Fill(12, e, 1.0);                << 408       fHisto->Fill(12,e,1.0);
379     }                                          << 409     } else if ( pd == G4MuonPlus::MuonPlus() || 
380     else if (pd == G4MuonPlus::MuonPlus() || p << 410                 pd == G4MuonMinus::MuonMinus()) {
381       fNmuons++;                                  411       fNmuons++;
382       fHisto->Fill(13, e, 1.0);                << 412       fHisto->Fill(13,e,1.0);    
383     }                                             413     }
384   }                                               414   }
385 }                                                 415 }
386                                                   416 
387 //....oooOO0OOooo........oooOO0OOooo........oo    417 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
388                                                   418 
389 void HistoManager::AddTargetStep(const G4Step*    419 void HistoManager::AddTargetStep(const G4Step* step)
390 {                                                 420 {
391   ++fNstep;                                    << 421   fNstep++;
392   const G4double fEdep = step->GetTotalEnergyD << 422   G4double fEdep = step->GetTotalEnergyDeposit();
393   const G4Track* track = step->GetTrack();     << 423   if(1 < fVerbose) {
394   const G4ParticleDefinition* pd = track->GetD << 424     G4cout << "TargetSD::ProcessHits: beta1= " 
395   if (1 < fVerbose) {                          << 425            << step->GetPreStepPoint()->GetVelocity()/c_light
396     G4cout << "TargetSD::ProcessHits: " << pd- << 426            << "  beta2= " << step->GetPostStepPoint()->GetVelocity()/c_light
397            << " E(MeV)=" << track->GetKineticE << 427            << " weight= " << step->GetTrack()->GetWeight() 
398            << " beta1= " << step->GetPreStepPo << 428            << G4endl;
399            << " beta2= " << step->GetPostStepP << 429   }
400            << " weight= " << step->GetTrack()- << 430   if(fEdep >= DBL_MIN) { 
401            << " t(ns)=" << track->GetGlobalTim << 431     const G4Track* track = step->GetTrack();
402   }                                            << 432 
403   if (fEdep > 0.0) {                           << 433     G4ThreeVector pos = 
404     G4ThreeVector pos =                        << 434       (step->GetPreStepPoint()->GetPosition() +
405       (step->GetPreStepPoint()->GetPosition()  << 435        step->GetPostStepPoint()->GetPosition())*0.5;
406                                                   436 
407     G4double z = pos.z() + fAbsZ0;             << 437     G4double z = pos.z() - fAbsZ0;
408                                                   438 
409     // scoring                                    439     // scoring
410     fEdepEvt += fEdep;                            440     fEdepEvt += fEdep;
411     fHisto->Fill(0, z, fEdep);                 << 441     fHisto->Fill(0,z,fEdep);
                                                   >> 442     const G4ParticleDefinition* pd = track->GetDefinition();
412                                                   443 
413     if (pd == G4Gamma::Gamma() || pd == G4Elec << 444     if(pd == G4Gamma::Gamma() || pd == G4Electron::Electron() 
                                                   >> 445        || pd == G4Positron::Positron()) {
414       fEdepEM += fEdep;                           446       fEdepEM += fEdep;
415     }                                          << 447     } else if ( pd == G4PionPlus::PionPlus() || 
416     else if (pd == G4PionPlus::PionPlus() || p << 448                 pd == G4PionMinus::PionMinus()) {
417       fEdepPI += fEdep;                           449       fEdepPI += fEdep;
418     }                                          << 450     } else if ( pd == G4Proton::Proton() || 
419     else if (pd == G4Proton::Proton() || pd == << 451                 pd == G4AntiProton::AntiProton()) {
420       fEdepP += fEdep;                         << 452       fEdepP  += fEdep;
421     }                                             453     }
422                                                   454 
423     if (1 < fVerbose) {                        << 455     if(1 < fVerbose) {
424       G4cout << "HistoManager::AddEnergy: e(ke << 456       G4cout << "HistoManager::AddEnergy: e(keV)= " << fEdep/keV
425              << "; step(mm)= " << step->GetSte << 457              << "; z(mm)= " << z/mm
426              << " E(MeV)= " << track->GetKinet << 458              << "; step(mm)= " << step->GetStepLength()/mm
                                                   >> 459              << " by " << pd->GetParticleName()
                                                   >> 460              << " E(MeV)= " << track->GetKineticEnergy()/MeV
                                                   >> 461              << G4endl;
427     }                                             462     }
428   }                                               463   }
429 }                                                 464 }
430                                                   465 
431 //....oooOO0OOooo........oooOO0OOooo........oo    466 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
432                                                   467 
433 void HistoManager::AddLeakingParticle(const G4    468 void HistoManager::AddLeakingParticle(const G4Track* track)
434 {                                                 469 {
435   const G4ParticleDefinition* pd = track->GetD    470   const G4ParticleDefinition* pd = track->GetDefinition();
436   const G4StepPoint* sp = track->GetStep()->Ge << 471   const G4StepPoint* sp = track->GetStep()->GetPreStepPoint(); 
437   const G4double ekin = sp->GetKineticEnergy() << 472   G4double e = std::log10(sp->GetKineticEnergy()/MeV);
438   G4double e = -100.;                          << 
439   if (ekin > 0.0) {                            << 
440     e = std::log10(ekin / CLHEP::MeV);         << 
441   }                                            << 
442   else {                                       << 
443     G4cout << "### HistoManager::AddLeakingPar << 
444            << "  Eprestep(MeV)=" << ekin << "  << 
445     return;                                    << 
446   }                                            << 
447                                                   473 
448   const G4ThreeVector& pos = sp->GetPosition() << 474   G4ThreeVector pos = sp->GetPosition();
449   const G4ThreeVector& dir = sp->GetMomentumDi << 475   G4ThreeVector dir = sp->GetMomentumDirection();
450   G4double x = pos.x();                           476   G4double x = pos.x();
451   G4double y = pos.y();                           477   G4double y = pos.y();
452   G4double z = pos.z();                           478   G4double z = pos.z();
453   G4double vx = dir.x();                       << 479  
454   G4double vy = dir.y();                       << 
455   G4double vz = dir.z();                       << 
456                                                << 
457   G4bool isLeaking = false;                       480   G4bool isLeaking = false;
458                                                   481 
459   // Forward                                   << 482   // Forward 
460   const G4double del = 0.001 * CLHEP::mm;      << 483   if(z > -fAbsZ0 && dir.z() > 0.0) {
461   if (std::abs(z - fAbsZ0) < del && vz > 0.0)  << 
462     isLeaking = true;                             484     isLeaking = true;
463     if (pd == fNeutron) {                      << 485     if(pd == fNeutron) {
464       ++fNneu_forw;                               486       ++fNneu_forw;
465       fHisto->Fill(15, e, 1.0);                << 487       fHisto->Fill(15,e,1.0);
466     }                                          << 488     } else isLeaking = true;
467     else                                       << 
468       isLeaking = true;                        << 
469                                                   489 
470     // Backward                                   490     // Backward
471   }                                            << 491   } else if (z < fAbsZ0 && dir.z() < 0.0) {
472   else if (std::abs(z + fAbsZ0) < del && vz <  << 
473     isLeaking = true;                             492     isLeaking = true;
474     if (pd == fNeutron) {                      << 493     if(pd == fNeutron) {
475       ++fNneu_back;                               494       ++fNneu_back;
476       fHisto->Fill(16, e, 1.0);                << 495       fHisto->Fill(16,e,1.0);
477     }                                          << 496     } else isLeaking = true;
478     else                                       << 
479       isLeaking = true;                        << 
480                                                   497 
481     // Side                                       498     // Side
482   }                                            << 499   } else if (std::abs(z) <= -fAbsZ0 && x*dir.x() + y*dir.y() > 0.0) {
483   else if (std::abs(z) <= fAbsZ0 + del && x *  << 
484            && std::abs(x * x + y * y - fR2) <  << 
485   {                                            << 
486     isLeaking = true;                             500     isLeaking = true;
487     if (pd == fNeutron) {                      << 501     if(pd == fNeutron) {
488       ++fNneu_leak;                               502       ++fNneu_leak;
489       fHisto->Fill(14, e, 1.0);                << 503       fHisto->Fill(14,e,1.0);
490     }                                          << 504     } else isLeaking = true;
491     else                                       << 
492       isLeaking = true;                        << 
493   }                                               505   }
494                                                   506 
495   // protons and pions                            507   // protons and pions
496   if (isLeaking) {                             << 508   if(isLeaking) {
497     if (pd == G4Proton::Proton()) {            << 509     if(pd == G4Proton::Proton()) {
498       fHisto->Fill(17, e, 1.0);                << 510       fHisto->Fill(17,e,1.0);
499       ++fNprot_leak;                              511       ++fNprot_leak;
500     }                                          << 512     } else if (pd == G4PionPlus::PionPlus() || 
501     else if (pd == G4PionPlus::PionPlus() || p << 513                pd == G4PionMinus::PionMinus()) {
502       fHisto->Fill(18, e, 1.0);                << 514       fHisto->Fill(18,e,1.0);
503       ++fNpiofNleak;                              515       ++fNpiofNleak;
504     }                                             516     }
505   }                                               517   }
506 }                                                 518 }
507                                                   519 
508 //....oooOO0OOooo........oooOO0OOooo........oo    520 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
509                                                   521 
510 void HistoManager::SetVerbose(G4int val)       << 522 void HistoManager::SetVerbose(G4int val)        
511 {                                                 523 {
512   fVerbose = val;                              << 524   fVerbose = val; 
513   fHisto->SetVerbose(val);                        525   fHisto->SetVerbose(val);
514 }                                                 526 }
515                                                   527 
516 //....oooOO0OOooo........oooOO0OOooo........oo    528 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
517                                                   529 
518 void HistoManager::Fill(G4int id, G4double x,     530 void HistoManager::Fill(G4int id, G4double x, G4double w)
519 {                                                 531 {
520   fHisto->Fill(id, x, w);                         532   fHisto->Fill(id, x, w);
521 }                                                 533 }
522                                                   534 
523 //....oooOO0OOooo........oooOO0OOooo........oo    535 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
                                                   >> 536 
524                                                   537