Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/extended/hadronic/Hadr01/src/Histo.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/Histo.cc (Version 11.3.0) and /examples/extended/hadronic/Hadr01/src/Histo.cc (Version 10.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 /// \file hadronic/Hadr01/src/Histo.cc             26 /// \file hadronic/Hadr01/src/Histo.cc
 27 /// \brief Implementation of the Histo class       27 /// \brief Implementation of the Histo class
 28 //                                                 28 //
                                                   >>  29 // $Id: Histo.cc 107541 2017-11-22 08:24:57Z gcosmo $
 29 //                                                 30 //
 30 //--------------------------------------------     31 //---------------------------------------------------------------------------
 31 //                                                 32 //
 32 // ClassName:   Histo - Generic histogram/ntup     33 // ClassName:   Histo - Generic histogram/ntuple manager class
 33 //                                                 34 //
 34 //                                                 35 //
 35 // Author:      V.Ivanchenko 30.10.03              36 // Author:      V.Ivanchenko 30.10.03
 36 //                                                 37 //
 37 //--------------------------------------------     38 //----------------------------------------------------------------------------
 38 //                                                 39 //
 39                                                    40 
 40 //....oooOO0OOooo........oooOO0OOooo........oo     41 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 41 //....oooOO0OOooo........oooOO0OOooo........oo     42 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 42                                                    43 
 43 #include "Histo.hh"                                44 #include "Histo.hh"
 44                                                << 
 45 #include "HistoMessenger.hh"                       45 #include "HistoMessenger.hh"
 46                                                << 
 47 #include "G4RootAnalysisManager.hh"                46 #include "G4RootAnalysisManager.hh"
 48                                                    47 
 49 //....oooOO0OOooo........oooOO0OOooo........oo     48 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 50 //....oooOO0OOooo........oooOO0OOooo........oo     49 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 51                                                    50 
 52 Histo::Histo()                                     51 Histo::Histo()
 53   : fManager(nullptr),                         <<  52 : fManager(nullptr),
 54     fHistName("test"),                         <<  53   fHistName("test"),
 55     fTupleName("tuple"),                       <<  54   fTupleName("tuple"),
 56     fTupleTitle("test"),                       <<  55   fTupleTitle("test"),
 57     fNHisto(0),                                <<  56   fNHisto(0),
 58     fVerbose(0),                               <<  57   fVerbose(0),
 59     fDefaultAct(true),                         <<  58   fDefaultAct(true),
 60     fHistoActive(false),                       <<  59   fHistoActive(false),
 61     fNtupleActive(false)                       <<  60   fNtupleActive(false)
 62 {                                                  61 {
 63   fMessenger = new HistoMessenger(this);           62   fMessenger = new HistoMessenger(this);
 64 }                                                  63 }
 65                                                    64 
 66 //....oooOO0OOooo........oooOO0OOooo........oo     65 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 67                                                    66 
 68 Histo::~Histo()                                    67 Histo::~Histo()
 69 {                                                  68 {
 70   delete fMessenger;                               69   delete fMessenger;
                                                   >>  70   delete fManager;
 71 }                                                  71 }
 72                                                    72 
 73 //....oooOO0OOooo........oooOO0OOooo........oo     73 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 74                                                    74 
 75 void Histo::Book()                                 75 void Histo::Book()
 76 {                                                  76 {
 77   if (!(fHistoActive || fNtupleActive)) {      <<  77   if(!(fHistoActive || fNtupleActive)) { return; }
 78     return;                                    << 
 79   }                                            << 
 80                                                    78 
 81   // Always creating analysis manager              79   // Always creating analysis manager
 82   fManager = G4RootAnalysisManager::Instance() <<  80   fManager = G4RootAnalysisManager::Instance(); 
 83                                                    81 
 84   // Creating a tree mapped to a new hbook fil     82   // Creating a tree mapped to a new hbook file.
 85   G4String nam = fHistName + ".root";              83   G4String nam = fHistName + ".root";
 86                                                    84 
 87   // Open file histogram file                      85   // Open file histogram file
 88   if (!fManager->OpenFile(nam)) {              <<  86   if(!fManager->OpenFile(nam)) {
 89     G4cout << "Histo::Book: ERROR open file <"     87     G4cout << "Histo::Book: ERROR open file <" << nam << ">" << G4endl;
 90     fHistoActive = false;                          88     fHistoActive = false;
 91     fNtupleActive = false;                         89     fNtupleActive = false;
 92     return;                                    <<  90     return; 
 93   }                                                91   }
 94   G4cout << "### Histo::Save: Opended file <"  <<  92   G4cout << "### Histo::Save: Opended file <" << nam << ">  for " 
 95          << G4endl;                            <<  93          << fNHisto << " histograms " << G4endl;
 96                                                    94 
 97   // Creating an 1-dimensional histograms in t     95   // Creating an 1-dimensional histograms in the root directory of the tree
 98   for (G4int i = 0; i < fNHisto; ++i) {        <<  96   for(G4int i=0; i<fNHisto; ++i) {
 99     if (fActive[i]) {                          <<  97     if(fActive[i]) {
100       G4String ss = "h" + fIds[i];                 98       G4String ss = "h" + fIds[i];
101       fHisto[i] = fManager->CreateH1(ss, fTitl <<  99       fHisto[i] = 
102       if (fVerbose > 0) {                      << 100         fManager->CreateH1(ss, fTitles[i], fBins[i], fXmin[i], fXmax[i]);
103         G4cout << "Created histogram #" << i < << 101       if(fVerbose > 0) {
104                << fTitles[i] << G4endl;        << 102         G4cout << "Created histogram #" << i << "  id= " << fHisto[i]
                                                   >> 103                << "  "  << ss << "  " << fTitles[i] << G4endl;
105       }                                           104       }
106     }                                             105     }
107   }                                               106   }
108   // Creating a tuple factory, whose tuples wi    107   // Creating a tuple factory, whose tuples will be handled by the tree
109   if (fNtupleActive) {                         << 108   if(fNtupleActive) {
110     fManager->CreateNtuple(fTupleName, fTupleT << 109     fManager->CreateNtuple(fTupleName,fTupleTitle); 
111     G4int i;                                      110     G4int i;
112     G4int n = fNtupleI.size();                    111     G4int n = fNtupleI.size();
113     for (i = 0; i < n; ++i) {                  << 112     for(i=0; i<n; ++i) { 
114       if (fTupleI[i] == -1) {                  << 113       if(fTupleI[i] == -1) {  
115         fTupleI[i] = fManager->CreateNtupleICo << 114         fTupleI[i] = fManager->CreateNtupleIColumn(fNtupleI[i]); 
116       }                                           115       }
117     }                                             116     }
118     n = fNtupleF.size();                          117     n = fNtupleF.size();
119     for (i = 0; i < n; ++i) {                  << 118     for(i=0; i<n; ++i) { 
120       if (fTupleF[i] == -1) {                  << 119       if(fTupleF[i] == -1) {  
121         fTupleF[i] = fManager->CreateNtupleFCo << 120         fTupleF[i] = fManager->CreateNtupleFColumn(fNtupleF[i]); 
122       }                                           121       }
123     }                                             122     }
124     n = fNtupleD.size();                          123     n = fNtupleD.size();
125     for (i = 0; i < n; ++i) {                  << 124     for(i=0; i<n; ++i) { 
126       if (fTupleD[i] == -1) {                  << 125       if(fTupleD[i] == -1) {  
127         fTupleD[i] = fManager->CreateNtupleDCo << 126         fTupleD[i] = fManager->CreateNtupleDColumn(fNtupleD[i]); 
128       }                                           127       }
129     }                                             128     }
130   }                                               129   }
131 }                                              << 130 } 
132                                                   131 
133 //....oooOO0OOooo........oooOO0OOooo........oo    132 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
134                                                   133 
135 void Histo::Save()                                134 void Histo::Save()
136 {                                                 135 {
137   if (!(fHistoActive || fNtupleActive)) {      << 136   if(!(fHistoActive || fNtupleActive)) { return; }
138     return;                                    << 
139   }                                            << 
140                                                   137 
141   // Write histogram file                         138   // Write histogram file
142   if (!fManager->Write()) {                    << 139   if(!fManager->Write()) {
143     G4cout << "Histo::Save: FATAL ERROR writin << 140     G4cout   << "Histo::Save: FATAL ERROR writing ROOT file" << G4endl;
144     exit(1);                                      141     exit(1);
145   }                                               142   }
146   if (fVerbose > 0) {                          << 143   if(fVerbose > 0) {
147     G4cout << "### Histo::Save: Histograms and    144     G4cout << "### Histo::Save: Histograms and Ntuples are saved" << G4endl;
148   }                                               145   }
149   if (fManager->CloseFile() && fVerbose > 0) { << 146   if(fManager->CloseFile() && fVerbose > 0) {
150     G4cout << "Histo::Save: File is closed" << << 147     G4cout << "                 File is closed" << G4endl;
151   }                                               148   }
152   fManager->Clear();                           << 149   delete G4RootAnalysisManager::Instance();
153 }                                              << 150   fManager = 0;
                                                   >> 151 } 
154                                                   152 
155 //....oooOO0OOooo........oooOO0OOooo........oo    153 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
156                                                   154 
157 void Histo::Add1D(const G4String& id, const G4 << 155 void Histo::Add1D(const G4String& id, const G4String& name, G4int nb, 
158                   G4double u)                  << 156                   G4double x1, G4double x2, G4double u)
159 {                                                 157 {
160   if (fVerbose > 0) {                          << 158   if(fVerbose > 0) {
161     G4cout << "Histo::Add1D: New histogram wil << 159     G4cout << "Histo::Add1D: New histogram will be booked: #" 
162            << "  " << x1 << "  " << x2 << "  " << 160            << id << "  <" << name 
                                                   >> 161            << "  " << nb << "  " << x1 << "  " << x2 << "  " << u 
                                                   >> 162            << G4endl;
163   }                                               163   }
164   ++fNHisto;                                      164   ++fNHisto;
165   x1 /= u;                                        165   x1 /= u;
166   x2 /= u;                                        166   x2 /= u;
167   fActive.push_back(fDefaultAct);                 167   fActive.push_back(fDefaultAct);
168   fBins.push_back(nb);                            168   fBins.push_back(nb);
169   fXmin.push_back(x1);                            169   fXmin.push_back(x1);
170   fXmax.push_back(x2);                            170   fXmax.push_back(x2);
171   fUnit.push_back(u);                             171   fUnit.push_back(u);
172   fIds.push_back(id);                             172   fIds.push_back(id);
173   fTitles.push_back(name);                        173   fTitles.push_back(name);
174   fHisto.push_back(-1);                           174   fHisto.push_back(-1);
175 }                                                 175 }
176                                                   176 
177 //....oooOO0OOooo........oooOO0OOooo........oo    177 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
178                                                   178 
179 void Histo::SetHisto1D(G4int i, G4int nb, G4do << 179 void 
                                                   >> 180 Histo::SetHisto1D(G4int i, G4int nb, G4double x1, G4double x2, G4double u)
180 {                                                 181 {
181   if (i >= 0 && i < fNHisto) {                 << 182   if(i>=0 && i<fNHisto) {
182     if (fVerbose > 0) {                        << 183     if(fVerbose > 0) {
183       G4cout << "Histo::SetHisto1D: #" << i << << 184       G4cout << "Histo::SetHisto1D: #" << i  
                                                   >> 185              << "  " << nb << "  " << x1 << "  " << x2 << "  " << u 
184              << G4endl;                           186              << G4endl;
185     }                                             187     }
186     fBins[i] = nb;                                188     fBins[i] = nb;
187     fXmin[i] = x1;                                189     fXmin[i] = x1;
188     fXmax[i] = x2;                                190     fXmax[i] = x2;
189     fUnit[i] = u;                                 191     fUnit[i] = u;
190     fActive[i] = true;                            192     fActive[i] = true;
191     fHistoActive = true;                          193     fHistoActive = true;
192   }                                            << 194   } else {
193   else {                                       << 195     G4cout << "Histo::SetHisto1D: WARNING! wrong histogram index " 
194     G4cout << "Histo::SetHisto1D: WARNING! wro << 196            << i << G4endl;
195   }                                               197   }
196 }                                                 198 }
197                                                   199 
198 //....oooOO0OOooo........oooOO0OOooo........oo    200 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
199                                                   201 
200 void Histo::Activate(G4int i, G4bool val)         202 void Histo::Activate(G4int i, G4bool val)
201 {                                                 203 {
202   if (fVerbose > 1) {                          << 204   if(fVerbose > 1) {
203     G4cout << "Histo::Activate: Histogram: #"  << 205     G4cout << "Histo::Activate: Histogram: #" << i << "   "  
204   }                                            << 206            << val << G4endl;   
205   if (i >= 0 && i < fNHisto) {                 << 207   }
206     fActive[i] = val;                          << 208   if(i>=0 && i<fNHisto) { 
207     if (val) {                                 << 209     fActive[i] = val; 
208       fHistoActive = true;                     << 210     if(val) { fHistoActive = true; }
209     }                                          << 
210   }                                               211   }
211 }                                                 212 }
212                                                   213 
213 //....oooOO0OOooo........oooOO0OOooo........oo    214 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
214                                                   215 
215 void Histo::Fill(G4int i, G4double x, G4double    216 void Histo::Fill(G4int i, G4double x, G4double w)
216 {                                                 217 {
217   if (!fHistoActive) {                         << 218   if(!fHistoActive) { return; }
218     return;                                    << 219   if(fVerbose > 1) {
219   }                                            << 220     G4cout << "Histo::Fill: Histogram: #" << i << " at x= " << x 
220   if (fVerbose > 1) {                          << 221            << "  weight= " << w
221     G4cout << "Histo::Fill: Histogram: #" << i << 222            << G4endl;   
222   }                                            << 223   }
223   if (i >= 0 && i < fNHisto) {                 << 224   if(i>=0 && i<fNHisto) {
224     if (fActive[i]) {                          << 225     if(fActive[i]) { fManager->FillH1(fHisto[i], x/fUnit[i], w); }
225       fManager->FillH1(fHisto[i], x / fUnit[i] << 226   } else {
226     }                                          << 
227   }                                            << 
228   else {                                       << 
229     G4cout << "Histo::Fill: WARNING! wrong his    227     G4cout << "Histo::Fill: WARNING! wrong histogram index " << i << G4endl;
230   }                                               228   }
231 }                                                 229 }
232                                                   230 
233 //....oooOO0OOooo........oooOO0OOooo........oo    231 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
234                                                   232 
235 void Histo::ScaleH1(G4int i, G4double x)          233 void Histo::ScaleH1(G4int i, G4double x)
236 {                                                 234 {
237   if (!fHistoActive) {                         << 235   if(!fHistoActive) { return; }
238     return;                                    << 236   if(fVerbose > 0) {
239   }                                            << 237     G4cout << "Histo::Scale: Histogram: #" << i 
240   if (fVerbose > 0) {                          << 238            << " by factor " << x << G4endl;   
241     G4cout << "Histo::Scale: Histogram: #" <<  << 239   }
242   }                                            << 240   if(i>=0 && i<fNHisto) {
243   if (i >= 0 && i < fNHisto) {                 << 241     if(fActive[i]) { fManager->GetH1(fHisto[i])->scale(x); }
244     if (fActive[i]) {                          << 242   } else {
245       fManager->GetH1(fHisto[i])->scale(x);    << 
246     }                                          << 
247   }                                            << 
248   else {                                       << 
249     G4cout << "Histo::Scale: WARNING! wrong hi    243     G4cout << "Histo::Scale: WARNING! wrong histogram index " << i << G4endl;
250   }                                               244   }
251 }                                                 245 }
252                                                   246 
253 //....oooOO0OOooo........oooOO0OOooo........oo    247 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
254                                                   248 
255 void Histo::AddTuple(const G4String& w1)          249 void Histo::AddTuple(const G4String& w1)
256 {                                                 250 {
257   fTupleTitle = w1;                               251   fTupleTitle = w1;
258 }                                                 252 }
259                                                   253 
260 //....oooOO0OOooo........oooOO0OOooo........oo    254 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
261                                                   255 
262 void Histo::AddTupleI(const G4String& w1)         256 void Histo::AddTupleI(const G4String& w1)
263 {                                                 257 {
264   fNtupleActive = true;                           258   fNtupleActive = true;
265   fNtupleI.push_back(w1);                         259   fNtupleI.push_back(w1);
266   fTupleI.push_back(-1);                          260   fTupleI.push_back(-1);
267 }                                                 261 }
268                                                   262 
269 //....oooOO0OOooo........oooOO0OOooo........oo    263 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
270                                                   264 
271 void Histo::AddTupleF(const G4String& w1)         265 void Histo::AddTupleF(const G4String& w1)
272 {                                                 266 {
273   fNtupleActive = true;                           267   fNtupleActive = true;
274   fNtupleF.push_back(w1);                         268   fNtupleF.push_back(w1);
275   fTupleF.push_back(-1);                          269   fTupleF.push_back(-1);
276 }                                                 270 }
277                                                   271 
278 //....oooOO0OOooo........oooOO0OOooo........oo    272 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
279                                                   273 
280 void Histo::AddTupleD(const G4String& w1)         274 void Histo::AddTupleD(const G4String& w1)
281 {                                                 275 {
282   fNtupleActive = true;                           276   fNtupleActive = true;
283   fNtupleD.push_back(w1);                         277   fNtupleD.push_back(w1);
284   fTupleD.push_back(-1);                          278   fTupleD.push_back(-1);
285 }                                                 279 }
286                                                   280 
287 //....oooOO0OOooo........oooOO0OOooo........oo    281 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
288                                                   282 
289 void Histo::FillTupleI(G4int i, G4int x)          283 void Histo::FillTupleI(G4int i, G4int x)
290 {                                                 284 {
291   if (!fNtupleActive) {                        << 285   if(!fNtupleActive) { return; }
292     return;                                    << 
293   }                                            << 
294   G4int n = fNtupleI.size();                      286   G4int n = fNtupleI.size();
295   if (i >= 0 && i < n) {                       << 287   if(i >= 0 && i < n) {
296     if (fVerbose > 1) {                        << 288     if(fVerbose > 1) {
297       G4cout << "Histo::FillTupleI: i= " << i  << 289       G4cout << "Histo::FillTupleI: i= " << i << "  id= " << fTupleI[i]
298              << "> = " << x << G4endl;         << 290              << "   <" << fNtupleI[i] << "> = " << x << G4endl; 
299     }                                          << 291     }
300     fManager->FillNtupleIColumn(fTupleI[i], x) << 292     fManager->FillNtupleIColumn(fTupleI[i], x); 
301   }                                            << 293   } else {
302   else {                                       << 294     G4cout << "Histo::FillTupleI: WARNING! wrong ntuple index " 
303     G4cout << "Histo::FillTupleI: WARNING! wro << 295            << i << G4endl;
304   }                                               296   }
305 }                                                 297 }
306                                                   298 
307 //....oooOO0OOooo........oooOO0OOooo........oo    299 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
308                                                   300 
309 void Histo::FillTupleF(G4int i, G4float x)        301 void Histo::FillTupleF(G4int i, G4float x)
310 {                                                 302 {
311   if (!fNtupleActive) {                        << 303   if(!fNtupleActive) { return; }
312     return;                                    << 
313   }                                            << 
314   G4int n = fNtupleF.size();                      304   G4int n = fNtupleF.size();
315   if (i >= 0 && i < n) {                       << 305   if(i >= 0 && i < n) {
316     if (fVerbose > 1) {                        << 306     if(fVerbose > 1) {
317       G4cout << "Histo::FillTupleF: i= " << i  << 307       G4cout << "Histo::FillTupleF: i= " << i << "  id= " << fTupleF[i]
318              << "> = " << x << G4endl;         << 308              << "   <" << fNtupleF[i] << "> = " << x << G4endl; 
319     }                                          << 309     }
320     fManager->FillNtupleFColumn(fTupleF[i], x) << 310     fManager->FillNtupleFColumn(fTupleF[i], x); 
321   }                                            << 311   } else {
322   else {                                       << 312     G4cout << "Histo::FillTupleF: WARNING! wrong ntuple index " 
323     G4cout << "Histo::FillTupleF: WARNING! wro << 313            << i << G4endl;
324   }                                               314   }
325 }                                                 315 }
326                                                   316 
327 //....oooOO0OOooo........oooOO0OOooo........oo    317 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
328                                                   318 
329 void Histo::FillTupleD(G4int i, G4double x)       319 void Histo::FillTupleD(G4int i, G4double x)
330 {                                                 320 {
331   if (!fNtupleActive) {                        << 321   if(!fNtupleActive) { return; }
332     return;                                    << 
333   }                                            << 
334   G4int n = fNtupleD.size();                      322   G4int n = fNtupleD.size();
335   if (i >= 0 && i < n) {                       << 323   if(i >= 0 && i < n) {
336     if (fVerbose > 1) {                        << 324     if(fVerbose > 1) {
337       G4cout << "Histo::FillTupleD: i= " << i  << 325       G4cout << "Histo::FillTupleD: i= " << i << "  id= " << fTupleD[i]
338              << "> = " << x << G4endl;         << 326              << "   <" << fNtupleD[i] << "> = " << x << G4endl; 
339     }                                          << 327     }
340     fManager->FillNtupleDColumn(fTupleD[i], x) << 328     fManager->FillNtupleDColumn(fTupleD[i], x); 
341   }                                            << 329   } else {
342   else {                                       << 330     G4cout << "Histo::FillTupleD: WARNING! wrong ntuple index " 
343     G4cout << "Histo::FillTupleD: WARNING! wro << 331            << i << G4endl;
344   }                                               332   }
345 }                                                 333 }
346                                                   334 
347 //....oooOO0OOooo........oooOO0OOooo........oo    335 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
348                                                   336 
349 void Histo::AddRow()                              337 void Histo::AddRow()
350 {                                                 338 {
351   if (!fNtupleActive) {                        << 339   if(!fNtupleActive) { return; }
352     return;                                    << 
353   }                                            << 
354   fManager->AddNtupleRow();                       340   fManager->AddNtupleRow();
355 }                                              << 341 } 
356                                                   342 
357 //....oooOO0OOooo........oooOO0OOooo........oo    343 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
358                                                   344 
359 void Histo::SetFileName(const G4String& nam)   << 345 void Histo::SetFileName(const G4String& nam) 
360 {                                                 346 {
361   fHistName = nam;                                347   fHistName = nam;
362   fHistoActive = true;                            348   fHistoActive = true;
363 }                                                 349 }
364                                                   350 
365 //....oooOO0OOooo........oooOO0OOooo........oo    351 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
                                                   >> 352 
366                                                   353