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