| 134c5a9 | Rene Brun | 08 July 2004, 17:42:47 UTC | From Philippe: solve more problems with templated operator>>, operator<<, operator> and operator>. git-svn-id: http://root.cern.ch/svn/root/trunk@9452 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 17:42:47 UTC |
| 597ea93 | Rene Brun | 08 July 2004, 17:42:04 UTC | From Philippe: TMath: Add a 3rd argument to the SortImp template to allow the size of the array to be a different type from the index. Also finally fix the compilation and linking on MSVC++ 6.0 git-svn-id: http://root.cern.ch/svn/root/trunk@9451 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 17:42:04 UTC |
| 4d022f8 | Rene Brun | 08 July 2004, 17:18:08 UTC | When the crosshair is activated in a subpad, it is automatically activated also for the canvas pad and all its subpads git-svn-id: http://root.cern.ch/svn/root/trunk@9450 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 17:18:08 UTC |
| 04a536b | Fons Rademakers | 08 July 2004, 17:11:28 UTC | From Maarten: - fix slave per filenode limit bug - fix slave per filenode get entries bug git-svn-id: http://root.cern.ch/svn/root/trunk@9449 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 17:11:28 UTC |
| 84dd7f3 | Fons Rademakers | 08 July 2004, 17:01:30 UTC | From Valeriy: emits the Dock and Undock signals at the right places. git-svn-id: http://root.cern.ch/svn/root/trunk@9448 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 17:01:30 UTC |
| e655a69 | Rene Brun | 08 July 2004, 16:18:05 UTC | New cursor shapes (X11 like) from Bertrand When installing this fix, before recompiling remove the following file: rm $ROOTSYS/win32gdk/gdk/src/gdk/win32/gdk.res git-svn-id: http://root.cern.ch/svn/root/trunk@9447 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 16:18:05 UTC |
| 9f64708 | Rene Brun | 08 July 2004, 14:45:46 UTC | from Anna Kreshuk: The function Chi2Test is implemented for 2-d histograms git-svn-id: http://root.cern.ch/svn/root/trunk@9446 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 14:45:46 UTC |
| 32d5f5e | Rene Brun | 08 July 2004, 14:45:11 UTC | Several protections added in TH1::Chi2Test by Anna Kreshuk. git-svn-id: http://root.cern.ch/svn/root/trunk@9445 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 14:45:11 UTC |
| 26e0ebe | Fons Rademakers | 08 July 2004, 14:40:29 UTC | new TGDockableFrame widget, ported from xclass by Abdelhalim Ssadik. A TGDockableFrame is a frame with handles that allow it to be undocked (i.e. put in a transient frame of its own) and to be docked again or hidden and shown again. It uses the TGDockButton, which is a button with two vertical bars (||) and TGDockHideButton, which is a button with a small triangle. The TGUndockedFrame is a transient frame that on closure will put the frame back in the dock. git-svn-id: http://root.cern.ch/svn/root/trunk@9444 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 14:40:29 UTC |
| e48af5c | Rene Brun | 08 July 2004, 14:18:16 UTC | From Philippe: This patch work around the deficiency of MSVC++ 6.0 template instantiation mechanism. git-svn-id: http://root.cern.ch/svn/root/trunk@9443 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 14:18:16 UTC |
| e0d5c88 | Rene Brun | 08 July 2004, 13:16:24 UTC | Add a new tutorial treefriend.C // This tutorial illustrates how to: // - create a simple TTree // - Copy a subset of this TTree to a new TTree // - Create a Tree Index // - Make a friend TTree // - compare two TTrees // - Draw a variable from the first tree versus a variable // in the friend Tree git-svn-id: http://root.cern.ch/svn/root/trunk@9442 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 13:16:24 UTC |
| 86aebc4 | Rene Brun | 08 July 2004, 12:45:00 UTC | From Anna Kreshuk: A simplified/faster version of TMath::Median functions. git-svn-id: http://root.cern.ch/svn/root/trunk@9441 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 12:45:00 UTC |
| 2e836ec | Rene Brun | 08 July 2004, 12:18:50 UTC | In TStyle::SetOptFit implement a variant of an existing option // The type of information about fit parameters printed in the histogram // statistics box can be selected via gStyle->SetOptFit(mode). // The parameter mode can be = pcev (default = 0111) // v = 1; print name/values of parameters // e = 1; print errors (if e=1, v must be 1) // c = 1; print Chisquare/Number of degrees of freedom // p = 1; print Probability // When "v"=1 is specified, only the non-fixed parameters are shown. // When "v"=2 all parameters are shown. In THistPainter::PaintStat, take into account this option. By default fixed parameters are not shown. git-svn-id: http://root.cern.ch/svn/root/trunk@9440 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 12:18:50 UTC |
| 08d10ff | Fons Rademakers | 08 July 2004, 11:52:32 UTC | several cleanups and a fix that allows TThreads to run also when not in the TApplication eventloop. git-svn-id: http://root.cern.ch/svn/root/trunk@9439 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 11:52:32 UTC |
| 296a1d2 | Fons Rademakers | 08 July 2004, 11:50:08 UTC | add new method IsRunning() which returns true when TApplication::Run() has been called. It is sometime important to know is e.g. synchronous timers will run and they will not run when IsRunning() is false. git-svn-id: http://root.cern.ch/svn/root/trunk@9438 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 11:50:08 UTC |
| 710a06c | Fons Rademakers | 08 July 2004, 10:19:36 UTC | xlC needs forward declarations for all friend classes. git-svn-id: http://root.cern.ch/svn/root/trunk@9437 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 10:19:36 UTC |
| d86cbc6 | Rene Brun | 08 July 2004, 10:02:31 UTC | From valeriy Onuchin: rename fCleanup by fTrash to avoid collisions VS: ---------------------------------------------------------------------- git-svn-id: http://root.cern.ch/svn/root/trunk@9436 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 10:02:31 UTC |
| 05f031e | Rene Brun | 08 July 2004, 09:12:59 UTC | Fix a compiler error in an enum declaration (extra ",") git-svn-id: http://root.cern.ch/svn/root/trunk@9435 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 09:12:59 UTC |
| 9e97467 | Rene Brun | 08 July 2004, 08:19:17 UTC | From Philippe: The TMath::Sort functions are implemented via a templated function. This saves a lot of code. Other functions like Mean, RMS, BinarySearch will follow. git-svn-id: http://root.cern.ch/svn/root/trunk@9434 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 08:19:17 UTC |
| 05f2183 | Rene Brun | 08 July 2004, 08:17:52 UTC | Fix a wrong return type for GetListOfWindows. THashList *GetListOfWindows() const { return fWlist; } git-svn-id: http://root.cern.ch/svn/root/trunk@9433 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 08:17:52 UTC |
| 3ed500f | Rene Brun | 08 July 2004, 08:09:06 UTC | add new function BuildIndex (called from TTree::BuildIndex). This new function craetes an instance of teh new TTreeIndex class. TTreePlayer::UpdateFormulaLeaves also takes care of updating the TTreeIndex TTreeFormula. git-svn-id: http://root.cern.ch/svn/root/trunk@9432 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 08:09:06 UTC |
| 9c12d48 | Rene Brun | 08 July 2004, 08:08:52 UTC | The function BuildIndex is replaced by a call (via the TVirtualtreePlayer) to TTreePlayer::BuildIndex. New function TTree::LoadTreeFriend(Int_t entry, TTree *T) // called by TTree::LoadTree when TTree *T looks for the entry // number in a friend Tree (this) corresponding to the entry number in T. // If the friend Tree has no TTreeIndex, entry in the friend and entry // in T are the same. // If the friend Tree has an index, one must find the value pair major,minor // in T to locate the corresponding entry in the friend Tree. TTree::LoadTree has been modified to call the new function TTree::LoadTreeFriend. The functions: TTree::GetEntryNumberWithBestIndex, TTree::GetEntryNumberWithIndex and TTree::GetEntryWithIndex have been modified to call the corresponding functions in the TTreeIndex. TTree::Streamer issues a Warning when reading an old style Index. git-svn-id: http://root.cern.ch/svn/root/trunk@9431 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 08:08:52 UTC |
| bacb3c8 | Rene Brun | 08 July 2004, 08:08:28 UTC | This new class replaces the previous Tree index code. The class derives from the abstract interface TVirtualIndex. It provides the same functionality as the previous code, but in addition, it supports more complex cases. When a Tree friend has a TTreeIndex (created as before via TTree::BuildIndex), the friend tree and the parent Tree do not need to have the same serial numbers. The friend tree may have less or more events. When getting an entry in the parent tree, the corresponding entry in the friend will be computed via the index. Note that to support this new feature, the parent Tree does not need an index. Only the friend Tree must have an index. see comments in the TTreeIndex constructor. git-svn-id: http://root.cern.ch/svn/root/trunk@9430 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 08:08:28 UTC |
| a9316af | Rene Brun | 08 July 2004, 08:08:08 UTC | Add a new function BuildIndex git-svn-id: http://root.cern.ch/svn/root/trunk@9429 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 08:08:08 UTC |
| d02450e | Rene Brun | 08 July 2004, 08:07:56 UTC | New abstract interface to create Tree index classes. This interface is currently designed to support the new TTreeIndex class. It will evolve to support other types of indexing (bit slices, event list,e tc) git-svn-id: http://root.cern.ch/svn/root/trunk@9428 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 08:07:56 UTC |
| 7dc4a35 | Rene Brun | 08 July 2004, 08:07:22 UTC | From valeriy Onuchin: add two getters to TGClient class - added TGClient::GetListOfWindows returns the list of all ROOT windows - added TGClient::GetListOfPopups returns the list of all ROOT popup windows git-svn-id: http://root.cern.ch/svn/root/trunk@9427 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 08:07:22 UTC |
| bce4a0a | Rene Brun | 08 July 2004, 07:39:56 UTC | In TPad::ExecuteEvent remove a special case for WIN32 git-svn-id: http://root.cern.ch/svn/root/trunk@9426 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 07:39:56 UTC |
| f1dd6c2 | Rene Brun | 08 July 2004, 07:23:37 UTC | From Valeri Onuchin: - fix entering Latex/Text in the pad under win32gdk git-svn-id: http://root.cern.ch/svn/root/trunk@9425 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 07:23:37 UTC |
| 54b91c0 | Rene Brun | 08 July 2004, 05:25:31 UTC | From Philippe: This update imports the following CINT patches: * 2068, uninitialized G__value::isconst * 2071, TMath::pow wrong call * 2072, f(arg) {const double x=arg;} * 2088, FOO::operator> bug fix It also import some variables initalization and re-import some fixes using Masa's coding style. git-svn-id: http://root.cern.ch/svn/root/trunk@9424 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 05:25:31 UTC |
| 284fc6f | Fons Rademakers | 08 July 2004, 00:30:19 UTC | more changes for port to MacOS X 10.4 (Tiger preview). ROOT now works on Tiger with gcc 3.5. git-svn-id: http://root.cern.ch/svn/root/trunk@9423 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 00:30:19 UTC |
| 6f24d49 | Fons Rademakers | 08 July 2004, 00:28:39 UTC | allow for longer class name when printing table. git-svn-id: http://root.cern.ch/svn/root/trunk@9422 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 00:28:39 UTC |
| 812e8b5 | Fons Rademakers | 08 July 2004, 00:19:59 UTC | used accidentally fArchiveName instead of fArchiveName.Data() in Info() statements. git-svn-id: http://root.cern.ch/svn/root/trunk@9421 27541ba8-7e3a-0410-8455-c3a389f83636 | 08 July 2004, 00:19:59 UTC |
| 130bc75 | Fons Rademakers | 07 July 2004, 23:25:33 UTC | two new classes to read archive files. TArchiveFile is an abstract class which uses the plugin manager to load a concrete archive reader. Currently the TZIPFile class provides a ZIP archive reader. One can also imagine a TTARFile to read tar files. We advice however to use ZIP archives since they allow direct access to all its members via a directory structure which is part of the file. The archive file access has been integrated into TFile which also functions as byte reader to access the archive. This has the enormous benefit that archives can be accessed using all the existing remote file access classes, like TNetFile, TRFIOFile, TCastorFile, etc. When creating ZIP files containing ROOT files make sure that the ROOT files are not compressed since normally they are already ZIP compressed. on Linux one can create a ZIP archive doing: zip -n root multi file1.root file2.root file3.root ... which creates the archive multi.zip, with all files ending with .root not compressed. The ROOT files in an archive can be simply accessed like this: TFile *f = TFile::Open("multi.zip#file2.root") or TFile *f = TFile::Open("root://pcsalo/multi.zip#2") where the second form opens the 3rd ROOT file in the archive via rootd. A TFile can also be used to just browse an archive file, like: TFile *f = TFile::Open("multi.zip") f->GetArchive->Print() A TBrowser interface will follow shortly. The core ZIP reading code has been kindly provided by Lassi Tuura. git-svn-id: http://root.cern.ch/svn/root/trunk@9420 27541ba8-7e3a-0410-8455-c3a389f83636 | 07 July 2004, 23:25:33 UTC |
| 1481581 | Fons Rademakers | 07 July 2004, 22:44:07 UTC | use Info() and Error() instead of cout and cerr. git-svn-id: http://root.cern.ch/svn/root/trunk@9419 27541ba8-7e3a-0410-8455-c3a389f83636 | 07 July 2004, 22:44:07 UTC |
| fc6ad01 | Fons Rademakers | 07 July 2004, 22:42:40 UTC | add code to decode DOS encoded UInt_t time value. git-svn-id: http://root.cern.ch/svn/root/trunk@9418 27541ba8-7e3a-0410-8455-c3a389f83636 | 07 July 2004, 22:42:40 UTC |
| 629f6a0 | Rene Brun | 07 July 2004, 17:47:49 UTC | The function Print argument Option_t *option has now a default value="" git-svn-id: http://root.cern.ch/svn/root/trunk@9417 27541ba8-7e3a-0410-8455-c3a389f83636 | 07 July 2004, 17:47:49 UTC |
| ea9e34e | Rene Brun | 07 July 2004, 15:03:44 UTC | Add additional comments (thanks Fred James) about Minuit parameter errors in the presence of limits git-svn-id: http://root.cern.ch/svn/root/trunk@9416 27541ba8-7e3a-0410-8455-c3a389f83636 | 07 July 2004, 15:03:44 UTC |
| 5afd652 | Rene Brun | 07 July 2004, 15:02:25 UTC | From Valeriy Onuchin: - keep history of draw option settings in browser - add few usefull methods, i.e. TGCombobox::GetNumberOfEntries() TGLBEntry *TGListBox::GetEntry(Int_t id) git-svn-id: http://root.cern.ch/svn/root/trunk@9415 27541ba8-7e3a-0410-8455-c3a389f83636 | 07 July 2004, 15:02:25 UTC |
| d5f2fd0 | Rene Brun | 07 July 2004, 10:17:20 UTC | From Valeri Onuchin: - followups after last changes. Unmap listbox on button press outside listbox area. - small correction to TRootBrowser "Draw Option" git-svn-id: http://root.cern.ch/svn/root/trunk@9414 27541ba8-7e3a-0410-8455-c3a389f83636 | 07 July 2004, 10:17:20 UTC |
| 15d8557 | Fons Rademakers | 07 July 2004, 09:50:40 UTC | fix typos: ROOT::TArrayProxy<UShort_t> -> ROOT::TArrayProxy<Short_t> ROOT::TClaArrayProxy<UShort_t> -> ROOT::TClaArrayProxy<Short_t> this fixes also the duplicate entry warning at startup (don't ignore the warnings :-)). git-svn-id: http://root.cern.ch/svn/root/trunk@9413 27541ba8-7e3a-0410-8455-c3a389f83636 | 07 July 2004, 09:50:40 UTC |
| 39692e0 | Rene Brun | 07 July 2004, 09:23:21 UTC | From Valeri Onuchin: - place combo box's listbox when arrow button is pressed - add text selection to text entry combo box - code cleaning git-svn-id: http://root.cern.ch/svn/root/trunk@9412 27541ba8-7e3a-0410-8455-c3a389f83636 | 07 July 2004, 09:23:21 UTC |
| 8795cb3 | Rene Brun | 07 July 2004, 07:01:40 UTC | From Andrei Gheata: Add a new Setter for TGeoMaterial (FLUKA business) git-svn-id: http://root.cern.ch/svn/root/trunk@9411 27541ba8-7e3a-0410-8455-c3a389f83636 | 07 July 2004, 07:01:40 UTC |
| 4ffca5d | Fons Rademakers | 06 July 2004, 16:34:31 UTC | From Bertrand: cleaner fix without ifdef for Win32. git-svn-id: http://root.cern.ch/svn/root/trunk@9410 27541ba8-7e3a-0410-8455-c3a389f83636 | 06 July 2004, 16:34:31 UTC |
| f7ca3ae | Rene Brun | 06 July 2004, 14:57:18 UTC | Remove unused variables fm and fp in GraphFitChisquare git-svn-id: http://root.cern.ch/svn/root/trunk@9409 27541ba8-7e3a-0410-8455-c3a389f83636 | 06 July 2004, 14:57:18 UTC |
| 05bf717 | Rene Brun | 06 July 2004, 14:55:04 UTC | Update misleading comments in the GetErrorX,Y functions. git-svn-id: http://root.cern.ch/svn/root/trunk@9408 27541ba8-7e3a-0410-8455-c3a389f83636 | 06 July 2004, 14:55:04 UTC |
| 07f03a3 | Rene Brun | 06 July 2004, 14:48:42 UTC | Improvement in TGraph::Fit: a little different approach to approximating the uncertainty in y because of the errors in x, is to make it equal the error in x times the slope of the line. The improvement, compared to the first method (f(x+ exhigh) - f(x-exlow))/2 is of (error of x)**2 order. This approach is called "effective variance method". This improvement has been made in version 4.00/08 by Anna Kreshuk. git-svn-id: http://root.cern.ch/svn/root/trunk@9407 27541ba8-7e3a-0410-8455-c3a389f83636 | 06 July 2004, 14:48:42 UTC |
| 1514649 | Rene Brun | 06 July 2004, 14:46:54 UTC | From Valeri Onuchin: - fix for menu bar hot key activation. unmapping popup menu with Return/Enter, Escape keys blocked the latest hotkey. git-svn-id: http://root.cern.ch/svn/root/trunk@9406 27541ba8-7e3a-0410-8455-c3a389f83636 | 06 July 2004, 14:46:54 UTC |
| 137ab04 | Fons Rademakers | 06 July 2004, 13:53:48 UTC | From Bertrand: fix for loop in file name expansion on Win32. git-svn-id: http://root.cern.ch/svn/root/trunk@9405 27541ba8-7e3a-0410-8455-c3a389f83636 | 06 July 2004, 13:53:48 UTC |
| 5c23aea | Rene Brun | 06 July 2004, 13:23:27 UTC | From Valeri Onuchin: - this fix makes highlight area in the TGTextEntry to be nicely centered git-svn-id: http://root.cern.ch/svn/root/trunk@9404 27541ba8-7e3a-0410-8455-c3a389f83636 | 06 July 2004, 13:23:27 UTC |
| eb5b979 | Rene Brun | 06 July 2004, 10:57:20 UTC | From Valeri Onuchin: - binding arrow, Return, Enter, Escape keys for popup menu navigation broke entering Latex/Text in TCanvas. Here is the fix: bind keys, remove key bindings dynamically when popup menu is placed/dispalced. git-svn-id: http://root.cern.ch/svn/root/trunk@9403 27541ba8-7e3a-0410-8455-c3a389f83636 | 06 July 2004, 10:57:20 UTC |
| 08d8d73 | Rene Brun | 06 July 2004, 10:55:57 UTC | From Valeri Onuchin: - new constructor added to TGComboBox class TGComboBox(const TGWindow *p, const char *text) That creates editable combobox. - Use editable combobox for setting "Draw Option" in TBrowser git-svn-id: http://root.cern.ch/svn/root/trunk@9402 27541ba8-7e3a-0410-8455-c3a389f83636 | 06 July 2004, 10:55:57 UTC |
| 865eba6 | Fons Rademakers | 06 July 2004, 09:04:51 UTC | use Info() and Error() instead of printf. Correct some formatting (identation must be 3 and not 2). git-svn-id: http://root.cern.ch/svn/root/trunk@9401 27541ba8-7e3a-0410-8455-c3a389f83636 | 06 July 2004, 09:04:51 UTC |
| adb7a1e | Rene Brun | 06 July 2004, 08:34:38 UTC | Fix a bug in the new function TMath::Sort(Long64_t... An internal variable was declared Long_t instead of Long64_t git-svn-id: http://root.cern.ch/svn/root/trunk@9400 27541ba8-7e3a-0410-8455-c3a389f83636 | 06 July 2004, 08:34:38 UTC |
| 38975a0 | Rene Brun | 06 July 2004, 07:45:40 UTC | In TGraphAsymmErrors::BayesDivide add an option "w" By default the function does not check this assertion. if option "w" is specified, the function will fail if the histograms have been filled with weights not equal to 1. git-svn-id: http://root.cern.ch/svn/root/trunk@9399 27541ba8-7e3a-0410-8455-c3a389f83636 | 06 July 2004, 07:45:40 UTC |
| 0d42b09 | Rene Brun | 06 July 2004, 07:28:29 UTC | In TMath::BetaCf increase the maximum number of iterations from 100 to 500. git-svn-id: http://root.cern.ch/svn/root/trunk@9398 27541ba8-7e3a-0410-8455-c3a389f83636 | 06 July 2004, 07:28:29 UTC |
| 2fe8430 | Rene Brun | 06 July 2004, 07:11:26 UTC | Fix typos git-svn-id: http://root.cern.ch/svn/root/trunk@9397 27541ba8-7e3a-0410-8455-c3a389f83636 | 06 July 2004, 07:11:26 UTC |
| cbcef0b | Rene Brun | 06 July 2004, 07:10:46 UTC | In TMath::Betacf add a \n in a printf statement git-svn-id: http://root.cern.ch/svn/root/trunk@9396 27541ba8-7e3a-0410-8455-c3a389f83636 | 06 July 2004, 07:10:46 UTC |
| e6ce6cf | Fons Rademakers | 05 July 2004, 17:52:55 UTC | the functions IsAlpha(), IsAlnum(), IsDigit() and IsHex() return false in case the string length is 0. git-svn-id: http://root.cern.ch/svn/root/trunk@9395 27541ba8-7e3a-0410-8455-c3a389f83636 | 05 July 2004, 17:52:55 UTC |
| 8dce635 | Rene Brun | 05 July 2004, 17:51:12 UTC | Add new prototype for TMath::Sort. static void Sort(Long64_t n, const Long64_t *a, Long64_t *index, Bool_t down=kTRUE); This new prototype will be used by the new TTreeIndex class. Add new functions static Double_t ErfInverse(Double_t x); static Double_t ErfcInverse(Double_t x) {return TMath::ErfInverse(1-x);} TMath::Erf computes the inverse of the error function git-svn-id: http://root.cern.ch/svn/root/trunk@9394 27541ba8-7e3a-0410-8455-c3a389f83636 | 05 July 2004, 17:51:12 UTC |
| 559227a | Rene Brun | 05 July 2004, 13:31:10 UTC | From Valeri Fine & Yuri Fisiak It fixes a crash when the user custom compare method is provided git-svn-id: http://root.cern.ch/svn/root/trunk@9393 27541ba8-7e3a-0410-8455-c3a389f83636 | 05 July 2004, 13:31:10 UTC |
| 331afe6 | Rene Brun | 05 July 2004, 08:52:35 UTC | From Andrei Gheata: added a protection against double instantiation of TGeoElementTable. git-svn-id: http://root.cern.ch/svn/root/trunk@9392 27541ba8-7e3a-0410-8455-c3a389f83636 | 05 July 2004, 08:52:35 UTC |
| 38be498 | Rene Brun | 05 July 2004, 07:02:53 UTC | Modify the original algorithm in TF1::Moment and TF1::CentralMoment to use the new C functions TF1_ExpValHelperx and TF1_ExpValHelper instead of the interpreted functions. This removes several limitations. Also initialize the parameters for the helper functions. git-svn-id: http://root.cern.ch/svn/root/trunk@9391 27541ba8-7e3a-0410-8455-c3a389f83636 | 05 July 2004, 07:02:53 UTC |
| 4d8a332 | Rene Brun | 05 July 2004, 06:55:07 UTC | In TGraphasymmErrors::BayesDivide, the test for histograms filled with weights was wrong. git-svn-id: http://root.cern.ch/svn/root/trunk@9390 27541ba8-7e3a-0410-8455-c3a389f83636 | 05 July 2004, 06:55:07 UTC |
| dbeb342 | Rene Brun | 05 July 2004, 06:43:30 UTC | The argument option is now optional in TGraphAsymmErrors::BayesDivide git-svn-id: http://root.cern.ch/svn/root/trunk@9389 27541ba8-7e3a-0410-8455-c3a389f83636 | 05 July 2004, 06:43:30 UTC |
| 630292b | Rene Brun | 05 July 2004, 06:42:05 UTC | Add more comments in headers. Rename gif files git-svn-id: http://root.cern.ch/svn/root/trunk@9388 27541ba8-7e3a-0410-8455-c3a389f83636 | 05 July 2004, 06:42:05 UTC |
| f5e9168 | Fons Rademakers | 04 July 2004, 17:57:50 UTC | some more changes for Tiger. git-svn-id: http://root.cern.ch/svn/root/trunk@9387 27541ba8-7e3a-0410-8455-c3a389f83636 | 04 July 2004, 17:57:50 UTC |
| 1399161 | Fons Rademakers | 04 July 2004, 17:57:24 UTC | remove out of place comment. git-svn-id: http://root.cern.ch/svn/root/trunk@9386 27541ba8-7e3a-0410-8455-c3a389f83636 | 04 July 2004, 17:57:24 UTC |
| af33052 | Fons Rademakers | 04 July 2004, 17:48:43 UTC | From Gerri: 1. TSystem.cxx, TNetFile.cxx: two checks in TSystem::ConsistentWith and TNetSystem::ConsistentWith were wrong in such a way to compensate each other; 2. rpdutils.cxx: RpdCheckHostsEquiv: missing extension in renaming .rhosts made permission check ineffective RpdCheckAuthAllow: an initialization flag setting was misplaced 3. globus.cxx, proofd.cxx force null termination of std::string's after string::insert I have seen the problem with gcc2.96 (also a guy that contacted me saw the same): the new length is ok, but the newly allocate memory is not reset; gcc2.95 should also have the problem, at least looking at the gcc code, while for 3.x the STL implementation seems completely re-written. git-svn-id: http://root.cern.ch/svn/root/trunk@9385 27541ba8-7e3a-0410-8455-c3a389f83636 | 04 July 2004, 17:48:43 UTC |
| 17c815e | Rene Brun | 03 July 2004, 20:39:39 UTC | In the functions ProjectionX,ProjectionY,SlicesX,SlicesY copy the attributes of the TH2 axis to the projection axis. git-svn-id: http://root.cern.ch/svn/root/trunk@9384 27541ba8-7e3a-0410-8455-c3a389f83636 | 03 July 2004, 20:39:39 UTC |
| 6641175 | Rene Brun | 03 July 2004, 20:37:26 UTC | Add a new function void TAxis::ImportAttributes(const TAxis *axis) This new function is called from TH2::ProjectionX,Y and TH2::SlicesX,Y git-svn-id: http://root.cern.ch/svn/root/trunk@9383 27541ba8-7e3a-0410-8455-c3a389f83636 | 03 July 2004, 20:37:26 UTC |
| 126e194 | Rene Brun | 03 July 2004, 13:47:38 UTC | In the TH1::Add functions do not use the absolute value of the multiplying coeefficients when computing the resulting statistics, but their value. git-svn-id: http://root.cern.ch/svn/root/trunk@9382 27541ba8-7e3a-0410-8455-c3a389f83636 | 03 July 2004, 13:47:38 UTC |
| 3c58014 | Rene Brun | 03 July 2004, 09:34:30 UTC | Replace the enum kNone by kNotSTL to avoid a possible clash with the kNone in GuiTypes.h git-svn-id: http://root.cern.ch/svn/root/trunk@9381 27541ba8-7e3a-0410-8455-c3a389f83636 | 03 July 2004, 09:34:30 UTC |
| 5bb191e | Rene Brun | 02 July 2004, 21:51:29 UTC | From Philippe: Attached is a new format to eventlist->Print("all") in response to http://root.cern.ch/phpBB2/viewtopic.php?t=838 git-svn-id: http://root.cern.ch/svn/root/trunk@9380 27541ba8-7e3a-0410-8455-c3a389f83636 | 02 July 2004, 21:51:29 UTC |
| dc1c350 | Rene Brun | 02 July 2004, 21:50:20 UTC | From Philippe: This patchs avoid crashing if the name of the TEventList used in TTree::Draw refers to an existing non-TEventList object. For example: ntuple->Draw("px>>elist"); ntuple->Draw(">>elist"); was crashing and now issues: Error in <TSelectorDraw::Begin>: An object of type 'TH1F' has the same name as the requested event list (elist) git-svn-id: http://root.cern.ch/svn/root/trunk@9379 27541ba8-7e3a-0410-8455-c3a389f83636 | 02 July 2004, 21:50:20 UTC |
| 138e5d0 | Rene Brun | 02 July 2004, 21:48:30 UTC | From Philippe: The iosenum.h is empty for windows and the default are inappropriate for the MS compiler. Hence a simple command like: ifstream f("myfile.txt",ios::in); does not work (because ios::in has the wrong value). The attached iosenum.win32 was (harduously) generated for the MS compiler and solved the problem (see http://root.cern.ch/phpBB2/viewtopic.php?p=3100#3100) git-svn-id: http://root.cern.ch/svn/root/trunk@9378 27541ba8-7e3a-0410-8455-c3a389f83636 | 02 July 2004, 21:48:30 UTC |
| 7968a4b | Fons Rademakers | 02 July 2004, 18:36:57 UTC | From Gerri: Patch to support 'system' functionality via the rootd daemon, so one can get file stat and access info and directory browsing via rootd. - TNetFile.h, .cxx New class TNetSystem inheriting from TSystem. - net/inc/LinkDef.h Added #pragma for TNetSystem - TFTP.h, .cxx New methods AccessPathName, GetPathInfo, GetDirEntry, OpenDirectory, FreeDirectory - TSystem.h, .cxx New method ConsistentWith to allow different matching criteria in the search for existing helpers (method FindHelper) - rootd.cxx New functions RootdAccess, RootdFreeDir, RootdGetDirEntry, RootdOpenDir - MessageTypes.h New messages kROOTD_OPENDIR, kROOTD_FREEDIR, kROOTD_DIRENTRY, kROOTD_ACCESS git-svn-id: http://root.cern.ch/svn/root/trunk@9377 27541ba8-7e3a-0410-8455-c3a389f83636 | 02 July 2004, 18:36:57 UTC |
| 72c0aaf | Rene Brun | 02 July 2004, 15:43:56 UTC | from Ilka add pictures showing the ged for all classes supporting the new editor git-svn-id: http://root.cern.ch/svn/root/trunk@9376 27541ba8-7e3a-0410-8455-c3a389f83636 | 02 July 2004, 15:43:56 UTC |
| 9c0dc36 | Rene Brun | 02 July 2004, 13:46:09 UTC | Add a static member static Int_t fgPanelVersion; //DrawPanel version (0=old, 1= new) in TUtilPad::DrawPanel, add 2 lines to invoke the class TGedDrawpanel when fgPanelVersion>0 fgPanelVersion may be set via TUtilPad::SetPanelVersion(1) git-svn-id: http://root.cern.ch/svn/root/trunk@9375 27541ba8-7e3a-0410-8455-c3a389f83636 | 02 July 2004, 13:46:09 UTC |
| 0fed121 | Rene Brun | 02 July 2004, 13:42:40 UTC | In the functions TH2::FitSlicesX and TH2::FitSlicesY add new options "G2","G3","G4","G5" to group 2,3,4 or 5 consecutive bins when making the projections. git-svn-id: http://root.cern.ch/svn/root/trunk@9374 27541ba8-7e3a-0410-8455-c3a389f83636 | 02 July 2004, 13:42:40 UTC |
| 0afc8ce | Rene Brun | 02 July 2004, 13:25:09 UTC | From Anna Kreshuk Add new function Double_t TH1::Chi2Test(TH1 *h, Option_t *option, Int_t constraint) //The Chi2 (Pearson's) test for differences between h and this histogram. //a small value of prob indicates a significant difference between the distributions // //if the data was collected in such a way that the number of entries //in the first histogram is necessarily equal to the number of entries //in the second, the parameter _constraint_ must be made 1. Default is 0. //any additional constraints on the data lower the number of degrees of freedom //(i.e. increase constraint to more positive values) in accordance with //their number // ///options: //"O" -overflows included //"U" - underflows included // //"P" - print information about number of degrees of freedom and //the value of chi2 //by default underflows and overflows are not included // //algorithm taken from "Numerical Recipes in C++" git-svn-id: http://root.cern.ch/svn/root/trunk@9373 27541ba8-7e3a-0410-8455-c3a389f83636 | 02 July 2004, 13:25:09 UTC |
| 8e623c3 | Rene Brun | 02 July 2004, 07:44:37 UTC | New tutorial illustrating how to use a THStack to show a 2-D histogram with cells drawn with different colors git-svn-id: http://root.cern.ch/svn/root/trunk@9372 27541ba8-7e3a-0410-8455-c3a389f83636 | 02 July 2004, 07:44:37 UTC |
| 43d5626 | Wouter Verkerke | 02 July 2004, 07:39:04 UTC | This round of updates achieves two major goals - Large (O(10-100)) speedup in handling of very complex PDFS (>10000 nodes) by pervasive use of self-expanding hash tables - Fix outstanding problems with RooProdPdf through new strategy to deal with cached objects in cloning/server redirect operations There is also a handful of minor fixes ------------------------------------------------ o RooSetPair - New auxiliary class to store pair of RooArgSet pointers o Roo1DTable - Don't fill entries with zero weight o RooAbsArg - Add optional 2nd arg to printCompactTree() to store output to file o RooAbsCollection - Initialize RooLinkedLists with hashing size threshold of 43 o RooAbsGoodnessOfFit, RooAbsOptGoodnessOfFit, RooProdPdf - Follow changes in printCompactTree() syntax o RooAbsOptGoodnessOfFit - Remove all methods that implement dirty state optimization and constant term caching (migration to RooAbsReal) o RooAbsReal - Various fixes in plotAsymOn fix plotting of asymmetries in conjunction with ProjWData() and Slice() - Add methods that implement dirty state optimization and constant term caching (migration from RooAbsOptGoodnessOfFit) o RooDataProjBinding - Remove some old debug code o RooHashTable - New constructor option allow to choose hashing by name, pointer or objects Hash() value - Switch to using TMath::Hash() fast hashing method using 'especially selected random numbers' (!) - Add kludgy support for storage of RooLinkedListElem and RooSetPair objects, which do not inherit from TObject. (A full redesign of RooLinkedList and RooHashTable is needed at some point) o RooHist - Fix print statement o RooHistError - Lower (n,m) threshold for calculation of approximate binomial error to avoid factorial overflow problems. o RooLinkedList - Introduce automatically activated hashing by name and pointer to speed up handling of long lists beyond size threshold given in ctor (zero threshold disables this features) - Automatically rehash tables when #entries becomes greater than hash table size o RooNameSet - Sort contents upon insertion. This fixes broken operator== for certain set comparisons o RooNormListManager - Add support for 'sterile' operation. If contents is sterilized via new sterilize() member function or use of sterile copy ctor RooNormSetCache information is retained (and thus ordering and slot indeces used by client classes) but stored contents associated with given iset/nset pairs is deleted. A 'setNormList()' call that maps to a sterilized slot will recycle that slot. Optional new argument in getNormList will tell client that requested information has been sterilized rather than not being there. o RooNormSetCache - Store set pair information in hash table of RooSetPair objects rather than two fixed size arrays of RooArgSet pointers. This greatly improves lookup speed (indexed by set pointers) and automatically expands the capacity of the set cache as is needed for very complex fits. o RooProdPdf - Abandon strategy to forward redirectServer requests to cached product configurations. This strategy has turned out to be flawed as insufficient information is available in the redirectServers context to do the right thing under all circumstances. Invocation of redirectServerHook() will now sterilize the cache, using new RooNormListManager feature - Modify getAnalyticalIntegralWN(), which looks up cached product configurations by index to recognize sterilized entries. If such an entry is encountered, it is reconstituted on the fly. o RooRealIntegral - Store owned clones of factorizing observables instead of linking to instances provided in ctor as ownership related of those turns out not to be well defined. o RooRefCountedList - Set hashing threshold of underlying RooLinkedList at 17 o RooSimPdfBuilder - Increase buffer sizes of RooStringVars in set returned by createProtoBuildConfig() to accomodate requests for ever more complex pdf configurations. git-svn-id: http://root.cern.ch/svn/root/trunk@9370 27541ba8-7e3a-0410-8455-c3a389f83636 | 02 July 2004, 07:39:04 UTC |
| 2e6f8b8 | Fons Rademakers | 01 July 2004, 22:50:02 UTC | changes needed for port to MacOS Tiger Preview. git-svn-id: http://root.cern.ch/svn/root/trunk@9369 27541ba8-7e3a-0410-8455-c3a389f83636 | 01 July 2004, 22:50:02 UTC |
| 0c29b6b | Rene Brun | 01 July 2004, 21:27:36 UTC | From Philippe: This patch allows for the 2nd arguments of TNtuple::Fill to have a default value. git-svn-id: http://root.cern.ch/svn/root/trunk@9368 27541ba8-7e3a-0410-8455-c3a389f83636 | 01 July 2004, 21:27:36 UTC |
| cc8edaf | Rene Brun | 01 July 2004, 20:02:52 UTC | From Philippe: I attached the modifications that are needed in gcc3strm.cxx to compile with gcc 3.4.0. There are 2 problems. One is that I could not find any trace of ostream& operator<< (ostream&,const streampos&); in the gcc 3.3.1 or the gcc 3.4.0 header files. However it is in cint/lib/gcc3strm/iostrm.h and of course in gcc3strm.cxx The second problem is more fundamental. In gcc 3.4.0, streamoff is defined as (include/c++/3.4.0/bits/postypes.h) #ifdef _GLIBCXX_HAVE_INT64_T typedef int64_t streamoff; #else typedef long long streamoff; #endif in turn int64_t is platform dependent. In particular, on my node int64_t is typedef to an int. In gcc 3.3.1, streamoff was a long. This leads to the compilation error: cint/src/gcc3strm.cxx: In function `int G__G__stream_6_4_0(G__value*, const char*, G__param*, int)': cint/src/gcc3strm.cxx:149: error: 'const class std::fpos<mbstate_t>' has no member named 'operator long int' As a quick fix, I simply replaced the implementatio of the wrapper so that it does not do an explicit call to the operator long: const fpos<mbstate_t>*pos = (const fpos<mbstate_t>*)(G__getstructoffset()); G__letint(result7,108,(long)(*pos)); instead of G__letint(result7,108,(long)((const fpos<mbstate_t>*)(G__getstructoffset()))->operator long()); Of course, this is fundamentally wrong, since on a 64 bit platform, this will truncate the long long into a long. I am not sure what would be good solution (theoritically, it would require to make sure that the dictionary for fpos<mbstate_t> is different (long vs long long) on the appropriate platforms). git-svn-id: http://root.cern.ch/svn/root/trunk@9367 27541ba8-7e3a-0410-8455-c3a389f83636 | 01 July 2004, 20:02:52 UTC |
| 023bf10 | Fons Rademakers | 01 July 2004, 18:49:31 UTC | From Gerri: Fix backward compatibility problem with 4.00.06 for the SSH method. git-svn-id: http://root.cern.ch/svn/root/trunk@9366 27541ba8-7e3a-0410-8455-c3a389f83636 | 01 July 2004, 18:49:31 UTC |
| efe8ae6 | Fons Rademakers | 01 July 2004, 18:45:20 UTC | add number of protections to avoid passing 0 to strlen. Add new methods: IsAlpha(), IsAlnum(), IsDigit(), IsHex(). git-svn-id: http://root.cern.ch/svn/root/trunk@9365 27541ba8-7e3a-0410-8455-c3a389f83636 | 01 July 2004, 18:45:20 UTC |
| c60a5f3 | Fons Rademakers | 01 July 2004, 18:41:05 UTC | From Maarten: Fix typo in new packetizer. git-svn-id: http://root.cern.ch/svn/root/trunk@9364 27541ba8-7e3a-0410-8455-c3a389f83636 | 01 July 2004, 18:41:05 UTC |
| df1d8d0 | Rene Brun | 01 July 2004, 16:27:26 UTC | From Olivier: - When a THStack is drawn as a lego plot (option LEGO1), the top of each bin is now drawn with the color of the highest non empty stack element (for that particular bin). If all the stack elements are empty for a given bin, the color of the lowest stack element is used. Previously the top of the bin was always drawn with the color of the highest stack element. The following macro shows the improvement: void legocol() { TCanvas *c1 = new TCanvas; Int_t nbins = 10; TH2F *h1 = new TH2F("h1","h1",nbins,-4,4,nbins,-4,4); h1->SetFillColor(kBlue); TH2F *h2 = new TH2F("h2","h2",nbins,-4,4,nbins,-4,4); h2->SetFillColor(kRed); TH2F *h3 = new TH2F("h3","h3",nbins,-4,4,nbins,-4,4); h3->SetFillColor(kGreen); THStack *hs = new THStack("hs","3 plots"); hs->Add(h1); hs->Add(h2); hs->Add(h3); TRandom r; Int_t i; for (i=0;i<20000;i++) h1->Fill(r.Gaus(),r.Gaus()); for (i=0;i<20000;i++) h2->Fill(r.Gaus(),r.Gaus()); for (i=0;i<20000;i++) h3->Fill(r.Gaus(),r.Gaus()); Int_t bin; bin = h1->GetBin(5,4); h3->SetBinContent(bin,0); h2->SetBinContent(bin,0); bin = h1->GetBin(5,3); h3->SetBinContent(bin,0); bin = h1->GetBin(5,5); h2->SetBinContent(bin,0); hs->Draw("lego1"); } git-svn-id: http://root.cern.ch/svn/root/trunk@9363 27541ba8-7e3a-0410-8455-c3a389f83636 | 01 July 2004, 16:27:26 UTC |
| 06e606a | Rene Brun | 01 July 2004, 15:14:23 UTC | From Andrei Gheata: Minor changes in the element names git-svn-id: http://root.cern.ch/svn/root/trunk@9362 27541ba8-7e3a-0410-8455-c3a389f83636 | 01 July 2004, 15:14:23 UTC |
| 762fdd4 | Rene Brun | 01 July 2004, 15:10:47 UTC | Add comments in TH1::GetRMS git-svn-id: http://root.cern.ch/svn/root/trunk@9361 27541ba8-7e3a-0410-8455-c3a389f83636 | 01 July 2004, 15:10:47 UTC |
| 7aff112 | Rene Brun | 01 July 2004, 04:57:29 UTC | From Axel Naumann: THtml sigsegvs when encountering a class with an unknown base class, trying to build the inheritance diagram. This fixes it. git-svn-id: http://root.cern.ch/svn/root/trunk@9360 27541ba8-7e3a-0410-8455-c3a389f83636 | 01 July 2004, 04:57:29 UTC |
| c358040 | Rene Brun | 01 July 2004, 04:55:05 UTC | From Philippe: This patches renames TDirectory::GetObjectAny into TDirectory::GetObject. Since this interface has not been 'released' yet, no backward compatibility is provided. git-svn-id: http://root.cern.ch/svn/root/trunk@9359 27541ba8-7e3a-0410-8455-c3a389f83636 | 01 July 2004, 04:55:05 UTC |
| 08f2ec7 | Fons Rademakers | 30 June 2004, 22:50:52 UTC | ignore build products. git-svn-id: http://root.cern.ch/svn/root/trunk@9358 27541ba8-7e3a-0410-8455-c3a389f83636 | 30 June 2004, 22:50:52 UTC |
| 23cc184 | Fons Rademakers | 30 June 2004, 22:47:59 UTC | From Maarten: fix off by one error. git-svn-id: http://root.cern.ch/svn/root/trunk@9357 27541ba8-7e3a-0410-8455-c3a389f83636 | 30 June 2004, 22:47:59 UTC |
| 00da769 | Rene Brun | 30 June 2004, 19:38:51 UTC | Fix to the configure by Axel for finding X11/Xlib.h git-svn-id: http://root.cern.ch/svn/root/trunk@9356 27541ba8-7e3a-0410-8455-c3a389f83636 | 30 June 2004, 19:38:51 UTC |
| fa14a08 | Rene Brun | 30 June 2004, 18:42:41 UTC | From Philippe: This patch avoids the buffer overrun condition that lead to a segmentation fault. git-svn-id: http://root.cern.ch/svn/root/trunk@9355 27541ba8-7e3a-0410-8455-c3a389f83636 | 30 June 2004, 18:42:41 UTC |
| 28d545e | Fons Rademakers | 30 June 2004, 16:52:04 UTC | put special thread detection case for win32gcc in configure and not in wingcc_ld.sh to avoid spread of special cases over too many files. git-svn-id: http://root.cern.ch/svn/root/trunk@9354 27541ba8-7e3a-0410-8455-c3a389f83636 | 30 June 2004, 16:52:04 UTC |
| 3679af3 | Rene Brun | 30 June 2004, 13:04:44 UTC | From Ilka: additional code in TAxisEditor as follows: - fDecimal - new check button in the axis editor - DoDecimals(Bool_t on) - slot connected to the decimal part setting of axis labels. git-svn-id: http://root.cern.ch/svn/root/trunk@9353 27541ba8-7e3a-0410-8455-c3a389f83636 | 30 June 2004, 13:04:44 UTC |
| 4e59078 | Rene Brun | 30 June 2004, 12:59:51 UTC | From Philippe: This patch introduces a new conventions to access the user code in a TTreeProxy. As previously the input to the TTreeProxy is a script file (for example h1analysisProxy.C) and an optional cut script file (for example h1analysisProxyCut.C). MakeProxy generate a selector with a Process method containing: htemp->Fill(h1analysisProxy()); or if (h1analysisProxyCut()) htemp->Fill(h1analysisProxy()); The addition is that, optionally, the generated selector will also call method named scriptname_methodname in each of 6 main selector methods if the method scriptname_methodname Concretely, with the script h1analysisProxy.C, The method calls the method (if it exist) Begin -> h1analysisProxy_Begin SlaveBegin -> h1analysisProxy_Begin Notify -> h1analysisProxy_Begin Process -> h1analysisProxy_Begin SlaveTerminate -> h1analysisProxy_Begin Terminate -> h1analysisProxy_Begin This means that now chain->Process("h1analysis.C+"); and chain->Draw("h1analysisProxy.C+","h1analysisProxyCut.C") are equivalent (i.e. should produce the same result in the same amount of time (approx). git-svn-id: http://root.cern.ch/svn/root/trunk@9352 27541ba8-7e3a-0410-8455-c3a389f83636 | 30 June 2004, 12:59:51 UTC |
