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 // $Id$ 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() : fManager(0), fMessenger(0) << 51 Histo::Histo() 53 { 52 { >> 53 fManager = 0; 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] = fManager->CreateH1(ss, fTitles[i], fBins[i], fXmin[i], fXmax[i]); 103 if (fVerbose > 0) { << 102 if(fVerbose > 0) { 104 G4cout << "Created histogram #" << i < << 103 G4cout << "Created histogram #" << i << " id= " << fHisto[i] 105 << fTitles[i] << G4endl; << 104 << " " << ss << " " << fTitles[i] << G4endl; 106 } 105 } 107 } 106 } 108 } 107 } 109 // Creating a tuple factory, whose tuples wi 108 // Creating a tuple factory, whose tuples will be handled by the tree 110 if (fNtupleActive) { << 109 if(fNtupleActive) { 111 fManager->CreateNtuple(fTupleName, fTupleT << 110 fManager->CreateNtuple(fTupleName,fTupleTitle); 112 G4int i; 111 G4int i; 113 G4int n = fNtupleI.size(); 112 G4int n = fNtupleI.size(); 114 for (i = 0; i < n; ++i) { << 113 for(i=0; i<n; ++i) { 115 if (fTupleI[i] == -1) { << 114 if(fTupleI[i] == -1) { fTupleI[i] = fManager->CreateNtupleIColumn(fNtupleI[i]); } 116 fTupleI[i] = fManager->CreateNtupleICo << 117 } << 118 } 115 } 119 n = fNtupleF.size(); 116 n = fNtupleF.size(); 120 for (i = 0; i < n; ++i) { << 117 for(i=0; i<n; ++i) { 121 if (fTupleF[i] == -1) { << 118 if(fTupleF[i] == -1) { fTupleF[i] = fManager->CreateNtupleFColumn(fNtupleF[i]); } 122 fTupleF[i] = fManager->CreateNtupleFCo << 123 } << 124 } 119 } 125 n = fNtupleD.size(); 120 n = fNtupleD.size(); 126 for (i = 0; i < n; ++i) { << 121 for(i=0; i<n; ++i) { 127 if (fTupleD[i] == -1) { << 122 if(fTupleD[i] == -1) { fTupleD[i] = fManager->CreateNtupleDColumn(fNtupleD[i]); } 128 fTupleD[i] = fManager->CreateNtupleDCo << 129 } << 130 } 123 } 131 } 124 } 132 } << 125 } 133 126 134 //....oooOO0OOooo........oooOO0OOooo........oo << 127 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... 135 128 136 void Histo::Save() 129 void Histo::Save() 137 { 130 { 138 if (!(fHistoActive || fNtupleActive)) { << 131 if(!(fHistoActive || fNtupleActive)) { return; } 139 return; << 140 } << 141 132 142 // Creating a tree mapped to a new hbook fil 133 // Creating a tree mapped to a new hbook file. 143 G4String nam = fHistName + "." + fHistType; 134 G4String nam = fHistName + "." + fHistType; 144 135 145 // Write histogram file 136 // Write histogram file 146 if (!fManager->Write()) { << 137 if(!fManager->Write()) { 147 G4Exception("Histo::Save()", "hist01", Fat << 138 G4cout << "Histo::Save: FATAL ERROR writing ROOT file" << G4endl; >> 139 exit(1); 148 } 140 } 149 if (fVerbose > 0) { << 141 if(fVerbose > 0) { 150 G4cout << "### Histo::Save: Histograms and 142 G4cout << "### Histo::Save: Histograms and Ntuples are saved" << G4endl; 151 } 143 } 152 if (fManager->CloseFile() && fVerbose > 0) { << 144 if(fManager->CloseFile() && fVerbose > 0) { 153 G4cout << " File is closed 145 G4cout << " File is closed" << G4endl; 154 } 146 } 155 fManager->Clear(); << 147 delete G4RootAnalysisManager::Instance(); 156 } << 148 fManager = 0; 157 << 149 } 158 //....oooOO0OOooo........oooOO0OOooo........oo << 150 159 << 151 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... 160 void Histo::Add1D(const G4String& id, const G4 << 152 161 G4double u) << 153 void Histo::Add1D(const G4String& id, const G4String& name, G4int nb, 162 { << 154 G4double x1, G4double x2, G4double u) 163 if (fVerbose > 0) { << 155 { 164 G4cout << "Histo::Add1D: New histogram wil << 156 if(fVerbose > 0) { 165 << " " << x1 << " " << x2 << " " << 157 G4cout << "Histo::Add1D: New histogram will be booked: #" << id << " <" << name >> 158 << " " << nb << " " << x1 << " " << x2 << " " << u >> 159 << G4endl; 166 } 160 } 167 ++fNHisto; 161 ++fNHisto; 168 x1 /= u; 162 x1 /= u; 169 x2 /= u; 163 x2 /= u; 170 fActive.push_back(fDefaultAct); 164 fActive.push_back(fDefaultAct); 171 fBins.push_back(nb); 165 fBins.push_back(nb); 172 fXmin.push_back(x1); 166 fXmin.push_back(x1); 173 fXmax.push_back(x2); 167 fXmax.push_back(x2); 174 fUnit.push_back(u); 168 fUnit.push_back(u); 175 fIds.push_back(id); 169 fIds.push_back(id); 176 fTitles.push_back(name); 170 fTitles.push_back(name); 177 fHisto.push_back(-1); 171 fHisto.push_back(-1); 178 } 172 } 179 173 180 //....oooOO0OOooo........oooOO0OOooo........oo << 174 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... 181 175 182 void Histo::SetHisto1D(G4int i, G4int nb, G4do 176 void Histo::SetHisto1D(G4int i, G4int nb, G4double x1, G4double x2, G4double u) 183 { 177 { 184 if (i >= 0 && i < fNHisto) { << 178 if(i>=0 && i<fNHisto) { 185 if (fVerbose > 0) { << 179 if(fVerbose > 0) { 186 G4cout << "Histo::SetHisto1D: #" << i << << 180 G4cout << "Histo::SetHisto1D: #" << i >> 181 << " " << nb << " " << x1 << " " << x2 << " " << u 187 << G4endl; 182 << G4endl; 188 } 183 } 189 fBins[i] = nb; 184 fBins[i] = nb; 190 fXmin[i] = x1; 185 fXmin[i] = x1; 191 fXmax[i] = x2; 186 fXmax[i] = x2; 192 fUnit[i] = u; 187 fUnit[i] = u; 193 fActive[i] = true; 188 fActive[i] = true; 194 fHistoActive = true; 189 fHistoActive = true; 195 } << 190 } else { 196 else { << 197 G4cout << "Histo::SetHisto1D: WARNING! wro 191 G4cout << "Histo::SetHisto1D: WARNING! wrong histogram index " << i << G4endl; 198 } 192 } 199 } 193 } 200 194 201 //....oooOO0OOooo........oooOO0OOooo........oo << 195 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... 202 196 203 void Histo::Activate(G4int i, G4bool val) 197 void Histo::Activate(G4int i, G4bool val) 204 { 198 { 205 if (fVerbose > 1) { << 199 if(fVerbose > 1) { 206 G4cout << "Histo::Activate: Histogram: #" << 200 G4cout << "Histo::Activate: Histogram: #" << i << " " >> 201 << val << G4endl; 207 } 202 } 208 if (i >= 0 && i < fNHisto) { << 203 if(i>=0 && i<fNHisto) { 209 fActive[i] = val; << 204 fActive[i] = val; 210 if (val) { << 205 if(val) { fHistoActive = true; } 211 fHistoActive = true; << 212 } << 213 } 206 } 214 } 207 } 215 208 216 //....oooOO0OOooo........oooOO0OOooo........oo << 209 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... 217 210 218 void Histo::Fill(G4int i, G4double x, G4double 211 void Histo::Fill(G4int i, G4double x, G4double w) 219 { 212 { 220 if (!fHistoActive) { << 213 if(!fHistoActive) { return; } 221 return; << 214 if(fVerbose > 1) { 222 } << 215 G4cout << "Histo::Fill: Histogram: #" << i << " at x= " << x 223 if (fVerbose > 1) { << 216 << " weight= " << w 224 G4cout << "Histo::Fill: Histogram: #" << i << 217 << G4endl; 225 } << 218 } 226 if (i >= 0 && i < fNHisto) { << 219 if(i>=0 && i<fNHisto) { 227 if (fActive[i]) { << 220 if(fActive[i]) { fManager->FillH1(fHisto[i], x/fUnit[i], w); } 228 fManager->FillH1(fHisto[i], x / fUnit[i] << 221 } else { 229 } << 230 } << 231 else { << 232 G4cout << "Histo::Fill: WARNING! wrong his 222 G4cout << "Histo::Fill: WARNING! wrong histogram index " << i << G4endl; 233 } 223 } 234 } 224 } 235 225 236 //....oooOO0OOooo........oooOO0OOooo........oo << 226 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... 237 227 238 void Histo::ScaleH1(G4int i, G4double x) 228 void Histo::ScaleH1(G4int i, G4double x) 239 { 229 { 240 if (!fHistoActive) { << 230 if(!fHistoActive) { return; } 241 return; << 231 if(fVerbose > 0) { 242 } << 232 G4cout << "Histo::Scale: Histogram: #" << i << " by factor " << x << G4endl; 243 if (fVerbose > 0) { << 233 } 244 G4cout << "Histo::Scale: Histogram: #" << << 234 if(i>=0 && i<fNHisto) { 245 } << 235 if(fActive[i]) { fManager->GetH1(fHisto[i])->scale(x); } 246 if (i >= 0 && i < fNHisto) { << 236 } else { 247 if (fActive[i]) { << 248 fManager->GetH1(fHisto[i])->scale(x); << 249 } << 250 } << 251 else { << 252 G4cout << "Histo::Scale: WARNING! wrong hi 237 G4cout << "Histo::Scale: WARNING! wrong histogram index " << i << G4endl; 253 } 238 } 254 } 239 } 255 240 256 //....oooOO0OOooo........oooOO0OOooo........oo << 241 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... 257 242 258 void Histo::AddTuple(const G4String& w1) 243 void Histo::AddTuple(const G4String& w1) 259 { 244 { 260 fTupleTitle = w1; 245 fTupleTitle = w1; 261 } 246 } 262 247 263 //....oooOO0OOooo........oooOO0OOooo........oo << 248 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... 264 249 265 void Histo::AddTupleI(const G4String& w1) 250 void Histo::AddTupleI(const G4String& w1) 266 { 251 { 267 fNtupleActive = true; 252 fNtupleActive = true; 268 fNtupleI.push_back(w1); 253 fNtupleI.push_back(w1); 269 fTupleI.push_back(-1); 254 fTupleI.push_back(-1); 270 } 255 } 271 256 272 //....oooOO0OOooo........oooOO0OOooo........oo << 257 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... 273 258 274 void Histo::AddTupleF(const G4String& w1) 259 void Histo::AddTupleF(const G4String& w1) 275 { 260 { 276 fNtupleActive = true; 261 fNtupleActive = true; 277 fNtupleF.push_back(w1); 262 fNtupleF.push_back(w1); 278 fTupleF.push_back(-1); 263 fTupleF.push_back(-1); 279 } 264 } 280 265 281 //....oooOO0OOooo........oooOO0OOooo........oo << 266 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... 282 267 283 void Histo::AddTupleD(const G4String& w1) 268 void Histo::AddTupleD(const G4String& w1) 284 { 269 { 285 fNtupleActive = true; 270 fNtupleActive = true; 286 fNtupleD.push_back(w1); 271 fNtupleD.push_back(w1); 287 fTupleD.push_back(-1); 272 fTupleD.push_back(-1); 288 } 273 } 289 274 290 //....oooOO0OOooo........oooOO0OOooo........oo << 275 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... 291 276 292 void Histo::FillTupleI(G4int i, G4int x) 277 void Histo::FillTupleI(G4int i, G4int x) 293 { 278 { 294 if (!fNtupleActive) { << 279 if(!fNtupleActive) { return; } 295 return; << 296 } << 297 G4int n = fNtupleI.size(); 280 G4int n = fNtupleI.size(); 298 if (i >= 0 && i < n) { << 281 if(i >= 0 && i < n) { 299 if (fVerbose > 1) { << 282 if(fVerbose > 1) { 300 G4cout << "Histo::FillTupleI: i= " << i << 283 G4cout << "Histo::FillTupleI: i= " << i << " id= " << fTupleI[i] 301 << "> = " << x << G4endl; << 284 << " <" << fNtupleI[i] << "> = " << x << G4endl; 302 } 285 } 303 fManager->FillNtupleIColumn(fTupleI[i], x) << 286 fManager->FillNtupleIColumn(fTupleI[i], x); 304 } << 287 } else { 305 else { << 306 G4cout << "Histo::FillTupleI: WARNING! wro 288 G4cout << "Histo::FillTupleI: WARNING! wrong ntuple index " << i << G4endl; 307 } 289 } 308 } 290 } 309 291 310 //....oooOO0OOooo........oooOO0OOooo........oo << 292 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... 311 293 312 void Histo::FillTupleF(G4int i, G4float x) 294 void Histo::FillTupleF(G4int i, G4float x) 313 { 295 { 314 if (!fNtupleActive) { << 296 if(!fNtupleActive) { return; } 315 return; << 316 } << 317 G4int n = fNtupleF.size(); 297 G4int n = fNtupleF.size(); 318 if (i >= 0 && i < n) { << 298 if(i >= 0 && i < n) { 319 if (fVerbose > 1) { << 299 if(fVerbose > 1) { 320 G4cout << "Histo::FillTupleF: i= " << i << 300 G4cout << "Histo::FillTupleF: i= " << i << " id= " << fTupleF[i] 321 << "> = " << x << G4endl; << 301 << " <" << fNtupleF[i] << "> = " << x << G4endl; 322 } 302 } 323 fManager->FillNtupleFColumn(fTupleF[i], x) << 303 fManager->FillNtupleFColumn(fTupleF[i], x); 324 } << 304 } else { 325 else { << 326 G4cout << "Histo::FillTupleF: WARNING! wro 305 G4cout << "Histo::FillTupleF: WARNING! wrong ntuple index " << i << G4endl; 327 } 306 } 328 } 307 } 329 308 330 //....oooOO0OOooo........oooOO0OOooo........oo << 309 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... 331 310 332 void Histo::FillTupleD(G4int i, G4double x) 311 void Histo::FillTupleD(G4int i, G4double x) 333 { 312 { 334 if (!fNtupleActive) { << 313 if(!fNtupleActive) { return; } 335 return; << 336 } << 337 G4int n = fNtupleD.size(); 314 G4int n = fNtupleD.size(); 338 if (i >= 0 && i < n) { << 315 if(i >= 0 && i < n) { 339 if (fVerbose > 1) { << 316 if(fVerbose > 1) { 340 G4cout << "Histo::FillTupleD: i= " << i << 317 G4cout << "Histo::FillTupleD: i= " << i << " id= " << fTupleD[i] 341 << "> = " << x << G4endl; << 318 << " <" << fNtupleD[i] << "> = " << x << G4endl; 342 } 319 } 343 fManager->FillNtupleDColumn(fTupleD[i], x) << 320 fManager->FillNtupleDColumn(fTupleD[i], x); 344 } << 321 } else { 345 else { << 346 G4cout << "Histo::FillTupleD: WARNING! wro 322 G4cout << "Histo::FillTupleD: WARNING! wrong ntuple index " << i << G4endl; 347 } 323 } 348 } 324 } 349 325 350 //....oooOO0OOooo........oooOO0OOooo........oo << 326 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... 351 327 352 void Histo::AddRow() 328 void Histo::AddRow() 353 { 329 { 354 if (!fNtupleActive) { << 330 if(!fNtupleActive) { return; } 355 return; << 356 } << 357 fManager->AddNtupleRow(); 331 fManager->AddNtupleRow(); 358 } << 332 } 359 333 360 //....oooOO0OOooo........oooOO0OOooo........oo << 334 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... 361 335 362 void Histo::SetFileName(const G4String& nam) << 336 void Histo::SetFileName(const G4String& nam) 363 { 337 { 364 fHistName = nam; 338 fHistName = nam; 365 fHistoActive = true; 339 fHistoActive = true; 366 } 340 } 367 341 368 //....oooOO0OOooo........oooOO0OOooo........oo << 342 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... 369 343 370 void Histo::SetFileType(const G4String& nam) << 344 void Histo::SetFileType(const G4String& nam) 371 { 345 { 372 // format other than ROOT is not tested << 346 if(nam == "root" || nam == "ROOT" ) { fHistType = "root"; } 373 if (nam == "root" || nam == "ROOT") { << 347 else if(nam == "xml" || nam == "XML") { fHistType = "xml"; } 374 fHistType = "root"; << 348 else if(nam == "ascii" || nam == "ASCII" || 375 } << 349 nam == "Csv" || nam == "csv" || nam == "CSV") { fHistType = "ascii"; } 376 else if (nam == "xml" || nam == "XML") { << 377 fHistType = "xml"; << 378 } << 379 else if (nam == "ascii" || nam == "ASCII" || << 380 fHistType = "ascii"; << 381 } << 382 } 350 } 383 351 384 //....oooOO0OOooo........oooOO0OOooo........oo << 352 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... >> 353 385 354