From ef2f6464562c80d571328d82fe67510babb25231 Mon Sep 17 00:00:00 2001
From: Philippe Canal <pcanal@fnal.gov>
Date: Thu, 24 Jul 2014 13:29:19 -0500
Subject: [PATCH] remove <TAB>'s.
Conflicts:
bindings/pyroot/src/MethodProxy.cxx
cmake/modules/RootConfiguration.cmake
etc/http/files/main.htm
etc/http/files/single.htm
geom/geompainter/src/TGeoChecker.cxx
graf2d/mathtext/inc/mathtext.h
graf2d/mathtext/src/fontembed.cxx
graf2d/mathtext/src/fontembedps.cxx
graf2d/qt/inc/TQtCanvasPainter.h
gui/qtgsi/src/TQRootCanvas.cxx
hist/hist/src/TBackCompFitter.cxx
hist/hist/src/TEfficiency.cxx
hist/hist/src/TFractionFitter.cxx
hist/hist/src/TGraphAsymmErrors.cxx
hist/hist/src/TH2.cxx
hist/hist/src/TH3.cxx
hist/hist/src/TMultiDimFit.cxx
hist/hist/src/TProfile.cxx
hist/hist/src/TProfile2D.cxx
hist/hist/src/TUnfoldBinning.cxx
html/src/TDocParser.cxx
math/foam/src/TFoam.cxx
math/genvector/inc/Math/VectorUtil_Cint.h
math/minuit2/inc/Minuit2/FumiliMaximumLikelihoodFCN.h
math/minuit2/inc/Minuit2/FumiliStandardChi2FCN.h
math/minuit2/inc/Minuit2/FumiliStandardMaximumLikelihoodFCN.h
math/minuit2/inc/Minuit2/StackAllocator.h
math/minuit2/src/TChi2ExtendedFCN.cxx
math/minuit2/src/TChi2FCN.cxx
math/minuit2/src/TFitterMinuit.cxx
math/minuit2/src/TFumiliFCN.cxx
misc/table/src/TTableDescriptor.cxx
net/auth/src/rsaaux.cxx
test/QpRandomDriver.cxx
test/ios/RootBrowser/Src/Browser/Controllers/FileCollectionViewController.mm
test/ios/RootBrowser/Src/Browser/Controllers/FileContentViewController.mm
test/ios/RootBrowser/Src/Browser/Controllers/ObjectViewController.mm
test/ios/RootBrowser/Src/Browser/Views/PadView.mm
test/ios/RootBrowser/Src/CustomUI/RangeSlider.mm
test/ios/RootBrowser/Src/ObjectInspector/Controllers/AxisFontInspector.mm
test/ios/RootBrowser/Src/ObjectInspector/Controllers/AxisInspector.mm
test/ios/RootBrowser/Src/ObjectInspector/Controllers/AxisLabelsInspector.mm
test/ios/RootBrowser/Src/ObjectInspector/Controllers/AxisTitleInspector.mm
test/ios/RootBrowser/Src/ObjectInspector/Controllers/FilledAreaInspector.mm
test/ios/RootBrowser/Src/ObjectInspector/Controllers/H1BinsInspector.mm
test/ios/RootBrowser/Src/ObjectInspector/Controllers/H1ErrorsInspector.mm
test/ios/RootBrowser/Src/ObjectInspector/Controllers/H1Inspector.mm
test/ios/RootBrowser/Src/ObjectInspector/Controllers/InspectorWithNavigation.mm
test/ios/RootBrowser/Src/ObjectInspector/Controllers/LineInspector.mm
test/ios/RootBrowser/Src/ObjectInspector/Controllers/MarkerInspector.mm
test/ios/RootBrowser/Src/ObjectInspector/Controllers/ObjectInspector.mm
test/ios/RootBrowser/Src/ObjectInspector/Controllers/PadInspector.mm
test/ios/RootBrowser/Src/ObjectInspector/Controllers/PadTicksGridInspector.mm
test/ios/Tutorials/PadOptionsController.mm
test/ios/Tutorials/PadView.mm
test/periodic/NdbMF.cxx
test/periodic/NdbMTReacDesc.cxx
test/periodic/NdbMTReactionXS.cxx
test/periodic/NdbParticleList.cxx
test/periodic/XSGui.h
test/stressLinear.cxx
test/stressRooFit_tests.cxx
test/tcollbm.cxx
test/vmatrix.cxx
tutorials/eve/boxset.C
tutorials/geom/geodemo.C
tutorials/graphs/splines.C
tutorials/hist/th2polyEurope.C
tutorials/mc/CompareMasses.C
tutorials/memstat/memstat.C
---
bindings/ruby/src/drr.cxx | 2 +-
bindings/ruby/src/rrcommon.h | 4 +-
bindings/ruby/src/rrenums.h | 14 +-
build/rmkdepend/imakemdep.h | 496 ++--
build/unix/git2cl.pl | 606 ++---
build/unix/installDavix.sh | 2 +-
build/unix/makedist.sh | 2 +-
build/unix/makelib.sh | 28 +-
build/unix/wingcc_ld.sh | 6 +-
build/win/ld.sh | 2 +-
build/win/makelib.sh | 10 +-
build/win/makeresource.sh | 14 +-
cmake/modules/FindODBC.cmake | 4 +-
cmake/modules/FindOracle.cmake | 48 +-
cmake/modules/RootCPack.cmake | 10 +-
cmake/modules/RootNewMacros.cmake | 2 +-
cmake/modules/SearchInstalledSoftware.cmake | 22 +-
cmake/modules/WriteConfigCint.cmake | 2 +-
etc/HistFactorySchema.dtd | 8 +-
etc/cmake/FindROOT.cmake | 4 +-
etc/html/ROOT.css | 10 +-
etc/http/JSRootIO/style/JSRootInterface.css | 28 +-
etc/http/JSRootIO/style/dtree.css | 28 +-
etc/http/JSRootIO/style/jquery-ui.css | 956 ++++----
etc/http/files/dabc.css | 28 +-
geom/gdml/src/TGDMLParse.cxx | 6 +-
geom/gdml/writer.py | 8 +-
geom/geom/inc/TGeoNode.h | 2 +-
geom/geom/inc/TGeoPatternFinder.h | 2 +-
geom/geom/inc/TGeoRCPtr.h | 104 +-
geom/geom/src/TGeoCone.cxx | 4 +-
geom/geom/src/TGeoManager.cxx | 6 +-
geom/geom/src/TGeoNavigator.cxx | 12 +-
geom/geom/src/TGeoScaledShape.cxx | 2 +-
geom/geom/src/TGeoVoxelFinder.cxx | 36 +-
geom/geompainter/src/TGeoChecker.cxx | 8 +-
graf2d/cocoa/src/MenuLoader.mm | 84 +-
graf2d/graf/inc/TMathText.h | 75 +-
graf2d/graf/src/TCurlyArc.cxx | 2 +-
graf2d/graf/src/TGraphPolar.cxx | 2 +-
graf2d/graf/src/TTF.cxx | 64 +-
graf2d/gviz/src/TGraphEdge.cxx | 6 +-
graf2d/mathtext/inc/fontembed.h | 158 +-
graf2d/mathtext/inc/mathrender.h | 1640 ++++++-------
graf2d/mathtext/inc/mathtext.h | 21 +-
graf2d/mathtext/src/fontembed.cxx | 2076 ++++++++--------
graf2d/mathtext/src/fontembedps.cxx | 606 ++---
graf2d/mathtext/src/mathrender.cxx | 1138 ++++-----
graf2d/mathtext/src/mathrenderstyle.cxx | 884 +++----
graf2d/mathtext/src/mathrendertoken.cxx | 1728 ++++++-------
graf2d/mathtext/src/mathtext.cxx | 636 ++---
graf2d/mathtext/src/mathtextencode.cxx | 788 +++---
graf2d/mathtext/src/mathtextparse.cxx | 812 +++----
graf2d/mathtext/src/mathtextview.cxx | 414 ++--
graf2d/mathtext/src/table/adobeglyphlist.h | 584 ++---
graf2d/mathtext/src/table/mathbracketcs.h | 2 +-
graf2d/mathtext/src/table/mathfontch.h | 20 +-
graf2d/mathtext/src/table/mathfontparam.h | 3 +-
graf2d/mathtext/src/table/mathopstd.h | 70 +-
graf2d/mathtext/src/table/mathspacing.h | 18 +-
graf2d/postscript/src/AdobeGlyphList.h | 584 ++---
graf2d/postscript/src/TPostScript.cxx | 880 +++----
graf2d/qt/inc/TQUserEvent.h | 2 +-
graf2d/qt/inc/TQtClientFilter.h | 4 +-
graf2d/qt/inc/TQtMarker.h | 10 +-
graf2d/qt/inc/TQtTimer.h | 24 +-
graf2d/qt/inc/TQtWidget.h | 4 +-
graf2d/qt/inc/TWaitCondition.h | 2 +-
graf2d/qt/inc/rootlibs.pri | 28 +-
graf2d/qt/qt.pro | 4 +-
graf2d/qt/src/GQtGUI.cxx | 54 +-
graf2d/qt/src/TGQt.cxx | 40 +-
graf2d/qt/src/TQtBrush.cxx | 34 +-
graf2d/qt/src/TQtClientFilter.cxx | 18 +-
graf2d/qt/src/TQtMarker.cxx | 151 +-
graf2d/qt/src/TQtPen.cxx | 16 +-
graf2d/qt/src/TQtSymbolCodec.cxx | 2 +-
graf2d/qt/src/TQtWidget.cxx | 14 +-
graf2d/x11/inc/X11/extensions/render.h | 300 +--
graf2d/x11/inc/X11/extensions/shape.h | 144 +-
graf2d/x11/inc/X11/extensions/shapeconst.h | 26 +-
graf3d/doc/v520/index.html | 2 +-
graf3d/doc/v522/index.html | 2 +-
graf3d/doc/v526/index.html | 2 +-
graf3d/eve/doc/index.txt | 50 +-
graf3d/eve/inc/TEveParamList.h | 2 +-
graf3d/eve/inc/TEveProjections.h | 6 +-
graf3d/eve/inc/TEveTrack.h | 4 +-
graf3d/eve/src/TEveProjectionManager.cxx | 2 +-
graf3d/eve/src/TEveTrackProjectedGL.cxx | 4 +-
graf3d/eve/src/TEveTrackPropagator.cxx | 54 +-
graf3d/eve/src/TEveUtil.cxx | 2 +-
graf3d/ftgl/inc/FTFont.h | 8 +-
graf3d/ftgl/inc/FTGLBitmapFont.h | 4 +-
graf3d/ftgl/inc/FTGLExtrdFont.h | 14 +-
graf3d/ftgl/inc/FTGLOutlineFont.h | 4 +-
graf3d/ftgl/inc/FTGLPixmapFont.h | 4 +-
graf3d/ftgl/inc/FTGLTextureFont.h | 4 +-
graf3d/ftgl/inc/FTList.h | 4 +-
graf3d/ftgl/inc/FTOutlineGlyph.h | 14 +-
graf3d/ftgl/inc/FTVectoriser.h | 6 +-
graf3d/ftgl/src/FTFont.cxx | 32 +-
graf3d/ftgl/src/FTVectoriser.cxx | 2 +-
graf3d/g3d/src/TSPHE.cxx | 8 +-
graf3d/gl/inc/TGLCamera.h | 2 +-
graf3d/gl/inc/TGLViewerEditor.h | 2 +-
graf3d/gl/inc/TGLVoxelPainter.h | 2 +-
graf3d/gl/src/TGLRotateManip.cxx | 6 +-
graf3d/gl/src/TGLTF3Painter.cxx | 4 +-
graf3d/gl/src/TGLViewer.cxx | 2 +-
graf3d/gl/src/TX11GL.cxx | 2 +-
graf3d/glew/src/glew.c | 176 +-
graf3d/x3d/src/TViewerX3D.cxx | 4 +-
graf3d/x3d/src/x3d.c | 106 +-
gui/doc/v530/index.html | 2 +-
gui/fitpanel/src/TFitEditor.cxx | 24 +-
gui/ged/inc/TGedFrame.h | 2 +-
gui/ged/inc/TH1Editor.h | 6 +-
gui/ged/src/TH1Editor.cxx | 24 +-
gui/gui/inc/TGFont.h | 10 +-
gui/gui/src/TGScrollBar.cxx | 2 +-
gui/qtgsi/inc/TQRootCanvas.h | 2 +-
gui/qtgsi/inc/TQRootDialog.h | 2 +-
gui/qtgsi/src/TQRootCanvas.cxx | 8 +-
gui/qtgsi/test/example1/qtroot.h | 202 +-
gui/qtgsi/test/example2/qtrootexample.pro | 18 +-
hist/doc/v522/index.html | 10 +-
hist/hist/inc/TConfidenceLevel.h | 2 +-
hist/hist/inc/TEfficiency.h | 46 +-
hist/hist/inc/TF2.h | 4 +-
hist/hist/inc/TH1.h | 2 +-
hist/hist/inc/TH1K.h | 6 +-
hist/hist/inc/TProfile3D.h | 2 +-
hist/hist/inc/TSpline.h | 8 +-
hist/hist/inc/TUnfold.h | 2 +-
hist/hist/inc/TUnfoldBinning.h | 6 +-
hist/hist/inc/TUnfoldDensity.h | 64 +-
hist/hist/src/TEfficiency.cxx | 1594 ++++++------
hist/hist/src/TFractionFitter.cxx | 80 +-
hist/hist/src/TH3.cxx | 18 +-
hist/hist/src/THnBase.cxx | 166 +-
hist/hist/src/TKDE.cxx | 106 +-
hist/hist/src/TMultiDimFit.cxx | 2152 ++++++++---------
hist/hist/src/TProfile.cxx | 778 +++---
hist/hist/src/TProfile2D.cxx | 844 +++----
hist/hist/src/TSVDUnfold.cxx | 336 +--
hist/hist/src/TSpline.cxx | 2 +-
hist/hist/src/TUnfold.cxx | 1268 +++++-----
hist/hist/src/TUnfoldBinning.cxx | 962 ++++----
hist/hist/src/TUnfoldDensity.cxx | 22 +-
hist/spectrum/src/TSpectrum.cxx | 16 +-
html/inc/THtml.h | 2 +-
html/src/TDocParser.cxx | 6 +-
math/doc/v520/index.html | 8 +-
math/foam/src/TFoam.cxx | 18 +-
math/genvector/inc/Math/GenVector/Boost.h | 10 +-
math/genvector/inc/Math/GenVector/BoostX.h | 6 +-
math/genvector/inc/Math/GenVector/BoostY.h | 6 +-
math/genvector/inc/Math/GenVector/BoostZ.h | 6 +-
.../inc/Math/GenVector/Cartesian2D.h | 4 +-
.../inc/Math/GenVector/Cartesian3D.h | 6 +-
.../inc/Math/GenVector/Cylindrical3D.h | 2 +-
.../inc/Math/GenVector/CylindricalEta3D.h | 10 +-
.../inc/Math/GenVector/DisplacementVector3D.h | 38 +-
.../inc/Math/GenVector/EulerAngles.h | 12 +-
.../inc/Math/GenVector/LorentzRotation.h | 4 +-
.../inc/Math/GenVector/LorentzVector.h | 6 +-
math/genvector/inc/Math/GenVector/Plane3D.h | 85 +-
math/genvector/inc/Math/GenVector/Polar2D.h | 2 +-
math/genvector/inc/Math/GenVector/Polar3D.h | 2 +-
.../inc/Math/GenVector/PositionVector2D.h | 4 +-
.../inc/Math/GenVector/PositionVector3D.h | 24 +-
math/genvector/inc/Math/GenVector/PxPyPzE4D.h | 2 +-
math/genvector/inc/Math/GenVector/PxPyPzM4D.h | 4 +-
.../inc/Math/GenVector/RotationZYX.h | 16 +-
.../genvector/inc/Math/GenVector/VectorUtil.h | 910 +++----
math/genvector/src/Boost.cxx | 42 +-
math/genvector/src/BoostX.cxx | 4 +-
math/genvector/src/BoostY.cxx | 4 +-
math/genvector/src/BoostZ.cxx | 4 +-
math/genvector/src/Rotation3DxAxial.cxx | 4 +-
math/genvector/test/coordinates3D.cxx | 8 +-
math/genvector/test/coordinates4D.cxx | 54 +-
math/genvector/test/rotationApplication.cxx | 1094 ++++-----
math/genvector/test/stress2D.cxx | 23 +-
math/genvector/test/stress3D.cxx | 2 +-
math/genvector/test/testVectorIO.cxx | 46 +-
math/mathcore/inc/Fit/ParameterSettings.h | 2 +-
math/mathcore/inc/Math/AllIntegrationTypes.h | 34 +-
math/mathcore/inc/Math/KDTree.h | 6 +-
math/mathcore/inc/Math/TDataPoint.h | 2 +-
math/mathcore/inc/Math/TDataPointN.h | 2 +-
math/mathcore/inc/TKDTree.h | 2 +-
math/mathcore/src/FitUtil.cxx | 6 +-
math/mathcore/src/FitUtilParallel.cxx | 2 +-
math/mathcore/src/SpecFuncCephes.cxx | 6 +-
math/mathcore/src/SpecFuncCephesInv.cxx | 8 +-
math/mathcore/src/TKDTree.cxx | 66 +-
math/mathcore/src/TRandom1.cxx | 430 ++--
math/mathcore/test/kDTreeTest.cxx | 50 +-
math/mathcore/test/newKDTreeTest.cxx | 634 ++---
math/mathcore/test/testTMath.cxx | 6 +-
math/mathmore/inc/Math/GSLIntegrator.h | 4 +-
math/mathmore/inc/Math/GSLMCIntegrator.h | 18 +-
math/mathmore/inc/Math/IntegrationTypes.h | 14 +-
math/mathmore/inc/Math/InterpolationTypes.h | 36 +-
math/mathmore/inc/Math/Random.h | 4 +-
math/mathmore/inc/Math/RootFinderAlgorithms.h | 8 +-
math/mathmore/src/GSLDerivator.h | 2 +-
math/mathmore/src/GSLInterpolator.h | 16 +-
math/mathmore/src/GSLMCIntegrator.cxx | 2 +-
math/mathmore/src/Polynomial.cxx | 14 +-
math/mathmore/src/complex_quartic.h | 2 +-
math/mathmore/test/piRandom.C | 8 +-
math/mathmore/test/pirndm.C | 6 +-
math/mathmore/test/testMCIntegration.cxx | 4 +-
math/mathmore/test/testRandom.cxx | 8 +-
math/mathmore/test/testRandomDist.cxx | 64 +-
math/matrix/inc/TVectorT.h | 2 +-
math/minuit2/doc/Doxyfile.in | 2 +-
.../Minuit2/AnalyticalGradientCalculator.h | 2 +-
math/minuit2/inc/Minuit2/BasicMinimumState.h | 4 +-
.../inc/Minuit2/CombinedMinimumBuilder.h | 2 +-
.../minuit2/inc/Minuit2/DavidonErrorUpdator.h | 2 +-
math/minuit2/inc/Minuit2/FumiliBuilder.h | 2 +-
math/minuit2/inc/Minuit2/FumiliErrorUpdator.h | 8 +-
.../inc/Minuit2/FumiliGradientCalculator.h | 4 +-
.../inc/Minuit2/FumiliMaximumLikelihoodFCN.h | 28 +-
.../inc/Minuit2/FumiliStandardChi2FCN.h | 90 +-
.../FumiliStandardMaximumLikelihoodFCN.h | 10 +-
math/minuit2/inc/Minuit2/FunctionGradient.h | 2 +-
math/minuit2/inc/Minuit2/GradientCalculator.h | 2 +-
.../inc/Minuit2/HessianGradientCalculator.h | 4 +-
.../inc/Minuit2/InitialGradientCalculator.h | 4 +-
math/minuit2/inc/Minuit2/LaProd.h | 12 +-
math/minuit2/inc/Minuit2/LaSum.h | 12 +-
.../minuit2/inc/Minuit2/MinimumErrorUpdator.h | 2 +-
math/minuit2/inc/Minuit2/MinimumState.h | 2 +-
math/minuit2/inc/Minuit2/MnParabolaFactory.h | 4 +-
math/minuit2/inc/Minuit2/MnStrategy.h | 4 +-
.../Minuit2/Numerical2PGradientCalculator.h | 6 +-
.../inc/Minuit2/SinParameterTransformation.h | 2 +-
math/minuit2/inc/Minuit2/StackAllocator.h | 62 +-
math/minuit2/src/DavidonErrorUpdator.cxx | 4 +-
math/minuit2/src/FumiliGradientCalculator.cxx | 2 +-
.../FumiliStandardMaximumLikelihoodFCN.cxx | 14 +-
math/minuit2/src/MnLineSearch.cxx | 14 +-
math/minuit2/src/MnPrint.cxx | 2 +-
math/minuit2/src/MnSeedGenerator.cxx | 8 +-
math/minuit2/src/MnUserTransformation.cxx | 2 +-
math/minuit2/src/NegativeG2LineSearch.cxx | 2 +-
.../src/Numerical2PGradientCalculator.cxx | 14 +-
math/minuit2/src/SimplexSeedGenerator.cxx | 4 +-
math/minuit2/src/mndasum.cxx | 2 +-
math/minuit2/src/mndaxpy.cxx | 2 +-
math/minuit2/src/mnddot.cxx | 2 +-
math/minuit2/src/mndscal.cxx | 2 +-
math/minuit2/src/mndspmv.cxx | 2 +-
math/minuit2/src/mndspr.cxx | 4 +-
math/minuit2/src/mnlsame.cxx | 2 +-
math/minuit2/src/mntplot.cxx | 4 +-
math/minuit2/src/mnxerbla.cxx | 2 +-
math/minuit2/test/MnSim/GaussFcn.h | 10 +-
math/minuit2/test/MnSim/GaussFcn2.h | 10 +-
math/minuit2/test/MnSim/PaulTest4.cxx | 12 +-
math/minuit2/test/MnSim/ReneTest.cxx | 60 +-
math/minuit2/test/testUnbinGausFit.cxx | 36 +-
math/mlp/inc/TMultiLayerPerceptron.h | 2 +-
math/physics/src/TLorentzVector.cxx | 4 +-
math/physics/src/TRolke.cxx | 20 +-
math/smatrix/doc/SMatrixClass.html | 2 +-
math/smatrix/inc/Math/BinaryOpPolicy.h | 12 +-
math/smatrix/inc/Math/CholeskyDecomp.h | 232 +-
math/smatrix/inc/Math/Dfact.h | 134 +-
math/smatrix/inc/Math/Dfactir.h | 168 +-
math/smatrix/inc/Math/Dfinv.h | 122 +-
math/smatrix/inc/Math/Dinv.h | 20 +-
math/smatrix/inc/Math/Dsfact.h | 2 +-
math/smatrix/inc/Math/Expression.h | 22 +-
math/smatrix/inc/Math/Functions.h | 40 +-
math/smatrix/inc/Math/HelperOps.h | 16 +-
math/smatrix/inc/Math/MatrixFunctions.h | 10 +-
.../inc/Math/MatrixRepresentationsStatic.h | 116 +-
math/smatrix/test/TestTimer.h | 84 +-
math/smatrix/test/matrix_op.h | 720 +++---
math/smatrix/test/matrix_util.h | 8 +-
math/smatrix/test/testInversion.cxx | 12 +-
math/smatrix/test/testOperations.cxx | 12 +-
math/smatrix/test/testSMatrix.cxx | 60 +-
math/unuran/doc/index.txt | 2 +-
math/vc/examples/smatrix/TestTimer.h | 84 +-
math/vc/examples/smatrix/matrix_op_vec.h | 102 +-
math/vc/examples/smatrix/matrix_util.h | 10 +-
math/vc/examples/smatrix/testOperations.cxx | 12 +-
math/vc/examples/tsc.h | 4 +-
math/vc/include/Vc/common/memory.h | 12 +-
math/vc/include/Vc/sse/mask.h | 2 +-
math/vc/include/Vc/sse/vectorhelper.tcc | 2 +-
math/vc/tests/math.cpp | 2 +-
math/vc/tests/store.cpp | 2 +-
math/vdt/include/vdt/asin.h | 150 +-
math/vdt/include/vdt/atan.h | 166 +-
math/vdt/include/vdt/exp.h | 2 +-
math/vdt/include/vdt/log.h | 204 +-
math/vdt/include/vdt/sincos.h | 50 +-
math/vdt/include/vdt/sqrt.h | 20 +-
math/vdt/include/vdt/vdtcore_common.h | 10 +-
.../doc/TMemStat_Technical_Overview.xml | 44 +-
misc/memstat/doc/docbook.css | 22 +-
misc/minicern/src/cernlib.c | 2 +-
misc/rootql/GeneratePreviewForURL.m | 26 +-
misc/rootql/ReadFile.m | 6 +-
misc/rootql/main.c | 42 +-
misc/rootsl/GetMetadataForFile.m | 6 +-
misc/rootsl/main.c | 56 +-
misc/table/inc/TTableMap.h | 2 +-
misc/table/src/TTableDescriptor.cxx | 30 +-
montecarlo/eg/inc/TGenerator.h | 4 +-
montecarlo/eg/inc/TParticleClassPDG.h | 4 +-
montecarlo/eg/inc/cfortran.h | 30 +-
montecarlo/eg/src/TGenerator.cxx | 6 +-
montecarlo/pythia6/inc/TPythia6Calls.h | 6 +-
montecarlo/pythia6/inc/TPythia6Decayer.h | 2 +-
montecarlo/pythia8/src/TPythia8.cxx | 82 +-
montecarlo/vmc/inc/TGeoMCGeometry.h | 4 +-
montecarlo/vmc/inc/TPDGCode.h | 46 +-
montecarlo/vmc/inc/TVirtualMC.h | 2 +-
montecarlo/vmc/inc/TVirtualMCStack.h | 10 +-
net/auth/inc/rsaaux.h | 60 +-
net/auth/inc/rsadef.h | 88 +-
net/auth/inc/rsafun.h | 16 +-
net/auth/inc/rsalib.h | 22 +-
net/auth/src/rsaaux.cxx | 350 +--
net/auth/src/rsafun.cxx | 4 +-
net/auth/src/rsalib.cxx | 62 +-
net/davix/src/TDavixSystem.cxx | 2 +-
net/http/civetweb/md5.inl | 40 +-
net/krb5auth/src/TKSocket.cxx | 2 +-
net/ldap/inc/CintLDAP.h | 6 +-
net/net/inc/TS3WebFile.h | 2 +-
net/net/inc/TWebFile.h | 2 +-
net/rpdutils/src/daemon.cxx | 2 +-
net/srputils/src/rpasswd.c | 28 +-
test/QpRandomDriver.cxx | 4 +-
test/ctorture.cxx | 18 +-
test/ios/Tutorials/PadOptionsController.mm | 8 +-
test/ios/Tutorials/PadView.mm | 50 +-
.../Tutorials/DetailViewController.mm | 2 +-
.../Tutorials/Tutorials/RootViewController.h | 2 +-
test/periodic/NdbAngularDist.h | 8 +-
test/periodic/NdbDCAngularDist.h | 8 +-
test/periodic/NdbDCEnergyDist.h | 8 +-
test/periodic/NdbDCNuBar.h | 8 +-
test/periodic/NdbDCRadioXS.h | 10 +-
test/periodic/NdbDCRadioYield.h | 10 +-
test/periodic/NdbDCReactionXS.h | 8 +-
test/periodic/NdbDCResParam.h | 8 +-
test/periodic/NdbDataCovariances.h | 10 +-
test/periodic/NdbDefs.h | 96 +-
test/periodic/NdbEndfIO.cxx | 336 +--
test/periodic/NdbEndfIO.h | 168 +-
test/periodic/NdbEnergyAngleDist.h | 8 +-
test/periodic/NdbEnergyDist.h | 8 +-
test/periodic/NdbFissionYield.h | 8 +-
test/periodic/NdbFormFactors.h | 10 +-
test/periodic/NdbGeneralInfo.h | 8 +-
test/periodic/NdbMF.cxx | 38 +-
test/periodic/NdbMF.h | 52 +-
test/periodic/NdbMT.h | 48 +-
test/periodic/NdbMTDir.cxx | 158 +-
test/periodic/NdbMTDir.h | 124 +-
test/periodic/NdbMTReacDesc.cxx | 211 +-
test/periodic/NdbMTReacDesc.h | 48 +-
test/periodic/NdbMTReactionXS.cxx | 160 +-
test/periodic/NdbMTReactionXS.h | 94 +-
test/periodic/NdbMaterial.h | 164 +-
test/periodic/NdbParticle.h | 94 +-
test/periodic/NdbParticleList.cxx | 40 +-
test/periodic/NdbParticleList.h | 22 +-
test/periodic/NdbPhotonAngleDist.h | 8 +-
test/periodic/NdbPhotonEnergyDist.h | 8 +-
test/periodic/NdbPhotonInteractionXS.h | 8 +-
test/periodic/NdbPhotonMult.h | 8 +-
test/periodic/NdbPhotonProdXS.h | 8 +-
test/periodic/NdbRadioMult.h | 10 +-
test/periodic/NdbRadioXS.h | 8 +-
test/periodic/NdbReaction.h | 12 +-
test/periodic/NdbResParam.h | 8 +-
test/periodic/NdbThermalNeutron.h | 8 +-
test/periodic/XSElementDlg.cxx | 350 +--
test/periodic/XSElementDlg.h | 50 +-
test/periodic/XSElementList.cxx | 190 +-
test/periodic/XSElementList.h | 28 +-
test/periodic/XSElements.cxx | 176 +-
test/periodic/XSElements.h | 102 +-
test/periodic/XSGraph.cxx | 28 +-
test/periodic/XSGraph.h | 34 +-
test/periodic/XSGui.cxx | 386 +--
test/periodic/XSGui.h | 110 +-
test/periodic/XSPeriodicTable.cxx | 382 +--
test/periodic/XSPeriodicTable.h | 52 +-
test/periodic/XSReactionDlg.cxx | 1714 ++++++-------
test/periodic/XSReactionDlg.h | 206 +-
test/periodic/XSStepButton.cxx | 80 +-
test/periodic/XSStepButton.h | 34 +-
test/periodic/XSVarious.cxx | 56 +-
test/periodic/XSVarious.h | 42 +-
test/sqlitetest.cxx | 400 +--
test/stressGraphics.cxx | 20 +-
test/stressHistFactory_models.cxx | 2 +-
test/stressHistFactory_tests.cxx | 94 +-
test/stressHistoFit.cxx | 2 +-
test/stressLinear.cxx | 12 +-
test/stressMathCore.cxx | 2 +-
test/stressRooFit.cxx | 6 +-
test/stressRooFit_tests.cxx | 30 +-
test/stressShapes.cxx | 2 +-
test/stressTMVA.cxx | 14 +-
test/stressVector.cxx | 31 +-
test/tcollbm.cxx | 24 +-
test/vlazy.cxx | 2 +-
test/vmatrix.cxx | 10 +-
tutorials/eve/alice_esd.C | 8 +-
tutorials/eve/alice_esd_split.C | 8 +-
tutorials/eve/boxset.C | 4 +-
tutorials/eve/boxset_cones.C | 2 +-
tutorials/eve/hierarchical_scene.C | 6 +-
tutorials/eve/jetcone.C | 4 +-
tutorials/eve/track.C | 36 +-
tutorials/fit/Ifit.C | 40 +-
tutorials/fit/TestBinomial.C | 62 +-
tutorials/fit/TwoHistoFit2D.C | 14 +-
tutorials/fit/fit2dHist.C | 2 +-
tutorials/fit/fitLinear2.C | 4 +-
tutorials/fit/langaus.C | 2 +-
tutorials/fit/multidimfit.C | 2 +-
tutorials/geom/csgdemo.C | 10 +-
tutorials/geom/geodemo.C | 3 +-
tutorials/geom/lego.C | 6 +-
tutorials/geom/station2.C | 4 +-
tutorials/graphics/canvas.C | 2 +-
tutorials/graphics/gaxis.C | 2 +-
tutorials/hist/ContourList.C | 4 +-
tutorials/hist/hsum.C | 2 +-
tutorials/hist/hsumTimer.C | 2 +-
tutorials/hist/logscales.C | 22 +-
tutorials/hist/th2polyEurope.C | 28 +-
tutorials/histfactory/ModifyInterpolation.C | 6 +-
tutorials/math/TSVDUnfoldExample.C | 2 +-
tutorials/math/binomial.C | 2 +-
tutorials/math/limit.C | 2 +-
tutorials/math/mathcoreGenVector.C | 20 +-
tutorials/math/mathcoreVectorFloatIO.C | 16 +-
tutorials/math/mathcoreVectorIO.C | 46 +-
tutorials/math/principal.C | 18 +-
tutorials/mc/CompareMasses.C | 102 +-
tutorials/pythia/pythiaExample.C | 4 +-
tutorials/ruby/tornado.rb | 6 +-
tutorials/tree/JetEvent.cxx | 6 +-
tutorials/tree/clonesA_Event.h | 2 +-
tutorials/tree/jets.C | 6 +-
tutorials/tree/parallelcoord.C | 2 +-
tutorials/tree/tree0.C | 2 +-
tutorials/xml/person.dtd | 2 +-
tutorials/xml/person.xml | 6 +-
tutorials/xml/saxexample.xml | 20 +-
466 files changed, 20801 insertions(+), 20804 deletions(-)
diff --git a/bindings/ruby/src/drr.cxx b/bindings/ruby/src/drr.cxx
index 248609a92f9..a86325623f9 100644
--- a/bindings/ruby/src/drr.cxx
+++ b/bindings/ruby/src/drr.cxx
@@ -754,7 +754,7 @@ static VALUE drr_singleton_missing(int argc, VALUE argv[], VALUE self)
/* Call a singleton method. */
char * methname = (char*) rb_id2name (rb_to_id(argv[0]));
char * classname = (char *) rb_class2name(self);
-
+
rb_scan_args (argc, argv, "0*", &inargs);
nargs = RARRAY_LEN(inargs) - 1;
diff --git a/bindings/ruby/src/rrcommon.h b/bindings/ruby/src/rrcommon.h
index baa6135e600..949ca7a0ca5 100644
--- a/bindings/ruby/src/rrcommon.h
+++ b/bindings/ruby/src/rrcommon.h
@@ -32,11 +32,11 @@
/* FIXME: This is from SWIG. */
#ifdef __cplusplus
-# ifndef RUBY_METHOD_FUNC /* These definitions should work for Ruby 1.4.6 */
+# ifndef RUBY_METHOD_FUNC /* These definitions should work for Ruby 1.4.6 */
# define VALUEFUNC(f) ((VALUE (*)()) f)
# define VOIDFUNC(f) ((void (*)()) f)
# else
-# ifndef ANYARGS /* These definitions should work for Ruby 1.6 */
+# ifndef ANYARGS /* These definitions should work for Ruby 1.6 */
# define VALUEFUNC(f) ((VALUE (*)()) f)
# define VOIDFUNC(f) ((RUBY_DATA_FUNC) f)
# else /* These definitions should work for Ruby 1.7 */
diff --git a/bindings/ruby/src/rrenums.h b/bindings/ruby/src/rrenums.h
index 083b0c10dad..901cd1b46e0 100644
--- a/bindings/ruby/src/rrenums.h
+++ b/bindings/ruby/src/rrenums.h
@@ -219,23 +219,23 @@ void init_global_enums (void)
rb_define_method (rb_cObject, "kCircle", VALUEFUNC (rr_kCircle), 0);
rb_define_method (rb_cObject, "kMultiply", VALUEFUNC (rr_kMultiply), 0);
rb_define_method (rb_cObject, "kFullDotSmall", VALUEFUNC (rr_kFullDotSmall),
- 0);
+ 0);
rb_define_method (rb_cObject, "kFullDotMedium",
- VALUEFUNC (rr_kFullDotMedium), 0);
+ VALUEFUNC (rr_kFullDotMedium), 0);
rb_define_method (rb_cObject, "kFullDotLarge", VALUEFUNC (rr_kFullDotLarge),
- 0);
+ 0);
rb_define_method (rb_cObject, "kFullCircle", VALUEFUNC (rr_kFullCircle), 0);
rb_define_method (rb_cObject, "kFullSquare", VALUEFUNC (rr_kFullSquare), 0);
rb_define_method (rb_cObject, "kFullTriangleUp",
- VALUEFUNC (rr_kFullTriangleUp), 0);
+ VALUEFUNC (rr_kFullTriangleUp), 0);
rb_define_method (rb_cObject, "kFullTriangleDown",
- VALUEFUNC (rr_kFullTriangleDown), 0);
+ VALUEFUNC (rr_kFullTriangleDown), 0);
rb_define_method (rb_cObject, "kOpenCircle", VALUEFUNC (rr_kOpenCircle), 0);
rb_define_method (rb_cObject, "kOpenSquare", VALUEFUNC (rr_kOpenSquare), 0);
rb_define_method (rb_cObject, "kOpenTriangleUp",
- VALUEFUNC (rr_kOpenTriangleUp), 0);
+ VALUEFUNC (rr_kOpenTriangleUp), 0);
rb_define_method (rb_cObject, "kOpenDiamond", VALUEFUNC (rr_kOpenDiamond),
- 0);
+ 0);
rb_define_method (rb_cObject, "kOpenCross", VALUEFUNC (rr_kOpenCross), 0);
rb_define_method (rb_cObject, "kFullStar", VALUEFUNC (rr_kFullStar), 0);
rb_define_method (rb_cObject, "kOpenStar", VALUEFUNC (rr_kOpenStar), 0);
diff --git a/build/rmkdepend/imakemdep.h b/build/rmkdepend/imakemdep.h
index 74224f5820d..4ed23d56d7f 100644
--- a/build/rmkdepend/imakemdep.h
+++ b/build/rmkdepend/imakemdep.h
@@ -190,8 +190,8 @@ in this Software without prior written authorization from the X Consortium.
* already fall under the existing category(ies).
*/
#if defined(SYSV) && !defined(_CRAY) && !defined(Mips) && !defined(_SEQUENT_) && !defined(sco)
-#define dup2(fd1,fd2) ((fd1 == fd2) ? fd1 : (close(fd2), \
- fcntl(fd1, F_DUPFD, fd2)))
+#define dup2(fd1,fd2) ((fd1 == fd2) ? fd1 : (close(fd2), \
+ fcntl(fd1, F_DUPFD, fd2)))
#endif
@@ -287,255 +287,255 @@ in this Software without prior written authorization from the X Consortium.
* that support multiple operating systems).
*/
-#define ARGUMENTS 50 /* number of arguments in various arrays */
+#define ARGUMENTS 50 /* number of arguments in various arrays */
char *cpp_argv[ARGUMENTS] = {
- "cc", /* replaced by the actual program to exec */
- "-I.", /* add current directory to include path */
+ "cc", /* replaced by the actual program to exec */
+ "-I.", /* add current directory to include path */
#ifdef unix
- "-Uunix", /* remove unix symbol so that filename unix.c okay */
+ "-Uunix", /* remove unix symbol so that filename unix.c okay */
#endif
#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(MACH)
# ifdef __i386__
- "-D__i386__",
+ "-D__i386__",
# endif
# ifdef __GNUC__
- "-traditional",
+ "-traditional",
# endif
#endif
#ifdef M4330
- "-DM4330", /* Tektronix */
+ "-DM4330", /* Tektronix */
#endif
#ifdef M4310
- "-DM4310", /* Tektronix */
+ "-DM4310", /* Tektronix */
#endif
#if defined(macII) || defined(_AUX_SOURCE)
- "-DmacII", /* Apple A/UX */
+ "-DmacII", /* Apple A/UX */
#endif
#if defined(USL) || defined(__USLC__)
- "-DUSL", /* USL */
+ "-DUSL", /* USL */
#endif
#ifdef sony
- "-Dsony", /* Sony */
+ "-Dsony", /* Sony */
#if !defined(SYSTYPE_SYSV) && !defined(_SYSTYPE_SYSV) && NEWSOS < 42
- "-Dbsd43",
+ "-Dbsd43",
#endif
#endif
#ifdef _IBMR2
- "-D_IBMR2", /* IBM RS-6000 (we ensured that aix is defined above */
+ "-D_IBMR2", /* IBM RS-6000 (we ensured that aix is defined above */
#ifndef aix
-#define aix /* allow BOOTSTRAPCFLAGS="-D_IBMR2" */
+#define aix /* allow BOOTSTRAPCFLAGS="-D_IBMR2" */
#endif
#endif /* _IBMR2 */
#ifdef aix
- "-Daix", /* AIX instead of AOS */
+ "-Daix", /* AIX instead of AOS */
#ifndef ibm
-#define ibm /* allow BOOTSTRAPCFLAGS="-Daix" */
+#define ibm /* allow BOOTSTRAPCFLAGS="-Daix" */
#endif
#endif /* aix */
#ifdef ibm
- "-Dibm", /* IBM PS/2 and RT under both AOS and AIX */
+ "-Dibm", /* IBM PS/2 and RT under both AOS and AIX */
#endif
#ifdef luna
- "-Dluna", /* OMRON luna 68K and 88K */
+ "-Dluna", /* OMRON luna 68K and 88K */
#ifdef luna1
- "-Dluna1",
+ "-Dluna1",
#endif
-#ifdef luna88k /* need not on UniOS-Mach Vers. 1.13 */
- "-traditional", /* for some older version */
-#endif /* instead of "-DXCOMM=\\#" */
+#ifdef luna88k /* need not on UniOS-Mach Vers. 1.13 */
+ "-traditional", /* for some older version */
+#endif /* instead of "-DXCOMM=\\#" */
#ifdef uniosb
- "-Duniosb",
+ "-Duniosb",
#endif
#ifdef uniosu
- "-Duniosu",
+ "-Duniosu",
#endif
#endif /* luna */
-#ifdef _CRAY /* Cray */
- "-Ucray",
+#ifdef _CRAY /* Cray */
+ "-Ucray",
#endif
#ifdef Mips
- "-DMips", /* Define and use Mips for Mips Co. OS/mach. */
+ "-DMips", /* Define and use Mips for Mips Co. OS/mach. */
# if defined(SYSTYPE_BSD) || defined(BSD) || defined(BSD43)
- "-DBSD43", /* Mips RISCOS supports two environments */
+ "-DBSD43", /* Mips RISCOS supports two environments */
# else
- "-DSYSV", /* System V environment is the default */
+ "-DSYSV", /* System V environment is the default */
# endif
#endif /* Mips */
#ifdef MOTOROLA
- "-DMOTOROLA", /* Motorola Delta Systems */
+ "-DMOTOROLA", /* Motorola Delta Systems */
# ifdef SYSV
- "-DSYSV",
+ "-DSYSV",
# endif
# ifdef SVR4
- "-DSVR4",
+ "-DSVR4",
# endif
#endif /* MOTOROLA */
#if defined(M_UNIX) || defined(sco)
- "-Dsco",
- "-DSYSV",
+ "-Dsco",
+ "-DSYSV",
#endif
#ifdef i386
- "-Di386",
+ "-Di386",
# ifdef SVR4
- "-DSVR4",
+ "-DSVR4",
# endif
# ifdef SYSV
- "-DSYSV",
+ "-DSYSV",
# ifdef ISC
- "-DISC",
+ "-DISC",
# ifdef ISC40
- "-DISC40", /* ISC 4.0 */
+ "-DISC40", /* ISC 4.0 */
# else
# ifdef ISC202
- "-DISC202", /* ISC 2.0.2 */
+ "-DISC202", /* ISC 2.0.2 */
# else
# ifdef ISC30
- "-DISC30", /* ISC 3.0 */
+ "-DISC30", /* ISC 3.0 */
# else
- "-DISC22", /* ISC 2.2.1 */
+ "-DISC22", /* ISC 2.2.1 */
# endif
# endif
# endif
# endif
# ifdef SCO
- "-DSCO",
+ "-DSCO",
# ifdef _SCO_DS
"-DSCO325 -DSVR4",
# endif
# endif
# endif
# ifdef ESIX
- "-DESIX",
+ "-DESIX",
# endif
# ifdef ATT
- "-DATT",
+ "-DATT",
# endif
# ifdef DELL
- "-DDELL",
+ "-DDELL",
# endif
#endif
#ifdef SYSV386 /* System V/386 folks, obsolete */
- "-Di386",
+ "-Di386",
# ifdef SVR4
- "-DSVR4",
+ "-DSVR4",
# endif
# ifdef ISC
- "-DISC",
+ "-DISC",
# ifdef ISC40
- "-DISC40", /* ISC 4.0 */
+ "-DISC40", /* ISC 4.0 */
# else
# ifdef ISC202
- "-DISC202", /* ISC 2.0.2 */
+ "-DISC202", /* ISC 2.0.2 */
# else
# ifdef ISC30
- "-DISC30", /* ISC 3.0 */
+ "-DISC30", /* ISC 3.0 */
# else
- "-DISC22", /* ISC 2.2.1 */
+ "-DISC22", /* ISC 2.2.1 */
# endif
# endif
# endif
# endif
# ifdef SCO
- "-DSCO",
+ "-DSCO",
# ifdef _SCO_DS
- "-DSCO325 -DSVR4",
+ "-DSCO325 -DSVR4",
# endif
# endif
# ifdef ESIX
- "-DESIX",
+ "-DESIX",
# endif
# ifdef ATT
- "-DATT",
+ "-DATT",
# endif
# ifdef DELL
- "-DDELL",
+ "-DDELL",
# endif
#endif
#ifdef __osf__
- "-D__osf__",
+ "-D__osf__",
# ifdef __mips__
- "-D__mips__",
+ "-D__mips__",
# endif
# ifdef __alpha
- "-D__alpha",
+ "-D__alpha",
# endif
# ifdef __alpha__
- "-D__alpha__",
+ "-D__alpha__",
# endif
# ifdef __i386__
- "-D__i386__",
+ "-D__i386__",
# endif
# ifdef __GNUC__
- "-traditional",
+ "-traditional",
# endif
#endif
#ifdef Oki
- "-DOki",
+ "-DOki",
#endif
#ifdef sun
#if defined(SVR4) || defined(__svr4__) || defined(__SVR4) || defined(__sol__)
- "-DSVR4",
+ "-DSVR4",
#endif
#endif
#ifdef WIN32
- "-DWIN32",
- "-nologo",
+ "-DWIN32",
+ "-nologo",
#if _MSC_VER < 1000
- "-batch",
+ "-batch",
#endif
- "-D__STDC__",
+ "-D__STDC__",
#endif
#ifdef NCR
- "-DNCR", /* NCR */
+ "-DNCR", /* NCR */
#endif
#ifdef linux
- "-traditional",
- "-Dlinux",
+ "-traditional",
+ "-Dlinux",
#endif
#ifdef __uxp__
- "-D__uxp__",
+ "-D__uxp__",
#endif
#ifdef __sxg__
- "-D__sxg__",
+ "-D__sxg__",
#endif
#ifdef nec_ews_svr2
- "-Dnec_ews_svr2",
+ "-Dnec_ews_svr2",
#endif
#ifdef AMOEBA
- "-DAMOEBA",
+ "-DAMOEBA",
# ifdef CROSS_COMPILE
- "-DCROSS_COMPILE",
+ "-DCROSS_COMPILE",
# ifdef CROSS_i80386
- "-Di80386",
+ "-Di80386",
# endif
# ifdef CROSS_sparc
- "-Dsparc",
+ "-Dsparc",
# endif
# ifdef CROSS_mc68000
- "-Dmc68000",
+ "-Dmc68000",
# endif
# else
# ifdef i80386
- "-Di80386",
+ "-Di80386",
# endif
# ifdef sparc
- "-Dsparc",
+ "-Dsparc",
# endif
# ifdef mc68000
- "-Dmc68000",
+ "-Dmc68000",
# endif
# endif
#endif
#if defined(__sgi) && defined(__ANSI_CPP__)
- "-cckr",
+ "-cckr",
#endif
#ifdef __minix_vmd
- "-Dminix",
+ "-Dminix",
#endif
#if defined(__EMX__)
- "-traditional",
- "-Demxos2",
+ "-traditional",
+ "-Demxos2",
#endif
};
@@ -543,59 +543,59 @@ char *cpp_argv[ARGUMENTS] = {
/*
* Step 6: DEFAULT_OS_MAJOR_REV, DEFAULT_OS_MINOR_REV, DEFAULT_OS_TEENY_REV,
- * and DEFAULT_OS_NAME.
- * If your systems provides a way to generate the default major,
- * minor, teeny, or system names at runtime add commands below.
- * The syntax of the _REV strings is 'f fmt' where 'f' is an argument
- * you would give to uname, and "fmt" is a scanf() format string.
- * Supported uname arguments are "snrvm", and if you specify multiple
- * arguments they will be separated by spaces. No more than 5 arguments
- * may be given. Unlike uname() order of arguments matters.
+ * and DEFAULT_OS_NAME.
+ * If your systems provides a way to generate the default major,
+ * minor, teeny, or system names at runtime add commands below.
+ * The syntax of the _REV strings is 'f fmt' where 'f' is an argument
+ * you would give to uname, and "fmt" is a scanf() format string.
+ * Supported uname arguments are "snrvm", and if you specify multiple
+ * arguments they will be separated by spaces. No more than 5 arguments
+ * may be given. Unlike uname() order of arguments matters.
*
- * DEFAULT_OS_MAJOR_REV_FROB, DEFAULT_OS_MINOR_REV_FROB,
- * DEFAULT_OS_TEENY_REV_FROB, and DEFAULT_OS_NAME_FROB can be used to
- * modify the results of the use of the various strings.
+ * DEFAULT_OS_MAJOR_REV_FROB, DEFAULT_OS_MINOR_REV_FROB,
+ * DEFAULT_OS_TEENY_REV_FROB, and DEFAULT_OS_NAME_FROB can be used to
+ * modify the results of the use of the various strings.
*/
#if defined(aix)
/* uname -v returns "x" (e.g. "4"), and uname -r returns "y" (e.g. "1") */
-# define DEFAULT_OS_MAJOR_REV "v %[0-9]"
-# define DEFAULT_OS_MINOR_REV "r %[0-9]"
+# define DEFAULT_OS_MAJOR_REV "v %[0-9]"
+# define DEFAULT_OS_MINOR_REV "r %[0-9]"
/* No information available to generate default OSTeenyVersion value. */
-# define DEFAULT_OS_NAME "srvm %[^\n]"
+# define DEFAULT_OS_NAME "srvm %[^\n]"
#elif defined(sun) || defined(sgi) || defined(ultrix) || defined(__uxp__) || defined(sony)
/* uname -r returns "x.y[.z]", e.g. "5.4" or "4.1.3" */
-# define DEFAULT_OS_MAJOR_REV "r %[0-9]"
-# define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]"
-# define DEFAULT_OS_TEENY_REV "r %*d.%*d.%[0-9]"
-# define DEFAULT_OS_NAME "srvm %[^\n]"
+# define DEFAULT_OS_MAJOR_REV "r %[0-9]"
+# define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]"
+# define DEFAULT_OS_TEENY_REV "r %*d.%*d.%[0-9]"
+# define DEFAULT_OS_NAME "srvm %[^\n]"
#elif defined(hpux)
/* uname -r returns "W.x.yz", e.g. "B.10.01" */
-# define DEFAULT_OS_MAJOR_REV "r %*[^.].%[0-9]"
-# define DEFAULT_OS_MINOR_REV "r %*[^.].%*d.%1s"
-# define DEFAULT_OS_TEENY_REV "r %*[^.].%*d.%*c%[0-9]"
-# define DEFAULT_OS_NAME "srvm %[^\n]"
+# define DEFAULT_OS_MAJOR_REV "r %*[^.].%[0-9]"
+# define DEFAULT_OS_MINOR_REV "r %*[^.].%*d.%1s"
+# define DEFAULT_OS_TEENY_REV "r %*[^.].%*d.%*c%[0-9]"
+# define DEFAULT_OS_NAME "srvm %[^\n]"
#elif defined(USL) || defined(__USLC__)
/* uname -v returns "x.yz" or "x.y.z", e.g. "2.02" or "2.1.2". */
-# define DEFAULT_OS_MAJOR_REV "v %[0-9]"
-# define DEFAULT_OS_MINOR_REV "v %*d.%1s"
-# define DEFAULT_OS_TEENY_REV "v %*d.%*c%[.0-9]"
-# define DEFAULT_OS_NAME "srvm %[^\n]"
+# define DEFAULT_OS_MAJOR_REV "v %[0-9]"
+# define DEFAULT_OS_MINOR_REV "v %*d.%1s"
+# define DEFAULT_OS_TEENY_REV "v %*d.%*c%[.0-9]"
+# define DEFAULT_OS_NAME "srvm %[^\n]"
#elif defined(__osf__)
/* uname -r returns "Wx.y", e.g. "V3.2" or "T4.0" */
-# define DEFAULT_OS_MAJOR_REV "r %*[^0-9]%[0-9]"
-# define DEFAULT_OS_MINOR_REV "r %*[^.].%[0-9]"
-# define DEFAULT_OS_NAME "srvm %[^\n]"
+# define DEFAULT_OS_MAJOR_REV "r %*[^0-9]%[0-9]"
+# define DEFAULT_OS_MINOR_REV "r %*[^.].%[0-9]"
+# define DEFAULT_OS_NAME "srvm %[^\n]"
#elif defined(__uxp__)
/* NOTE: "x.y[.z]" above handles UXP/DF. This is a sample alternative. */
/* uname -v returns "VxLy Yzzzzz ....", e.g. "V20L10 Y95021 Increment 5 ..." */
-# define DEFAULT_OS_MAJOR_REV "v V%[0-9]"
-# define DEFAULT_OS_MINOR_REV "v V%*dL%[0-9]"
-# define DEFAULT_OS_NAME "srvm %[^\n]"
+# define DEFAULT_OS_MAJOR_REV "v V%[0-9]"
+# define DEFAULT_OS_MINOR_REV "v V%*dL%[0-9]"
+# define DEFAULT_OS_NAME "srvm %[^\n]"
#elif defined(linux)
-# define DEFAULT_OS_MAJOR_REV "r %[0-9]"
-# define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]"
-# define DEFAULT_OS_TEENY_REV "r %*d.%*d.%[0-9]"
-# define DEFAULT_OS_NAME "srm %[^\n]"
+# define DEFAULT_OS_MAJOR_REV "r %[0-9]"
+# define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]"
+# define DEFAULT_OS_TEENY_REV "r %*d.%*d.%[0-9]"
+# define DEFAULT_OS_NAME "srm %[^\n]"
#elif defined(ISC)
/* ISC all Versions ? */
/* uname -r returns "x.y", e.g. "3.2" ,uname -v returns "x" e.g. "2" */
@@ -611,31 +611,31 @@ char *cpp_argv[ARGUMENTS] = {
# define DEFAULT_OS_TEENY_REV "r %*d.%*d.%[0-9]"
# define DEFAULT_OS_NAME "srm %[^\n]"
/* Use an alternate way to find the teeny version for -STABLE, -SNAP versions */
-# define DEFAULT_OS_TEENY_REV_FROB(buf, size) \
- do { \
- if (*buf == 0) { \
- int __mib[2]; \
- size_t __len; \
- int __osrel; \
- \
- __mib[0] = CTL_KERN; \
- __mib[1] = KERN_OSRELDATE; \
- __len = sizeof(__osrel); \
- sysctl(__mib, 2, &__osrel, &__len, NULL, 0); \
- if (__osrel < 210000) { \
- if (__osrel < 199607) \
- buf[0] = '0'; \
- else if (__osrel < 199612) \
- buf[0] = '5'; \
- else if (__osrel == 199612) \
- buf[0] = '6'; \
- else \
- buf[0] = '8'; /* guess */ \
- } else { \
- buf[0] = ((__osrel / 1000) % 10) + '0'; \
- } \
- buf[1] = 0; \
- } \
+# define DEFAULT_OS_TEENY_REV_FROB(buf, size) \
+ do { \
+ if (*buf == 0) { \
+ int __mib[2]; \
+ size_t __len; \
+ int __osrel; \
+ \
+ __mib[0] = CTL_KERN; \
+ __mib[1] = KERN_OSRELDATE; \
+ __len = sizeof(__osrel); \
+ sysctl(__mib, 2, &__osrel, &__len, NULL, 0); \
+ if (__osrel < 210000) { \
+ if (__osrel < 199607) \
+ buf[0] = '0'; \
+ else if (__osrel < 199612) \
+ buf[0] = '5'; \
+ else if (__osrel == 199612) \
+ buf[0] = '6'; \
+ else \
+ buf[0] = '8'; /* guess */ \
+ } else { \
+ buf[0] = ((__osrel / 1000) % 10) + '0'; \
+ } \
+ buf[1] = 0; \
+ } \
} while (0)
#elif defined(__OpenBSD__)
/* uname -r returns "x.y", e.g. "3.7" */
@@ -646,7 +646,7 @@ char *cpp_argv[ARGUMENTS] = {
#elif defined(__NetBSD__)
/*
* uname -r returns "x.y([ABCD...]|_mumble)", e.g.:
- * 1.2 1.2_BETA 1.2A 1.2B
+ * 1.2 1.2_BETA 1.2A 1.2B
*
* That means that we have to do something special to turn the
* TEENY revision into a form that we can use (i.e., a string of
@@ -659,19 +659,19 @@ char *cpp_argv[ARGUMENTS] = {
# define DEFAULT_OS_MAJOR_REV "r %[0-9]"
# define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]"
# define DEFAULT_OS_TEENY_REV "r %*d.%*d%[A-Z]"
-# define DEFAULT_OS_TEENY_REV_FROB(buf, size) \
- do { \
- if (*(buf) >= 'A' && *(buf) <= 'Z') /* sanity check */ \
- snprintf((buf), (size), "%d", *(buf) - 'A' + 1); \
- else \
- *(buf) = '\0'; \
+# define DEFAULT_OS_TEENY_REV_FROB(buf, size) \
+ do { \
+ if (*(buf) >= 'A' && *(buf) <= 'Z') /* sanity check */ \
+ snprintf((buf), (size), "%d", *(buf) - 'A' + 1); \
+ else \
+ *(buf) = '\0'; \
} while (0)
# define DEFAULT_OS_NAME "smr %[^\n]"
-# define DEFAULT_OS_NAME_FROB(buf, size) \
- do { \
- char *__sp; \
- if ((__sp = strchr((buf), ' ')) != NULL) \
- *__sp = '/'; \
+# define DEFAULT_OS_NAME_FROB(buf, size) \
+ do { \
+ char *__sp; \
+ if ((__sp = strchr((buf), ' ')) != NULL) \
+ *__sp = '/'; \
} while (0)
#endif
@@ -682,248 +682,248 @@ char *cpp_argv[ARGUMENTS] = {
* them to the the following table. The definition of struct symtab is
* in util/makedepend/def.h.
*/
-struct symtab predefs[] = {
+struct symtab predefs[] = {
#ifdef apollo
- {"apollo", "1"},
+ {"apollo", "1"},
#endif
#if defined(clipper) || defined(__clipper__)
- {"clipper", "1"},
- {"__clipper__", "1"},
- {"clix", "1"},
- {"__clix__", "1"},
+ {"clipper", "1"},
+ {"__clipper__", "1"},
+ {"clix", "1"},
+ {"__clix__", "1"},
#endif
#ifdef ibm032
- {"ibm032", "1"},
+ {"ibm032", "1"},
#endif
#ifdef ibm
- {"ibm", "1"},
+ {"ibm", "1"},
#endif
#ifdef aix
- {"aix", "1"},
+ {"aix", "1"},
#endif
#ifdef sun
- {"sun", "1"},
+ {"sun", "1"},
#endif
#ifdef sun2
- {"sun2", "1"},
+ {"sun2", "1"},
#endif
#ifdef sun3
- {"sun3", "1"},
+ {"sun3", "1"},
#endif
#ifdef sun4
- {"sun4", "1"},
+ {"sun4", "1"},
#endif
#ifdef sparc
- {"sparc", "1"},
+ {"sparc", "1"},
#endif
#ifdef __sparc__
- {"__sparc__", "1"},
+ {"__sparc__", "1"},
#endif
#ifdef hpux
- {"hpux", "1"},
+ {"hpux", "1"},
#endif
#ifdef __hpux
- {"__hpux", "1"},
+ {"__hpux", "1"},
#endif
#ifdef __hp9000s800
- {"__hp9000s800", "1"},
+ {"__hp9000s800", "1"},
#endif
#ifdef __hp9000s700
- {"__hp9000s700", "1"},
+ {"__hp9000s700", "1"},
#endif
#ifdef vax
- {"vax", "1"},
+ {"vax", "1"},
#endif
#ifdef VMS
- {"VMS", "1"},
+ {"VMS", "1"},
#endif
#ifdef cray
- {"cray", "1"},
+ {"cray", "1"},
#endif
#ifdef CRAY
- {"CRAY", "1"},
+ {"CRAY", "1"},
#endif
#ifdef _CRAY
- {"_CRAY", "1"},
+ {"_CRAY", "1"},
#endif
#ifdef att
- {"att", "1"},
+ {"att", "1"},
#endif
#ifdef mips
- {"mips", "1"},
+ {"mips", "1"},
#endif
#ifdef __mips__
- {"__mips__", "1"},
+ {"__mips__", "1"},
#endif
#ifdef ultrix
- {"ultrix", "1"},
+ {"ultrix", "1"},
#endif
#ifdef stellar
- {"stellar", "1"},
+ {"stellar", "1"},
#endif
#ifdef mc68000
- {"mc68000", "1"},
+ {"mc68000", "1"},
#endif
#ifdef mc68020
- {"mc68020", "1"},
+ {"mc68020", "1"},
#endif
#ifdef __GNUC__
- {"__GNUC__", "1"},
+ {"__GNUC__", "1"},
#endif
#if __STDC__
- {"__STDC__", "1"},
+ {"__STDC__", "1"},
#endif
#ifdef __HIGHC__
- {"__HIGHC__", "1"},
+ {"__HIGHC__", "1"},
#endif
#ifdef CMU
- {"CMU", "1"},
+ {"CMU", "1"},
#endif
#ifdef linux
- {"linux", "1"},
+ {"linux", "1"},
#endif
#ifdef luna
- {"luna", "1"},
+ {"luna", "1"},
#ifdef luna1
- {"luna1", "1"},
+ {"luna1", "1"},
#endif
#ifdef luna2
- {"luna2", "1"},
+ {"luna2", "1"},
#endif
#ifdef luna88k
- {"luna88k", "1"},
+ {"luna88k", "1"},
#endif
#ifdef uniosb
- {"uniosb", "1"},
+ {"uniosb", "1"},
#endif
#ifdef uniosu
- {"uniosu", "1"},
+ {"uniosu", "1"},
#endif
#endif
#ifdef ieeep754
- {"ieeep754", "1"},
+ {"ieeep754", "1"},
#endif
#ifdef is68k
- {"is68k", "1"},
+ {"is68k", "1"},
#endif
#ifdef m68k
- {"m68k", "1"},
+ {"m68k", "1"},
#endif
#ifdef m88k
- {"m88k", "1"},
+ {"m88k", "1"},
#endif
#ifdef __m88k__
- {"__m88k__", "1"},
+ {"__m88k__", "1"},
#endif
#ifdef bsd43
- {"bsd43", "1"},
+ {"bsd43", "1"},
#endif
#ifdef hcx
- {"hcx", "1"},
+ {"hcx", "1"},
#endif
#ifdef sony
- {"sony", "1"},
+ {"sony", "1"},
#ifdef SYSTYPE_SYSV
- {"SYSTYPE_SYSV", "1"},
+ {"SYSTYPE_SYSV", "1"},
#endif
#ifdef _SYSTYPE_SYSV
- {"_SYSTYPE_SYSV", "1"},
+ {"_SYSTYPE_SYSV", "1"},
#endif
#endif
#ifdef __OSF__
- {"__OSF__", "1"},
+ {"__OSF__", "1"},
#endif
#ifdef __osf__
- {"__osf__", "1"},
+ {"__osf__", "1"},
#endif
#ifdef __alpha
- {"__alpha", "1"},
+ {"__alpha", "1"},
#endif
#ifdef __alpha__
- {"__alpha__", "1"},
+ {"__alpha__", "1"},
#endif
#ifdef __DECC
- {"__DECC", "1"},
+ {"__DECC", "1"},
#endif
#ifdef __decc
- {"__decc", "1"},
+ {"__decc", "1"},
#endif
#ifdef __unix__
- {"__unix__", "1"},
+ {"__unix__", "1"},
#endif
#ifdef __uxp__
- {"__uxp__", "1"},
+ {"__uxp__", "1"},
#endif
#ifdef __sxg__
- {"__sxg__", "1"},
+ {"__sxg__", "1"},
#endif
#ifdef _SEQUENT_
- {"_SEQUENT_", "1"},
- {"__STDC__", "1"},
+ {"_SEQUENT_", "1"},
+ {"__STDC__", "1"},
#endif
#ifdef __bsdi__
- {"__bsdi__", "1"},
+ {"__bsdi__", "1"},
#endif
#ifdef nec_ews_svr2
- {"nec_ews_svr2", "1"},
+ {"nec_ews_svr2", "1"},
#endif
#ifdef nec_ews_svr4
- {"nec_ews_svr4", "1"},
+ {"nec_ews_svr4", "1"},
#endif
#ifdef _nec_ews_svr4
- {"_nec_ews_svr4", "1"},
+ {"_nec_ews_svr4", "1"},
#endif
#ifdef _nec_up
- {"_nec_up", "1"},
+ {"_nec_up", "1"},
#endif
#ifdef SX
- {"SX", "1"},
+ {"SX", "1"},
#endif
#ifdef nec
- {"nec", "1"},
+ {"nec", "1"},
#endif
#ifdef _nec_ft
- {"_nec_ft", "1"},
+ {"_nec_ft", "1"},
#endif
#ifdef PC_UX
- {"PC_UX", "1"},
+ {"PC_UX", "1"},
#endif
#ifdef sgi
- {"sgi", "1"},
+ {"sgi", "1"},
#endif
#ifdef __sgi
- {"__sgi", "1"},
+ {"__sgi", "1"},
#endif
#ifdef __FreeBSD__
- {"__FreeBSD__", "1"},
+ {"__FreeBSD__", "1"},
#endif
#ifdef __OpenBSD__
- {"__OpenBSD__", "1"},
+ {"__OpenBSD__", "1"},
#endif
#ifdef __NetBSD__
- {"__NetBSD__", "1"},
+ {"__NetBSD__", "1"},
#endif
#ifdef __ELF__
- {"__ELF__", "1"},
+ {"__ELF__", "1"},
#endif
#ifdef __EMX__
- {"__EMX__", "1"},
+ {"__EMX__", "1"},
#endif
#ifdef __APPLE__
- {"__APPLE__", "1"},
+ {"__APPLE__", "1"},
#endif
#ifdef __ppc__
- {"__ppc__", "1"},
+ {"__ppc__", "1"},
#endif
#ifdef __arm__
- {"__arm__", "1"},
+ {"__arm__", "1"},
#endif
#ifdef __x86_64__
- {"__x86_64__", "1"},
+ {"__x86_64__", "1"},
#endif
- /* add any additional symbols before this line */
- {NULL, NULL}
+ /* add any additional symbols before this line */
+ {NULL, NULL}
};
#endif /* MAKEDEPEND */
diff --git a/build/unix/git2cl.pl b/build/unix/git2cl.pl
index c3e8b44ad9f..4d633ea3596 100755
--- a/build/unix/git2cl.pl
+++ b/build/unix/git2cl.pl
@@ -35,38 +35,38 @@
=head1 NAME
-git2cl - tool to convert git logs to GNU ChangeLog
+ git2cl - tool to convert git logs to GNU ChangeLog
-=head1 SYNOPSIS
+ =head1 SYNOPSIS
-git2cl > ChangeLog
+ git2cl > ChangeLog
-If you don't want git2cl to invoke git log internally, you can use it
-as a pipe.
-It needs a git log generated with --pretty --numstat and --summary.
-You can use it as follows:
+ If you don't want git2cl to invoke git log internally, you can use it
+ as a pipe.
+ It needs a git log generated with --pretty --numstat and --summary.
+ You can use it as follows:
- git log --pretty --numstat --summary | git2cl > ChangeLog
+ git log --pretty --numstat --summary | git2cl > ChangeLog
-=head1 DESCRIPTION
+ =head1 DESCRIPTION
-This is a quick'n'dirty tool to convert git logs to GNU ChangeLog
-format.
+ This is a quick'n'dirty tool to convert git logs to GNU ChangeLog
+ format.
-The tool invokes `git log` internally unless you pipe a log to it.
-Thus, typically you would use it as follows:
+ The tool invokes `git log` internally unless you pipe a log to it.
+ Thus, typically you would use it as follows:
-=head1 SEE ALSO
+ =head1 SEE ALSO
-Output format specification:
- <http://www.gnu.org/prep/standards/html_node/Change-Logs.html>
+ Output format specification:
+ <http://www.gnu.org/prep/standards/html_node/Change-Logs.html>
-=head1 AUTHORS
+ =head1 AUTHORS
-git2cl is developed by Simon Josefsson <simon@josefsson.org>
- and Luis Mondesi <lemsx1@gmail.com>
+ git2cl is developed by Simon Josefsson <simon@josefsson.org>
+ and Luis Mondesi <lemsx1@gmail.com>
-=cut
+ =cut
use strict;
use POSIX qw(strftime);
@@ -78,237 +78,237 @@ use constant EMPTY_LOG_MESSAGE => '*** empty log message ***';
# this is a helper hash for stptime.
# Assumes you are calling 'git log ...' with LC_ALL=C
my %month = (
- 'Jan'=>0,
- 'Feb'=>1,
- 'Mar'=>2,
- 'Apr'=>3,
- 'May'=>4,
- 'Jun'=>5,
- 'Jul'=>6,
- 'Aug'=>7,
- 'Sep'=>8,
- 'Oct'=>9,
- 'Nov'=>10,
- 'Dec'=>11,
+'Jan'=>0,
+'Feb'=>1,
+'Mar'=>2,
+'Apr'=>3,
+'May'=>4,
+'Jun'=>5,
+'Jul'=>6,
+'Aug'=>7,
+'Sep'=>8,
+'Oct'=>9,
+'Nov'=>10,
+'Dec'=>11,
);
my $fh = new FileHandle;
sub key_ready
{
- my ($rin, $nfd);
- vec($rin, fileno(STDIN), 1) = 1;
- return $nfd = select($rin, undef, undef, 0);
+ my ($rin, $nfd);
+ vec($rin, fileno(STDIN), 1) = 1;
+ return $nfd = select($rin, undef, undef, 0);
}
sub strptime {
- my $str = shift;
- return undef if not defined $str;
-
- # we are parsing this format
- # Fri Oct 26 00:42:56 2007 -0400
- # to these fields
- # sec, min, hour, mday, mon, year, wday = -1, yday = -1, isdst = -1
- # Luis Mondesi <lemsx1@gmail.com>
- my @date;
- if ($str =~ /([[:alpha:]]{3})\s+([[:alpha:]]{3})\s+([[:digit:]]{1,2})\s+([[:digit:]]{1,2}):([[:digit:]]{1,2}):([[:digit:]]{1,2})\s+([[:digit:]]{4})/){
- push(@date,$6,$5,$4,$3,$month{$2},($7 - 1900),-1,-1,-1);
- } else {
- die ("Cannot parse date '$str'\n'");
- }
- return @date;
+ my $str = shift;
+ return undef if not defined $str;
+
+ # we are parsing this format
+ # Fri Oct 26 00:42:56 2007 -0400
+ # to these fields
+ # sec, min, hour, mday, mon, year, wday = -1, yday = -1, isdst = -1
+ # Luis Mondesi <lemsx1@gmail.com>
+ my @date;
+ if ($str =~ /([[:alpha:]]{3})\s+([[:alpha:]]{3})\s+([[:digit:]]{1,2})\s+([[:digit:]]{1,2}):([[:digit:]]{1,2}):([[:digit:]]{1,2})\s+([[:digit:]]{4})/){
+ push(@date,$6,$5,$4,$3,$month{$2},($7 - 1900),-1,-1,-1);
+ } else {
+ die ("Cannot parse date '$str'\n'");
+ }
+ return @date;
}
sub mywrap {
- my ($indent1, $indent2, @text) = @_;
- # If incoming text looks preformatted, don't get clever
- my $text = Text::Wrap::wrap($indent1, $indent2, @text);
- if ( grep /^\s+/m, @text ) {
- return $text;
- }
- my @lines = split /\n/, $text;
- $indent2 =~ s!^((?: {8})+)!"\t" x (length($1)/8)!e;
- $lines[0] =~ s/^$indent1\s+/$indent1/;
- s/^$indent2\s+/$indent2/
- for @lines[1..$#lines];
- my $newtext = join "\n", @lines;
- $newtext .= "\n"
- if substr($text, -1) eq "\n";
- return $newtext;
+ my ($indent1, $indent2, @text) = @_;
+ # If incoming text looks preformatted, don't get clever
+ my $text = Text::Wrap::wrap($indent1, $indent2, @text);
+ if ( grep /^\s+/m, @text ) {
+ return $text;
+ }
+ my @lines = split /\n/, $text;
+ $indent2 =~ s!^((?: {8})+)!"\t" x (length($1)/8)!e;
+ $lines[0] =~ s/^$indent1\s+/$indent1/;
+ s/^$indent2\s+/$indent2/
+ for @lines[1..$#lines];
+ my $newtext = join "\n", @lines;
+ $newtext .= "\n"
+ if substr($text, -1) eq "\n";
+ return $newtext;
}
sub last_line_len {
- my $files_list = shift;
- my @lines = split (/\n/, $files_list);
- my $last_line = pop (@lines);
- return length ($last_line);
+ my $files_list = shift;
+ my @lines = split (/\n/, $files_list);
+ my $last_line = pop (@lines);
+ return length ($last_line);
}
# A custom wrap function, sensitive to some common constructs used in
# log entries.
sub wrap_log_entry {
- my $text = shift; # The text to wrap.
- my $left_pad_str = shift; # String to pad with on the left.
-
- # These do NOT take left_pad_str into account:
- my $length_remaining = shift; # Amount left on current line.
- my $max_line_length = shift; # Amount left for a blank line.
-
- my $wrapped_text = ''; # The accumulating wrapped entry.
- my $user_indent = ''; # Inherited user_indent from prev line.
-
- my $first_time = 1; # First iteration of the loop?
- my $suppress_line_start_match = 0; # Set to disable line start checks.
-
- my @lines = split (/\n/, $text);
- while (@lines) # Don't use `foreach' here, it won't work.
- {
- my $this_line = shift (@lines);
- chomp $this_line;
-
- if ($this_line =~ /^(\s+)/) {
- $user_indent = $1;
- }
- else {
- $user_indent = '';
- }
-
- # If it matches any of the line-start regexps, print a newline now...
- if ($suppress_line_start_match)
- {
- $suppress_line_start_match = 0;
- }
- elsif (($this_line =~ /^(\s*)\*\s+[a-zA-Z0-9]/)
- || ($this_line =~ /^(\s*)\* [a-zA-Z0-9_\.\/\+-]+/)
- || ($this_line =~ /^(\s*)\([a-zA-Z0-9_\.\/\+-]+(\)|,\s*)/)
- || ($this_line =~ /^(\s+)(\S+)/)
- || ($this_line =~ /^(\s*)- +/)
- || ($this_line =~ /^()\s*$/)
- || ($this_line =~ /^(\s*)\*\) +/)
- || ($this_line =~ /^(\s*)[a-zA-Z0-9](\)|\.|\:) +/))
- {
- $length_remaining = $max_line_length - (length ($user_indent));
- }
-
- # Now that any user_indent has been preserved, strip off leading
- # whitespace, so up-folding has no ugly side-effects.
- $this_line =~ s/^\s*//;
-
- # Accumulate the line, and adjust parameters for next line.
- my $this_len = length ($this_line);
- if ($this_len == 0)
- {
- # Blank lines should cancel any user_indent level.
- $user_indent = '';
- $length_remaining = $max_line_length;
- }
- elsif ($this_len >= $length_remaining) # Line too long, try breaking it.
- {
- # Walk backwards from the end. At first acceptable spot, break
- # a new line.
- my $idx = $length_remaining - 1;
- if ($idx < 0) { $idx = 0 };
- while ($idx > 0)
- {
- if (substr ($this_line, $idx, 1) =~ /\s/)
- {
- my $line_now = substr ($this_line, 0, $idx);
- my $next_line = substr ($this_line, $idx);
- $this_line = $line_now;
-
- # Clean whitespace off the end.
- chomp $this_line;
-
- # The current line is ready to be printed.
- $this_line .= "\n${left_pad_str}";
-
- # Make sure the next line is allowed full room.
- $length_remaining = $max_line_length - (length ($user_indent));
-
- # Strip next_line, but then preserve any user_indent.
- $next_line =~ s/^\s*//;
-
- # Sneak a peek at the user_indent of the upcoming line, so
- # $next_line (which will now precede it) can inherit that
- # indent level. Otherwise, use whatever user_indent level
- # we currently have, which might be none.
- my $next_next_line = shift (@lines);
- if ((defined ($next_next_line)) && ($next_next_line =~ /^(\s+)/)) {
- $next_line = $1 . $next_line if (defined ($1));
- # $length_remaining = $max_line_length - (length ($1));
- $next_next_line =~ s/^\s*//;
- }
- else {
- $next_line = $user_indent . $next_line;
- }
- if (defined ($next_next_line)) {
- unshift (@lines, $next_next_line);
- }
- unshift (@lines, $next_line);
-
- # Our new next line might, coincidentally, begin with one of
- # the line-start regexps, so we temporarily turn off
- # sensitivity to that until we're past the line.
- $suppress_line_start_match = 1;
-
- last;
- }
- else
- {
- $idx--;
- }
- }
-
- if ($idx == 0)
- {
- # We bottomed out because the line is longer than the
- # available space. But that could be because the space is
- # small, or because the line is longer than even the maximum
- # possible space. Handle both cases below.
-
- if ($length_remaining == ($max_line_length - (length ($user_indent))))
- {
- # The line is simply too long -- there is no hope of ever
- # breaking it nicely, so just insert it verbatim, with
- # appropriate padding.
- $this_line = "\n${left_pad_str}${this_line}";
- }
- else
- {
- # Can't break it here, but may be able to on the next round...
- unshift (@lines, $this_line);
- $length_remaining = $max_line_length - (length ($user_indent));
- $this_line = "\n${left_pad_str}";
- }
- }
- }
- else # $this_len < $length_remaining, so tack on what we can.
- {
- # Leave a note for the next iteration.
- $length_remaining = $length_remaining - $this_len;
-
- if ($this_line =~ /\.$/)
- {
- $this_line .= " ";
- $length_remaining -= 2;
- }
- else # not a sentence end
- {
- $this_line .= " ";
- $length_remaining -= 1;
- }
- }
-
- # Unconditionally indicate that loop has run at least once.
- $first_time = 0;
-
- $wrapped_text .= "${user_indent}${this_line}";
- }
-
- # One last bit of padding.
- $wrapped_text .= "\n";
-
- return $wrapped_text;
+ my $text = shift; # The text to wrap.
+ my $left_pad_str = shift; # String to pad with on the left.
+
+ # These do NOT take left_pad_str into account:
+ my $length_remaining = shift; # Amount left on current line.
+ my $max_line_length = shift; # Amount left for a blank line.
+
+ my $wrapped_text = ''; # The accumulating wrapped entry.
+ my $user_indent = ''; # Inherited user_indent from prev line.
+
+ my $first_time = 1; # First iteration of the loop?
+ my $suppress_line_start_match = 0; # Set to disable line start checks.
+
+ my @lines = split (/\n/, $text);
+ while (@lines) # Don't use `foreach' here, it won't work.
+ {
+ my $this_line = shift (@lines);
+ chomp $this_line;
+
+ if ($this_line =~ /^(\s+)/) {
+ $user_indent = $1;
+ }
+ else {
+ $user_indent = '';
+ }
+
+ # If it matches any of the line-start regexps, print a newline now...
+ if ($suppress_line_start_match)
+ {
+ $suppress_line_start_match = 0;
+ }
+ elsif (($this_line =~ /^(\s*)\*\s+[a-zA-Z0-9]/)
+ || ($this_line =~ /^(\s*)\* [a-zA-Z0-9_\.\/\+-]+/)
+ || ($this_line =~ /^(\s*)\([a-zA-Z0-9_\.\/\+-]+(\)|,\s*)/)
+ || ($this_line =~ /^(\s+)(\S+)/)
+ || ($this_line =~ /^(\s*)- +/)
+ || ($this_line =~ /^()\s*$/)
+ || ($this_line =~ /^(\s*)\*\) +/)
+ || ($this_line =~ /^(\s*)[a-zA-Z0-9](\)|\.|\:) +/))
+ {
+ $length_remaining = $max_line_length - (length ($user_indent));
+ }
+
+ # Now that any user_indent has been preserved, strip off leading
+ # whitespace, so up-folding has no ugly side-effects.
+ $this_line =~ s/^\s*//;
+
+ # Accumulate the line, and adjust parameters for next line.
+ my $this_len = length ($this_line);
+ if ($this_len == 0)
+ {
+ # Blank lines should cancel any user_indent level.
+ $user_indent = '';
+ $length_remaining = $max_line_length;
+ }
+ elsif ($this_len >= $length_remaining) # Line too long, try breaking it.
+ {
+ # Walk backwards from the end. At first acceptable spot, break
+ # a new line.
+ my $idx = $length_remaining - 1;
+ if ($idx < 0) { $idx = 0 };
+ while ($idx > 0)
+ {
+ if (substr ($this_line, $idx, 1) =~ /\s/)
+ {
+ my $line_now = substr ($this_line, 0, $idx);
+ my $next_line = substr ($this_line, $idx);
+ $this_line = $line_now;
+
+ # Clean whitespace off the end.
+ chomp $this_line;
+
+ # The current line is ready to be printed.
+ $this_line .= "\n${left_pad_str}";
+
+ # Make sure the next line is allowed full room.
+ $length_remaining = $max_line_length - (length ($user_indent));
+
+ # Strip next_line, but then preserve any user_indent.
+ $next_line =~ s/^\s*//;
+
+ # Sneak a peek at the user_indent of the upcoming line, so
+ # $next_line (which will now precede it) can inherit that
+ # indent level. Otherwise, use whatever user_indent level
+ # we currently have, which might be none.
+ my $next_next_line = shift (@lines);
+ if ((defined ($next_next_line)) && ($next_next_line =~ /^(\s+)/)) {
+ $next_line = $1 . $next_line if (defined ($1));
+ # $length_remaining = $max_line_length - (length ($1));
+ $next_next_line =~ s/^\s*//;
+ }
+ else {
+ $next_line = $user_indent . $next_line;
+ }
+ if (defined ($next_next_line)) {
+ unshift (@lines, $next_next_line);
+ }
+ unshift (@lines, $next_line);
+
+ # Our new next line might, coincidentally, begin with one of
+ # the line-start regexps, so we temporarily turn off
+ # sensitivity to that until we're past the line.
+ $suppress_line_start_match = 1;
+
+ last;
+ }
+ else
+ {
+ $idx--;
+ }
+ }
+
+ if ($idx == 0)
+ {
+ # We bottomed out because the line is longer than the
+ # available space. But that could be because the space is
+ # small, or because the line is longer than even the maximum
+ # possible space. Handle both cases below.
+
+ if ($length_remaining == ($max_line_length - (length ($user_indent))))
+ {
+ # The line is simply too long -- there is no hope of ever
+ # breaking it nicely, so just insert it verbatim, with
+ # appropriate padding.
+ $this_line = "\n${left_pad_str}${this_line}";
+ }
+ else
+ {
+ # Can't break it here, but may be able to on the next round...
+ unshift (@lines, $this_line);
+ $length_remaining = $max_line_length - (length ($user_indent));
+ $this_line = "\n${left_pad_str}";
+ }
+ }
+ }
+ else # $this_len < $length_remaining, so tack on what we can.
+ {
+ # Leave a note for the next iteration.
+ $length_remaining = $length_remaining - $this_len;
+
+ if ($this_line =~ /\.$/)
+ {
+ $this_line .= " ";
+ $length_remaining -= 2;
+ }
+ else # not a sentence end
+ {
+ $this_line .= " ";
+ $length_remaining -= 1;
+ }
+ }
+
+ # Unconditionally indicate that loop has run at least once.
+ $first_time = 0;
+
+ $wrapped_text .= "${user_indent}${this_line}";
+ }
+
+ # One last bit of padding.
+ $wrapped_text .= "\n";
+
+ return $wrapped_text;
}
# main
@@ -328,86 +328,86 @@ $state = 0;
if (key_ready())
{
- #my $dummyfh; # don't care about writing
- #($fh,$dummyfh) = FileHandle::pipe;
- $fh->fdopen(*STDIN, 'r');
+ #my $dummyfh; # don't care about writing
+ #($fh,$dummyfh) = FileHandle::pipe;
+ $fh->fdopen(*STDIN, 'r');
}
else
{
- $fh->open("LC_ALL=C git log --pretty --numstat --summary|")
- or die("Cannot execute git log...$!\n");
+ $fh->open("LC_ALL=C git log --pretty --numstat --summary|")
+ or die("Cannot execute git log...$!\n");
}
while (my $_l = <$fh>) {
- #print STDERR "debug ($state, " . (@date ? (strftime "%Y-%m-%d", @date) : "") . "): `$_'\n";
- if ($state == 0) {
- if ($_l =~ m,^Author: (.*),) {
- $author = $1;
- }
- if ($_l =~ m,^Date: (.*),) {
- @date = strptime($1);
- }
- $state = 1 if ($_l =~ m,^$, and $author and (@date+0>0));
- } elsif ($state == 1) {
- # * modifying our input text is a bad choice
- # let's make a copy of it first, then we remove spaces
- # * if we meet a "merge branch" statement, we need to start
- # over and find a real entry
- # Luis Mondesi <lemsx1@gmail.com>
- my $_s = $_l;
- $_s =~ s/^ //g;
- if ($_s =~ m/^Merge branch/)
- {
- @date = ();
- $author = "";
- $state=0;
- next;
- }
- if ($_s =~ m/^git-svn-id:/)
- {
- next;
- }
- $comment = $comment . $_s;
- $state = 2 if ($_l =~ m,^$,);
- } elsif ($state == 2) {
- if ($_l =~ m,^([0-9]+)\t([0-9]+)\t(.*)$,) {
- push @files, $3;
- }
- $done = 1 if ($_l =~ m,^$,);
- }
-
- if ($done) {
- print (strftime "%Y-%m-%d $author\n\n", @date);
-
- my $files = join (", ", @files);
- $files = mywrap ("\t", "\t", "* $files"), ": ";
-
- if (index($comment, EMPTY_LOG_MESSAGE) > -1 ) {
- $comment = "[no log message]\n";
- }
-
- my $files_last_line_len = 0;
- $files_last_line_len = last_line_len($files) + 1;
- my $msg = wrap_log_entry($comment, "\t", 69-$files_last_line_len, 69);
-
- $msg =~ s/[ \t]+\n/\n/g;
-
- print "$files: $msg\n";
-
- @date = ();
- $author = "";
- @files = ();
- $comment = "";
-
- $state = 0;
- $done = 0;
- }
+ #print STDERR "debug ($state, " . (@date ? (strftime "%Y-%m-%d", @date) : "") . "): `$_'\n";
+ if ($state == 0) {
+ if ($_l =~ m,^Author: (.*),) {
+ $author = $1;
+ }
+ if ($_l =~ m,^Date: (.*),) {
+ @date = strptime($1);
+ }
+ $state = 1 if ($_l =~ m,^$, and $author and (@date+0>0));
+ } elsif ($state == 1) {
+ # * modifying our input text is a bad choice
+ # let's make a copy of it first, then we remove spaces
+ # * if we meet a "merge branch" statement, we need to start
+ # over and find a real entry
+ # Luis Mondesi <lemsx1@gmail.com>
+ my $_s = $_l;
+ $_s =~ s/^ //g;
+ if ($_s =~ m/^Merge branch/)
+ {
+ @date = ();
+ $author = "";
+ $state=0;
+ next;
+ }
+ if ($_s =~ m/^git-svn-id:/)
+ {
+ next;
+ }
+ $comment = $comment . $_s;
+ $state = 2 if ($_l =~ m,^$,);
+ } elsif ($state == 2) {
+ if ($_l =~ m,^([0-9]+)\t([0-9]+)\t(.*)$,) {
+ push @files, $3;
+ }
+ $done = 1 if ($_l =~ m,^$,);
+ }
+
+ if ($done) {
+ print (strftime "%Y-%m-%d $author\n\n", @date);
+
+ my $files = join (", ", @files);
+ $files = mywrap ("\t", "\t", "* $files"), ": ";
+
+ if (index($comment, EMPTY_LOG_MESSAGE) > -1 ) {
+ $comment = "[no log message]\n";
+ }
+
+ my $files_last_line_len = 0;
+ $files_last_line_len = last_line_len($files) + 1;
+ my $msg = wrap_log_entry($comment, "\t", 69-$files_last_line_len, 69);
+
+ $msg =~ s/[ \t]+\n/\n/g;
+
+ print "$files: $msg\n";
+
+ @date = ();
+ $author = "";
+ @files = ();
+ $comment = "";
+
+ $state = 0;
+ $done = 0;
+ }
}
if (@date + 0)
{
- print (strftime "%Y-%m-%d $author\n\n", @date);
- my $msg = wrap_log_entry($comment, "\t", 69, 69);
- $msg =~ s/[ \t]+\n/\n/g;
- print "\t* $msg\n";
+ print (strftime "%Y-%m-%d $author\n\n", @date);
+ my $msg = wrap_log_entry($comment, "\t", 69, 69);
+ $msg =~ s/[ \t]+\n/\n/g;
+ print "\t* $msg\n";
}
diff --git a/build/unix/installDavix.sh b/build/unix/installDavix.sh
index 436c08ede5c..87b13368a7d 100755
--- a/build/unix/installDavix.sh
+++ b/build/unix/installDavix.sh
@@ -209,7 +209,7 @@ if test ! "x$TARBALL" = "x" && test -f $TARBALL ; then
fi
if test "x$retrieve" = "xyes" ; then
if test "x$TARBALL" = "x" ; then
- TARBALL="http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/davix-$VERS.tar.gz"
+ TARBALL="http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/davix-$VERS.tar.gz"
TGTBALL="davix-$VERS.tar.gz"
else
TGTBALL=`basename $TARBALL`
diff --git a/build/unix/makedist.sh b/build/unix/makedist.sh
index 27a0b90f9cb..4c015d9c9c9 100755
--- a/build/unix/makedist.sh
+++ b/build/unix/makedist.sh
@@ -64,7 +64,7 @@ else
TAR=tar
else
if [ "x`which gtar 2>/dev/null | awk '{if ($1~/gtar/) print $1;}'`" != "x" ]; then
- TAR=gtar
+ TAR=gtar
fi
fi
if [ "x${TAR}" != "x" ]; then
diff --git a/build/unix/makelib.sh b/build/unix/makelib.sh
index 8643b498b21..05989d92bf5 100755
--- a/build/unix/makelib.sh
+++ b/build/unix/makelib.sh
@@ -132,14 +132,14 @@ elif [ $PLATFORM = "macosx" ]; then
fi
if [ $LIB != $BUNDLE ]; then
if [ $macosx_minor -ge 4 ]; then
- cmd="ln -fs `basename $LIB` $BUNDLE"
+ cmd="ln -fs `basename $LIB` $BUNDLE"
elif [ $macosx_minor -ge 3 ]; then
- cmd="$LD $LDFLAGS -bundle -undefined dynamic_lookup -o \
+ cmd="$LD $LDFLAGS -bundle -undefined dynamic_lookup -o \
$BUNDLE $OBJS `[ -d ${FINKDIR}/lib ] && echo -L${FINKDIR}/lib` \
-ldl $EXTRA $EXPLLNKCORE"
else
- cmd="$LD $LDFLAGS -bundle -undefined suppress -o $BUNDLE \
- $OBJS `[ -d ${FINKDIR}/lib ] && echo -L${FINKDIR}/lib` \
+ cmd="$LD $LDFLAGS -bundle -undefined suppress -o $BUNDLE \
+ $OBJS `[ -d ${FINKDIR}/lib ] && echo -L${FINKDIR}/lib` \
-ldl $EXTRA $EXPLLNKCORE"
fi
echo $cmd
@@ -203,17 +203,17 @@ fi
if [ "x$MAJOR" != "x" ]; then
if [ -f $LIB.$MAJOR.$MINOR ]; then
# Versioned library has format foo.so.3.05
- ln -fs $SONAME.$MAJOR.$MINOR $LIB.$MAJOR
- ln -fs $SONAME.$MAJOR $LIB
+ ln -fs $SONAME.$MAJOR.$MINOR $LIB.$MAJOR
+ ln -fs $SONAME.$MAJOR $LIB
elif [ -f $LIBVERS ]; then
- # Versioned library has format foo.3.05.so
- source_file=`echo $SONAME | sed "s/.*\./&${MINOR}./"`
- LIBNOMAJORMINOR=`echo $LIB|sed 's,\.'$MAJOR'\.'$MINOR',,'`
- if [ $LIB != $LIBNOMAJORMINOR ]; then
- LIBNOMINOR=`echo $LIB|sed 's,\.'$MINOR',,'`
- ln -fs $source_file $LIBNOMINOR
- ln -fs $source_file $LIBNOMAJORMINOR
- fi
+ # Versioned library has format foo.3.05.so
+ source_file=`echo $SONAME | sed "s/.*\./&${MINOR}./"`
+ LIBNOMAJORMINOR=`echo $LIB|sed 's,\.'$MAJOR'\.'$MINOR',,'`
+ if [ $LIB != $LIBNOMAJORMINOR ]; then
+ LIBNOMINOR=`echo $LIB|sed 's,\.'$MINOR',,'`
+ ln -fs $source_file $LIBNOMINOR
+ ln -fs $source_file $LIBNOMAJORMINOR
+ fi
fi
fi
diff --git a/build/unix/wingcc_ld.sh b/build/unix/wingcc_ld.sh
index f51e256a748..d37b64be1fd 100755
--- a/build/unix/wingcc_ld.sh
+++ b/build/unix/wingcc_ld.sh
@@ -12,10 +12,10 @@ while [ "$1" != "" ]; do
-o) args="$args $1"; shift;
dllname="$1"; dllbase=`basename $1`;
if [ "`echo $dllname | sed 's#^lib/.*\.dll$##'`" != "$dllname" ]; then
- isdll=1
- args="$args bin/$dllbase"
+ isdll=1
+ args="$args bin/$dllbase"
else
- args="$args $1"
+ args="$args $1"
fi ;;
*) args="$args $1" ;;
esac
diff --git a/build/win/ld.sh b/build/win/ld.sh
index 85370e93b05..634bb6d48d0 100755
--- a/build/win/ld.sh
+++ b/build/win/ld.sh
@@ -57,7 +57,7 @@ if [ "$dll" != "" -a -f $dll.manifest ]; then
fi
if [ "$dll" != "" ]; then
- rm -f "${dll}.res"
+ rm -f "${dll}.res"
fi
exit 0
diff --git a/build/win/makelib.sh b/build/win/makelib.sh
index 1356243f443..26e989c4cee 100755
--- a/build/win/makelib.sh
+++ b/build/win/makelib.sh
@@ -45,12 +45,12 @@ bindexp=bin/bindexplib
rm -f $R__LIB
if [ "$targetdir" = "lib" ]; then
- libdir=lib
- dlldir=bin
- relocated=x
+ libdir=lib
+ dlldir=bin
+ relocated=x
else
- libdir=$targetdir
- dlldir=$targetdir
+ libdir=$targetdir
+ dlldir=$targetdir
fi
if [ "$R__PLATFORM" = "win32" ]; then
diff --git a/build/win/makeresource.sh b/build/win/makeresource.sh
index 9163d71c6e8..fc2c583f968 100755
--- a/build/win/makeresource.sh
+++ b/build/win/makeresource.sh
@@ -5,7 +5,7 @@
# makeresource.sh <FILENAME>
# it will generate <FILENAME>.rc to be compiled with
# %.res: %.rc
-# rc -fo"$@" $< $CXXFLAGS
+# rc -fo"$@" $< $CXXFLAGS
# This .res file can then be passed to the linker like an object file.
#
# Author: Axel, 2009.
@@ -17,16 +17,16 @@ RC=$FILENAME.rc
FILESTEM=${FILEBASE%.*}
if [ "x`echo $FILENAME| grep -i '\.DLL$'`" = "x${FILENAME}" ]; then
- RCFILETYPE=VFT_DLL
- RCFILETITLE=library
+ RCFILETYPE=VFT_DLL
+ RCFILETITLE=library
else
- RCFILETYPE=VFT_APP
- RCFILETITLE=application
+ RCFILETYPE=VFT_APP
+ RCFILETITLE=application
fi
if [ "$FILEBASE" = "root.exe" ]; then
- RCFILEICON="101 ICON \"icons/RootIcon.ico\""
+ RCFILEICON="101 ICON \"icons/RootIcon.ico\""
else
- RCFILEICON=
+ RCFILEICON=
fi
# Use gitinfo.txt: more precise than the info in Rversion.h
diff --git a/cmake/modules/FindODBC.cmake b/cmake/modules/FindODBC.cmake
index d857abc4411..a376356af95 100644
--- a/cmake/modules/FindODBC.cmake
+++ b/cmake/modules/FindODBC.cmake
@@ -28,7 +28,7 @@ else()
/usr/local/include
/usr/local/include/odbc
/usr/local/odbc/include
- $ENV{ODBC_DIR}/include
+ $ENV{ODBC_DIR}/include
DOC "Specify the directory containing sql.h."
)
@@ -39,7 +39,7 @@ else()
/usr/local/lib
/usr/local/lib/odbc
/usr/local/odbc/lib
- $ENV{ODBC_DIR}/lib
+ $ENV{ODBC_DIR}/lib
DOC "Specify the ODBC driver manager library here."
)
if(ODBC_LIBRARY AND ODBC_INCLUDE_DIR)
diff --git a/cmake/modules/FindOracle.cmake b/cmake/modules/FindOracle.cmake
index 9a13eeb601e..3db8fb3b8dd 100644
--- a/cmake/modules/FindOracle.cmake
+++ b/cmake/modules/FindOracle.cmake
@@ -77,31 +77,31 @@ IF (NOT DEFINED ORACLE_OCI_VERSION)
IF(SQLPLUS_EXECUTABLE)
get_filename_component(bindir ${SQLPLUS_EXECUTABLE} PATH) # sqlplus executable needs its shared libraries
set(ENV{LD_LIBRARY_PATH} ${bindir}/../lib:$ENV{LD_LIBRARY_PATH})
- EXECUTE_PROCESS(COMMAND ${SQLPLUS_EXECUTABLE} -version OUTPUT_VARIABLE sqlplus_out)
- STRING(REGEX MATCH "([0-9.]+)" sqlplus_version ${sqlplus_out})
- MESSAGE(STATUS "Found sqlplus version: ${sqlplus_version}")
-
- # WARNING!
- # MATCHES operator is using Cmake regular expression.
- # so the e.g. 9.* does not expand like shell file mask
- # but as "9 and then any sequence of characters"
- IF (${sqlplus_version} MATCHES "8.*")
- SET(ORACLE_OCI_VERSION "8I")
- ELSEIF (${sqlplus_version} MATCHES "9.*")
- SET(ORACLE_OCI_VERSION "9")
+ EXECUTE_PROCESS(COMMAND ${SQLPLUS_EXECUTABLE} -version OUTPUT_VARIABLE sqlplus_out)
+ STRING(REGEX MATCH "([0-9.]+)" sqlplus_version ${sqlplus_out})
+ MESSAGE(STATUS "Found sqlplus version: ${sqlplus_version}")
+
+ # WARNING!
+ # MATCHES operator is using Cmake regular expression.
+ # so the e.g. 9.* does not expand like shell file mask
+ # but as "9 and then any sequence of characters"
+ IF (${sqlplus_version} MATCHES "8.*")
+ SET(ORACLE_OCI_VERSION "8I")
+ ELSEIF (${sqlplus_version} MATCHES "9.*")
+ SET(ORACLE_OCI_VERSION "9")
# do not change the order of the ora10 checking!
- ELSEIF (${sqlplus_version} MATCHES "10.2.*")
- SET(ORACLE_OCI_VERSION "10G_R2")
- ELSEIF (${sqlplus_version} MATCHES "10.*")
- SET(ORACLE_OCI_VERSION "10G")
- ELSEIF (${sqlplus_version} MATCHES "11.*")
- SET(ORACLE_OCI_VERSION "11G")
- ELSE (${sqlplus_version} MATCHES "8.*")
- SET(ORACLE_OCI_VERSION "10G_R2")
- ENDIF (${sqlplus_version} MATCHES "8.*")
-
- MESSAGE(STATUS "Guessed ORACLE_OCI_VERSION value: ${ORACLE_OCI_VERSION}")
- ENDIF()
+ ELSEIF (${sqlplus_version} MATCHES "10.2.*")
+ SET(ORACLE_OCI_VERSION "10G_R2")
+ ELSEIF (${sqlplus_version} MATCHES "10.*")
+ SET(ORACLE_OCI_VERSION "10G")
+ ELSEIF (${sqlplus_version} MATCHES "11.*")
+ SET(ORACLE_OCI_VERSION "11G")
+ ELSE (${sqlplus_version} MATCHES "8.*")
+ SET(ORACLE_OCI_VERSION "10G_R2")
+ ENDIF (${sqlplus_version} MATCHES "8.*")
+
+ MESSAGE(STATUS "Guessed ORACLE_OCI_VERSION value: ${ORACLE_OCI_VERSION}")
+ ENDIF()
ENDIF (NOT DEFINED ORACLE_OCI_VERSION)
diff --git a/cmake/modules/RootCPack.cmake b/cmake/modules/RootCPack.cmake
index eb18dfe6e3e..2747fbb7bf4 100644
--- a/cmake/modules/RootCPack.cmake
+++ b/cmake/modules/RootCPack.cmake
@@ -83,21 +83,21 @@ cpack_add_install_type(developer DISPLAY_NAME "Developer Installation")
cpack_add_component(applications
DISPLAY_NAME "ROOT Applications"
DESCRIPTION "ROOT executables such as root.exe"
- INSTALL_TYPES full minimal developer)
+ INSTALL_TYPES full minimal developer)
cpack_add_component(libraries
DISPLAY_NAME "ROOT Libraries"
DESCRIPTION "All ROOT libraries and dictionaries"
- INSTALL_TYPES full minimal developer)
+ INSTALL_TYPES full minimal developer)
cpack_add_component(headers
DISPLAY_NAME "C++ Headers"
DESCRIPTION "These are needed to do any development"
- INSTALL_TYPES full developer)
-
+ INSTALL_TYPES full developer)
+
cpack_add_component(tests
DISPLAY_NAME "ROOT Tests and Tutorials"
DESCRIPTION "These are needed to do any test and tutorial"
- INSTALL_TYPES full developer)
+ INSTALL_TYPES full developer)
diff --git a/cmake/modules/RootNewMacros.cmake b/cmake/modules/RootNewMacros.cmake
index f8fbf100f2b..31c47dc4088 100644
--- a/cmake/modules/RootNewMacros.cmake
+++ b/cmake/modules/RootNewMacros.cmake
@@ -387,7 +387,7 @@ function(ROOT_LINKER_LIBRARY library)
# set(lib_objs ${lib_objs} ${library}.dir/${CMAKE_CFG_INTDIR}/${name}.obj)
# endif()
#endforeach()
- set(lib_objs ${lib_objs} ${library}.dir/${CMAKE_CFG_INTDIR}/*.obj)
+ set(lib_objs ${lib_objs} ${library}.dir/${CMAKE_CFG_INTDIR}/*.obj)
else()
foreach(src1 ${lib_srcs})
if(NOT src1 MATCHES "[.]h$|[.]icc$|[.]hxx$|[.]hpp$")
diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
index 6cf26241ef1..b6841dd9ad1 100644
--- a/cmake/modules/SearchInstalledSoftware.cmake
+++ b/cmake/modules/SearchInstalledSoftware.cmake
@@ -34,7 +34,7 @@ if(NOT builtin_freetype)
set(FREETYPE_INCLUDE_DIR ${FREETYPE_INCLUDE_DIR_freetype2})
else()
message(STATUS "FreeType not found. Switching on builtin_freetype option")
- set(builtin_freetype ON CACHE BOOL "" FORCE)
+ set(builtin_freetype ON CACHE BOOL "" FORCE)
endif()
endif()
if(builtin_freetype)
@@ -54,7 +54,7 @@ if(NOT builtin_pcre)
if(PCRE_FOUND)
else()
message(STATUS "PCRE not found. Switching on builtin_pcre option")
- set(builtin_pcre ON CACHE BOOL "" FORCE)
+ set(builtin_pcre ON CACHE BOOL "" FORCE)
endif()
endif()
if(builtin_pcre)
@@ -73,7 +73,7 @@ if(NOT builtin_lzma)
if(LZMA_FOUND)
else()
message(STATUS "LZMA not found. Switching on builtin_lzma option")
- set(builtin_lzma ON CACHE BOOL "" FORCE)
+ set(builtin_lzma ON CACHE BOOL "" FORCE)
endif()
endif()
if(builtin_lzma)
@@ -81,14 +81,14 @@ if(builtin_lzma)
message(STATUS "Building LZMA version ${lzma_version} included in ROOT itself")
if(WIN32)
ExternalProject_Add(
- LZMA
- URL ${CMAKE_SOURCE_DIR}/core/lzma/src/xz-${lzma_version}-win32.tar.gz
- URL_MD5 65693dc257802b6778c28ed53ecca678
- PREFIX LZMA
- INSTALL_DIR ${CMAKE_BINARY_DIR}
+ LZMA
+ URL ${CMAKE_SOURCE_DIR}/core/lzma/src/xz-${lzma_version}-win32.tar.gz
+ URL_MD5 65693dc257802b6778c28ed53ecca678
+ PREFIX LZMA
+ INSTALL_DIR ${CMAKE_BINARY_DIR}
CONFIGURE_COMMAND "" BUILD_COMMAND ""
- INSTALL_COMMAND cmake -E copy lib/liblzma.dll <INSTALL_DIR>/bin
- BUILD_IN_SOURCE 1)
+ INSTALL_COMMAND cmake -E copy lib/liblzma.dll <INSTALL_DIR>/bin
+ BUILD_IN_SOURCE 1)
install(FILES ${CMAKE_BINARY_DIR}/LZMA/src/LZMA/lib/liblzma.dll DESTINATION ${CMAKE_INSTALL_BINDIR})
set(LZMA_LIBRARIES ${CMAKE_BINARY_DIR}/LZMA/src/LZMA/lib/liblzma.lib)
set(LZMA_INCLUDE_DIR ${CMAKE_BINARY_DIR}/LZMA/src/LZMA/include)
@@ -163,7 +163,7 @@ if(NOT builtin_afterimage)
find_package(AfterImage)
if(NOT AFTERIMAGE_FOUND)
message(STATUS "AfterImage not found. Switching on builtin_afterimage option")
- set(builtin_afterimage ON CACHE BOOL "" FORCE)
+ set(builtin_afterimage ON CACHE BOOL "" FORCE)
endif()
endif()
diff --git a/cmake/modules/WriteConfigCint.cmake b/cmake/modules/WriteConfigCint.cmake
index 27ff7105351..b6ce68e8699 100644
--- a/cmake/modules/WriteConfigCint.cmake
+++ b/cmake/modules/WriteConfigCint.cmake
@@ -59,7 +59,7 @@ function(WRITE_CONFIG_CINT file)
write_file(${file} "#define G__CFG_LDOUT \"-out:\"" APPEND)
write_file(${file} "#define G__CFG_LIBL \"lib@imp@\"" APPEND)
write_file(${file} "#define G__CFG_LIBEXT \".lib\"" APPEND)
- write_file(${file} "#define G__CFG_IMPLIBEXT \".lib\"" APPEND)
+ write_file(${file} "#define G__CFG_IMPLIBEXT \".lib\"" APPEND)
write_file(${file} "#define G__CFG_MANGLEPATHS \"echo \"" APPEND)
write_file(${file} "#define G__CFG_PLATFORMO \"vc_${MSVC_VERSION}\"" APPEND)
write_file(${file} "#define G__CFG_AR \"lib /OUT:\"" APPEND)
diff --git a/etc/HistFactorySchema.dtd b/etc/HistFactorySchema.dtd
index 99d20ab2cbb..2bc31f19dd3 100644
--- a/etc/HistFactorySchema.dtd
+++ b/etc/HistFactorySchema.dtd
@@ -11,9 +11,9 @@
<!-- Input files detailing the channels. One channel per file -->
<!ELEMENT Function EMPTY>
<!ATTLIST Function
- Name CDATA #REQUIRED
- Expression CDATA #REQUIRED
- Dependents CDATA #REQUIRED
+ Name CDATA #REQUIRED
+ Expression CDATA #REQUIRED
+ Dependents CDATA #REQUIRED
>
<!-- Input files detailing the channels. One channel per file -->
@@ -105,7 +105,7 @@ For this element there is no sublemenents so the setting will only have local ef
<!-- Systematics for which the variation is provided by histograms -->
<!ELEMENT StatError EMPTY>
<!ATTLIST StatError
- Activate CDATA #REQUIRED
+ Activate CDATA #REQUIRED
HistoName CDATA #IMPLIED
InputFile CDATA #IMPLIED
HistoPath CDATA #IMPLIED
diff --git a/etc/cmake/FindROOT.cmake b/etc/cmake/FindROOT.cmake
index c5fef351c1a..b2100174362 100644
--- a/etc/cmake/FindROOT.cmake
+++ b/etc/cmake/FindROOT.cmake
@@ -44,7 +44,7 @@ endif()
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(ROOT DEFAULT_MSG ROOT_CONFIG_EXECUTABLE
- ROOTSYS ROOT_VERSION ROOT_INCLUDE_DIR ROOT_LIBRARIES ROOT_LIBRARY_DIR)
+ ROOTSYS ROOT_VERSION ROOT_INCLUDE_DIR ROOT_LIBRARIES ROOT_LIBRARY_DIR)
mark_as_advanced(ROOT_CONFIG_EXECUTABLE)
@@ -64,7 +64,7 @@ function(ROOT_GENERATE_DICTIONARY dictionary)
get_directory_property(incdirs INCLUDE_DIRECTORIES)
set(includedirs)
foreach( d ${incdirs})
- set(includedirs ${includedirs} -I${d})
+ set(includedirs ${includedirs} -I${d})
endforeach()
#---Get the list of header files-------------------------
set(headerfiles)
diff --git a/etc/html/ROOT.css b/etc/html/ROOT.css
index 0144081332f..33c58bcf918 100755
--- a/etc/html/ROOT.css
+++ b/etc/html/ROOT.css
@@ -500,11 +500,11 @@ td.funcname {
}
span.funcprop
{
- margin-left: 1em;
- background-color: #FFFFCC;
- border: solid 1px #FFFF33;
- font-size: 80%;
- font-weight: bold;
+ margin-left: 1em;
+ background-color: #FFFFCC;
+ border: solid 1px #FFFF33;
+ font-size: 80%;
+ font-weight: bold;
}
td.dataname {
font-weight: bolder;
diff --git a/etc/http/JSRootIO/style/JSRootInterface.css b/etc/http/JSRootIO/style/JSRootInterface.css
index f3d92e2e7b7..45b21e9e1c4 100644
--- a/etc/http/JSRootIO/style/JSRootInterface.css
+++ b/etc/http/JSRootIO/style/JSRootInterface.css
@@ -132,32 +132,32 @@ button.closeButton {
|--------------------------------------------------*/
.dtree {
- font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
- font-size: 11px;
- color: #666;
- white-space: nowrap;
+ font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ color: #666;
+ white-space: nowrap;
}
.dtree img {
- border: 0px;
- vertical-align: middle;
+ border: 0px;
+ vertical-align: middle;
}
.dtree a {
- color: #333;
- text-decoration: none;
+ color: #333;
+ text-decoration: none;
}
.dtree a.node, .dtree a.nodeSel {
- white-space: nowrap;
- padding: 1px 2px 1px 2px;
+ white-space: nowrap;
+ padding: 1px 2px 1px 2px;
}
.dtree a.node:hover, .dtree a.nodeSel:hover {
- color: #333;
- text-decoration: underline;
+ color: #333;
+ text-decoration: underline;
}
.dtree a.nodeSel {
- background-color: #c0d2ec;
+ background-color: #c0d2ec;
}
.dtree .clip {
- overflow: hidden;
+ overflow: hidden;
}
/*--------------------------------------------------|
diff --git a/etc/http/JSRootIO/style/dtree.css b/etc/http/JSRootIO/style/dtree.css
index c1b72e97239..4a115fc7289 100644
--- a/etc/http/JSRootIO/style/dtree.css
+++ b/etc/http/JSRootIO/style/dtree.css
@@ -5,30 +5,30 @@
|--------------------------------------------------*/
.dtree {
- font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
- font-size: 11px;
- color: #666;
- white-space: nowrap;
+ font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ color: #666;
+ white-space: nowrap;
}
.dtree img {
- border: 0px;
- vertical-align: middle;
+ border: 0px;
+ vertical-align: middle;
}
.dtree a {
- color: #333;
- text-decoration: none;
+ color: #333;
+ text-decoration: none;
}
.dtree a.node, .dtree a.nodeSel {
- white-space: nowrap;
- padding: 1px 2px 1px 2px;
+ white-space: nowrap;
+ padding: 1px 2px 1px 2px;
}
.dtree a.node:hover, .dtree a.nodeSel:hover {
- color: #333;
- text-decoration: underline;
+ color: #333;
+ text-decoration: underline;
}
.dtree a.nodeSel {
- background-color: #c0d2ec;
+ background-color: #c0d2ec;
}
.dtree .clip {
- overflow: hidden;
+ overflow: hidden;
}
diff --git a/etc/http/JSRootIO/style/jquery-ui.css b/etc/http/JSRootIO/style/jquery-ui.css
index d9784b0f7fd..6cf00fabdac 100644
--- a/etc/http/JSRootIO/style/jquery-ui.css
+++ b/etc/http/JSRootIO/style/jquery-ui.css
@@ -7,59 +7,59 @@
/* Layout helpers
----------------------------------*/
.ui-helper-hidden {
- display: none;
+ display: none;
}
.ui-helper-hidden-accessible {
- border: 0;
- clip: rect(0 0 0 0);
- height: 1px;
- margin: -1px;
- overflow: hidden;
- padding: 0;
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0 0 0 0);
+ height: 1px;
+ margin: -1px;
+ overflow: hidden;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.ui-helper-reset {
- margin: 0;
- padding: 0;
- border: 0;
- outline: 0;
- line-height: 1.3;
- text-decoration: none;
- font-size: 100%;
- list-style: none;
+ margin: 0;
+ padding: 0;
+ border: 0;
+ outline: 0;
+ line-height: 1.3;
+ text-decoration: none;
+ font-size: 100%;
+ list-style: none;
}
.ui-helper-clearfix:before,
.ui-helper-clearfix:after {
- content: "";
- display: table;
- border-collapse: collapse;
+ content: "";
+ display: table;
+ border-collapse: collapse;
}
.ui-helper-clearfix:after {
- clear: both;
+ clear: both;
}
.ui-helper-clearfix {
- min-height: 0; /* support: IE7 */
+ min-height: 0; /* support: IE7 */
}
.ui-helper-zfix {
- width: 100%;
- height: 100%;
- top: 0;
- left: 0;
- position: absolute;
- opacity: 0;
- filter:Alpha(Opacity=0);
+ width: 100%;
+ height: 100%;
+ top: 0;
+ left: 0;
+ position: absolute;
+ opacity: 0;
+ filter:Alpha(Opacity=0);
}
.ui-front {
- z-index: 100;
+ z-index: 100;
}
/* Interaction Cues
----------------------------------*/
.ui-state-disabled {
- cursor: default !important;
+ cursor: default !important;
}
@@ -68,10 +68,10 @@
/* states and images */
.ui-icon {
- display: block;
- text-indent: -99999px;
- overflow: hidden;
- background-repeat: no-repeat;
+ display: block;
+ text-indent: -99999px;
+ overflow: hidden;
+ background-repeat: no-repeat;
}
@@ -80,107 +80,107 @@
/* Overlays */
.ui-widget-overlay {
- position: fixed;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
}
.ui-accordion .ui-accordion-header {
- display: block;
- cursor: pointer;
- position: relative;
- margin-top: 2px;
- padding: .5em .5em .5em .7em;
- min-height: 0; /* support: IE7 */
+ display: block;
+ cursor: pointer;
+ position: relative;
+ margin-top: 2px;
+ padding: .5em .5em .5em .7em;
+ min-height: 0; /* support: IE7 */
}
.ui-accordion .ui-accordion-icons {
- padding-left: 2.2em;
+ padding-left: 2.2em;
}
.ui-accordion .ui-accordion-noicons {
- padding-left: .7em;
+ padding-left: .7em;
}
.ui-accordion .ui-accordion-icons .ui-accordion-icons {
- padding-left: 2.2em;
+ padding-left: 2.2em;
}
.ui-accordion .ui-accordion-header .ui-accordion-header-icon {
- position: absolute;
- left: .5em;
- top: 50%;
- margin-top: -8px;
+ position: absolute;
+ left: .5em;
+ top: 50%;
+ margin-top: -8px;
}
.ui-accordion .ui-accordion-content {
- padding: 1em 2.2em;
- border-top: 0;
- overflow: auto;
+ padding: 1em 2.2em;
+ border-top: 0;
+ overflow: auto;
}
.ui-autocomplete {
- position: absolute;
- top: 0;
- left: 0;
- cursor: default;
+ position: absolute;
+ top: 0;
+ left: 0;
+ cursor: default;
}
.ui-button {
- display: inline-block;
- position: relative;
- padding: 0;
- line-height: normal;
- margin-right: .1em;
- cursor: pointer;
- vertical-align: middle;
- text-align: center;
- overflow: visible; /* removes extra width in IE */
+ display: inline-block;
+ position: relative;
+ padding: 0;
+ line-height: normal;
+ margin-right: .1em;
+ cursor: pointer;
+ vertical-align: middle;
+ text-align: center;
+ overflow: visible; /* removes extra width in IE */
}
.ui-button,
.ui-button:link,
.ui-button:visited,
.ui-button:hover,
.ui-button:active {
- text-decoration: none;
+ text-decoration: none;
}
/* to make room for the icon, a width needs to be set here */
.ui-button-icon-only {
- width: 2.2em;
+ width: 2.2em;
}
/* button elements seem to need a little more width */
button.ui-button-icon-only {
- width: 2.4em;
+ width: 2.4em;
}
.ui-button-icons-only {
- width: 3.4em;
+ width: 3.4em;
}
button.ui-button-icons-only {
- width: 3.7em;
+ width: 3.7em;
}
/* button text element */
.ui-button .ui-button-text {
- display: block;
- line-height: normal;
+ display: block;
+ line-height: normal;
}
.ui-button-text-only .ui-button-text {
- padding: .4em 1em;
+ padding: .4em 1em;
}
.ui-button-icon-only .ui-button-text,
.ui-button-icons-only .ui-button-text {
- padding: .4em;
- text-indent: -9999999px;
+ padding: .4em;
+ text-indent: -9999999px;
}
.ui-button-text-icon-primary .ui-button-text,
.ui-button-text-icons .ui-button-text {
- padding: .4em 1em .4em 2.1em;
+ padding: .4em 1em .4em 2.1em;
}
.ui-button-text-icon-secondary .ui-button-text,
.ui-button-text-icons .ui-button-text {
- padding: .4em 2.1em .4em 1em;
+ padding: .4em 2.1em .4em 1em;
}
.ui-button-text-icons .ui-button-text {
- padding-left: 2.1em;
- padding-right: 2.1em;
+ padding-left: 2.1em;
+ padding-right: 2.1em;
}
/* no icon support for input elements, provide padding by default */
input.ui-button {
- padding: .4em 1em;
+ padding: .4em 1em;
}
/* button icon element(s) */
@@ -189,634 +189,634 @@ input.ui-button {
.ui-button-text-icon-secondary .ui-icon,
.ui-button-text-icons .ui-icon,
.ui-button-icons-only .ui-icon {
- position: absolute;
- top: 50%;
- margin-top: -8px;
+ position: absolute;
+ top: 50%;
+ margin-top: -8px;
}
.ui-button-icon-only .ui-icon {
- left: 50%;
- margin-left: -8px;
+ left: 50%;
+ margin-left: -8px;
}
.ui-button-text-icon-primary .ui-button-icon-primary,
.ui-button-text-icons .ui-button-icon-primary,
.ui-button-icons-only .ui-button-icon-primary {
- left: .5em;
+ left: .5em;
}
.ui-button-text-icon-secondary .ui-button-icon-secondary,
.ui-button-text-icons .ui-button-icon-secondary,
.ui-button-icons-only .ui-button-icon-secondary {
- right: .5em;
+ right: .5em;
}
/* button sets */
.ui-buttonset {
- margin-right: 7px;
+ margin-right: 7px;
}
.ui-buttonset .ui-button {
- margin-left: 0;
- margin-right: -.3em;
+ margin-left: 0;
+ margin-right: -.3em;
}
/* workarounds */
/* reset extra padding in Firefox, see h5bp.com/l */
input.ui-button::-moz-focus-inner,
button.ui-button::-moz-focus-inner {
- border: 0;
- padding: 0;
+ border: 0;
+ padding: 0;
}
.ui-datepicker {
- width: 17em;
- padding: .2em .2em 0;
- display: none;
+ width: 17em;
+ padding: .2em .2em 0;
+ display: none;
}
.ui-datepicker .ui-datepicker-header {
- position: relative;
- padding: .2em 0;
+ position: relative;
+ padding: .2em 0;
}
.ui-datepicker .ui-datepicker-prev,
.ui-datepicker .ui-datepicker-next {
- position: absolute;
- top: 2px;
- width: 1.8em;
- height: 1.8em;
+ position: absolute;
+ top: 2px;
+ width: 1.8em;
+ height: 1.8em;
}
.ui-datepicker .ui-datepicker-prev-hover,
.ui-datepicker .ui-datepicker-next-hover {
- top: 1px;
+ top: 1px;
}
.ui-datepicker .ui-datepicker-prev {
- left: 2px;
+ left: 2px;
}
.ui-datepicker .ui-datepicker-next {
- right: 2px;
+ right: 2px;
}
.ui-datepicker .ui-datepicker-prev-hover {
- left: 1px;
+ left: 1px;
}
.ui-datepicker .ui-datepicker-next-hover {
- right: 1px;
+ right: 1px;
}
.ui-datepicker .ui-datepicker-prev span,
.ui-datepicker .ui-datepicker-next span {
- display: block;
- position: absolute;
- left: 50%;
- margin-left: -8px;
- top: 50%;
- margin-top: -8px;
+ display: block;
+ position: absolute;
+ left: 50%;
+ margin-left: -8px;
+ top: 50%;
+ margin-top: -8px;
}
.ui-datepicker .ui-datepicker-title {
- margin: 0 2.3em;
- line-height: 1.8em;
- text-align: center;
+ margin: 0 2.3em;
+ line-height: 1.8em;
+ text-align: center;
}
.ui-datepicker .ui-datepicker-title select {
- font-size: 1em;
- margin: 1px 0;
+ font-size: 1em;
+ margin: 1px 0;
}
.ui-datepicker select.ui-datepicker-month-year {
- width: 100%;
+ width: 100%;
}
.ui-datepicker select.ui-datepicker-month,
.ui-datepicker select.ui-datepicker-year {
- width: 49%;
+ width: 49%;
}
.ui-datepicker table {
- width: 100%;
- font-size: .9em;
- border-collapse: collapse;
- margin: 0 0 .4em;
+ width: 100%;
+ font-size: .9em;
+ border-collapse: collapse;
+ margin: 0 0 .4em;
}
.ui-datepicker th {
- padding: .7em .3em;
- text-align: center;
- font-weight: bold;
- border: 0;
+ padding: .7em .3em;
+ text-align: center;
+ font-weight: bold;
+ border: 0;
}
.ui-datepicker td {
- border: 0;
- padding: 1px;
+ border: 0;
+ padding: 1px;
}
.ui-datepicker td span,
.ui-datepicker td a {
- display: block;
- padding: .2em;
- text-align: right;
- text-decoration: none;
+ display: block;
+ padding: .2em;
+ text-align: right;
+ text-decoration: none;
}
.ui-datepicker .ui-datepicker-buttonpane {
- background-image: none;
- margin: .7em 0 0 0;
- padding: 0 .2em;
- border-left: 0;
- border-right: 0;
- border-bottom: 0;
+ background-image: none;
+ margin: .7em 0 0 0;
+ padding: 0 .2em;
+ border-left: 0;
+ border-right: 0;
+ border-bottom: 0;
}
.ui-datepicker .ui-datepicker-buttonpane button {
- float: right;
- margin: .5em .2em .4em;
- cursor: pointer;
- padding: .2em .6em .3em .6em;
- width: auto;
- overflow: visible;
+ float: right;
+ margin: .5em .2em .4em;
+ cursor: pointer;
+ padding: .2em .6em .3em .6em;
+ width: auto;
+ overflow: visible;
}
.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current {
- float: left;
+ float: left;
}
/* with multiple calendars */
.ui-datepicker.ui-datepicker-multi {
- width: auto;
+ width: auto;
}
.ui-datepicker-multi .ui-datepicker-group {
- float: left;
+ float: left;
}
.ui-datepicker-multi .ui-datepicker-group table {
- width: 95%;
- margin: 0 auto .4em;
+ width: 95%;
+ margin: 0 auto .4em;
}
.ui-datepicker-multi-2 .ui-datepicker-group {
- width: 50%;
+ width: 50%;
}
.ui-datepicker-multi-3 .ui-datepicker-group {
- width: 33.3%;
+ width: 33.3%;
}
.ui-datepicker-multi-4 .ui-datepicker-group {
- width: 25%;
+ width: 25%;
}
.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,
.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header {
- border-left-width: 0;
+ border-left-width: 0;
}
.ui-datepicker-multi .ui-datepicker-buttonpane {
- clear: left;
+ clear: left;
}
.ui-datepicker-row-break {
- clear: both;
- width: 100%;
- font-size: 0;
+ clear: both;
+ width: 100%;
+ font-size: 0;
}
/* RTL support */
.ui-datepicker-rtl {
- direction: rtl;
+ direction: rtl;
}
.ui-datepicker-rtl .ui-datepicker-prev {
- right: 2px;
- left: auto;
+ right: 2px;
+ left: auto;
}
.ui-datepicker-rtl .ui-datepicker-next {
- left: 2px;
- right: auto;
+ left: 2px;
+ right: auto;
}
.ui-datepicker-rtl .ui-datepicker-prev:hover {
- right: 1px;
- left: auto;
+ right: 1px;
+ left: auto;
}
.ui-datepicker-rtl .ui-datepicker-next:hover {
- left: 1px;
- right: auto;
+ left: 1px;
+ right: auto;
}
.ui-datepicker-rtl .ui-datepicker-buttonpane {
- clear: right;
+ clear: right;
}
.ui-datepicker-rtl .ui-datepicker-buttonpane button {
- float: left;
+ float: left;
}
.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,
.ui-datepicker-rtl .ui-datepicker-group {
- float: right;
+ float: right;
}
.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,
.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header {
- border-right-width: 0;
- border-left-width: 1px;
+ border-right-width: 0;
+ border-left-width: 1px;
}
.ui-dialog {
- position: absolute;
- top: 0;
- left: 0;
- padding: .2em;
- outline: 0;
+ position: absolute;
+ top: 0;
+ left: 0;
+ padding: .2em;
+ outline: 0;
}
.ui-dialog .ui-dialog-titlebar {
- padding: .4em 1em;
- position: relative;
+ padding: .4em 1em;
+ position: relative;
}
.ui-dialog .ui-dialog-title {
- float: left;
- margin: .1em 0;
- white-space: nowrap;
- width: 90%;
- overflow: hidden;
- text-overflow: ellipsis;
+ float: left;
+ margin: .1em 0;
+ white-space: nowrap;
+ width: 90%;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
.ui-dialog .ui-dialog-titlebar-close {
- position: absolute;
- right: .3em;
- top: 50%;
- width: 21px;
- margin: -10px 0 0 0;
- padding: 1px;
- height: 20px;
+ position: absolute;
+ right: .3em;
+ top: 50%;
+ width: 21px;
+ margin: -10px 0 0 0;
+ padding: 1px;
+ height: 20px;
}
.ui-dialog .ui-dialog-content {
- position: relative;
- border: 0;
- padding: .5em 1em;
- background: none;
- overflow: auto;
+ position: relative;
+ border: 0;
+ padding: .5em 1em;
+ background: none;
+ overflow: auto;
}
.ui-dialog .ui-dialog-buttonpane {
- text-align: left;
- border-width: 1px 0 0 0;
- background-image: none;
- margin-top: .5em;
- padding: .3em 1em .5em .4em;
+ text-align: left;
+ border-width: 1px 0 0 0;
+ background-image: none;
+ margin-top: .5em;
+ padding: .3em 1em .5em .4em;
}
.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
- float: right;
+ float: right;
}
.ui-dialog .ui-dialog-buttonpane button {
- margin: .5em .4em .5em 0;
- cursor: pointer;
+ margin: .5em .4em .5em 0;
+ cursor: pointer;
}
.ui-dialog .ui-resizable-se {
- width: 12px;
- height: 12px;
- right: -5px;
- bottom: -5px;
- background-position: 16px 16px;
+ width: 12px;
+ height: 12px;
+ right: -5px;
+ bottom: -5px;
+ background-position: 16px 16px;
}
.ui-draggable .ui-dialog-titlebar {
- cursor: move;
+ cursor: move;
}
.ui-menu {
- list-style: none;
- padding: 2px;
- margin: 0;
- display: block;
- outline: none;
- width: 200 px;
+ list-style: none;
+ padding: 2px;
+ margin: 0;
+ display: block;
+ outline: none;
+ width: 200 px;
}
.ui-menu .ui-menu {
- margin-top: -3px;
- position: absolute;
- width: 200 px;
+ margin-top: -3px;
+ position: absolute;
+ width: 200 px;
}
.ui-menu .ui-menu-item {
- margin: 0;
- padding: 0;
- width: 200 px;
- /* support: IE10, see #8844 */
- list-style-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
+ margin: 0;
+ padding: 0;
+ width: 200 px;
+ /* support: IE10, see #8844 */
+ list-style-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
}
.ui-menu .ui-menu-divider {
- margin: 5px -2px 5px -2px;
- height: 0;
- font-size: 0;
- line-height: 0;
- border-width: 1px 0 0 0;
+ margin: 5px -2px 5px -2px;
+ height: 0;
+ font-size: 0;
+ line-height: 0;
+ border-width: 1px 0 0 0;
}
.ui-menu .ui-menu-item a {
- text-decoration: none;
- display: block;
- padding: 2px .4em;
- line-height: 1.5;
- min-height: 0; /* support: IE7 */
- font-weight: normal;
+ text-decoration: none;
+ display: block;
+ padding: 2px .4em;
+ line-height: 1.5;
+ min-height: 0; /* support: IE7 */
+ font-weight: normal;
}
.ui-menu .ui-menu-item a.ui-state-focus,
.ui-menu .ui-menu-item a.ui-state-active {
- font-weight: normal;
- margin: -1px;
+ font-weight: normal;
+ margin: -1px;
}
.ui-menu .ui-state-disabled {
- font-weight: normal;
- margin: .4em 0 .2em;
- line-height: 1.5;
+ font-weight: normal;
+ margin: .4em 0 .2em;
+ line-height: 1.5;
}
.ui-menu .ui-state-disabled a {
- cursor: default;
+ cursor: default;
}
/* icon support */
.ui-menu-icons {
- position: relative;
+ position: relative;
}
.ui-menu-icons .ui-menu-item a {
- position: relative;
- padding-left: 2em;
+ position: relative;
+ padding-left: 2em;
}
/* left-aligned */
.ui-menu .ui-icon {
- position: absolute;
- top: .2em;
- left: .2em;
+ position: absolute;
+ top: .2em;
+ left: .2em;
}
/* right-aligned */
.ui-menu .ui-menu-icon {
- position: static;
- float: right;
+ position: static;
+ float: right;
}
.ui-progressbar {
- height: 2em;
- text-align: left;
- overflow: hidden;
+ height: 2em;
+ text-align: left;
+ overflow: hidden;
}
.ui-progressbar .ui-progressbar-value {
- margin: -1px;
- height: 100%;
+ margin: -1px;
+ height: 100%;
}
.ui-progressbar .ui-progressbar-overlay {
- background: url("images/animated-overlay.gif");
- height: 100%;
- filter: alpha(opacity=25);
- opacity: 0.25;
+ background: url("images/animated-overlay.gif");
+ height: 100%;
+ filter: alpha(opacity=25);
+ opacity: 0.25;
}
.ui-progressbar-indeterminate .ui-progressbar-value {
- background-image: none;
+ background-image: none;
}
.ui-resizable {
- position: relative;
+ position: relative;
}
.ui-resizable-handle {
- position: absolute;
- font-size: 0.1px;
- display: block;
+ position: absolute;
+ font-size: 0.1px;
+ display: block;
}
.ui-resizable-disabled .ui-resizable-handle,
.ui-resizable-autohide .ui-resizable-handle {
- display: none;
+ display: none;
}
.ui-resizable-n {
- cursor: n-resize;
- height: 7px;
- width: 100%;
- top: -5px;
- left: 0;
+ cursor: n-resize;
+ height: 7px;
+ width: 100%;
+ top: -5px;
+ left: 0;
}
.ui-resizable-s {
- cursor: s-resize;
- height: 7px;
- width: 100%;
- bottom: -5px;
- left: 0;
+ cursor: s-resize;
+ height: 7px;
+ width: 100%;
+ bottom: -5px;
+ left: 0;
}
.ui-resizable-e {
- cursor: e-resize;
- width: 7px;
- right: -5px;
- top: 0;
- height: 100%;
+ cursor: e-resize;
+ width: 7px;
+ right: -5px;
+ top: 0;
+ height: 100%;
}
.ui-resizable-w {
- cursor: w-resize;
- width: 7px;
- left: -5px;
- top: 0;
- height: 100%;
+ cursor: w-resize;
+ width: 7px;
+ left: -5px;
+ top: 0;
+ height: 100%;
}
.ui-resizable-se {
- cursor: se-resize;
- width: 12px;
- height: 12px;
- right: 1px;
- bottom: 1px;
+ cursor: se-resize;
+ width: 12px;
+ height: 12px;
+ right: 1px;
+ bottom: 1px;
}
.ui-resizable-sw {
- cursor: sw-resize;
- width: 9px;
- height: 9px;
- left: -5px;
- bottom: -5px;
+ cursor: sw-resize;
+ width: 9px;
+ height: 9px;
+ left: -5px;
+ bottom: -5px;
}
.ui-resizable-nw {
- cursor: nw-resize;
- width: 9px;
- height: 9px;
- left: -5px;
- top: -5px;
+ cursor: nw-resize;
+ width: 9px;
+ height: 9px;
+ left: -5px;
+ top: -5px;
}
.ui-resizable-ne {
- cursor: ne-resize;
- width: 9px;
- height: 9px;
- right: -5px;
- top: -5px;
+ cursor: ne-resize;
+ width: 9px;
+ height: 9px;
+ right: -5px;
+ top: -5px;
}
.ui-selectable-helper {
- position: absolute;
- z-index: 100;
- border: 1px dotted black;
+ position: absolute;
+ z-index: 100;
+ border: 1px dotted black;
}
.ui-slider {
- position: relative;
- text-align: left;
+ position: relative;
+ text-align: left;
}
.ui-slider .ui-slider-handle {
- position: absolute;
- z-index: 2;
- width: 1.2em;
- height: 1.2em;
- cursor: default;
+ position: absolute;
+ z-index: 2;
+ width: 1.2em;
+ height: 1.2em;
+ cursor: default;
}
.ui-slider .ui-slider-range {
- position: absolute;
- z-index: 1;
- font-size: .7em;
- display: block;
- border: 0;
- background-position: 0 0;
+ position: absolute;
+ z-index: 1;
+ font-size: .7em;
+ display: block;
+ border: 0;
+ background-position: 0 0;
}
/* For IE8 - See #6727 */
.ui-slider.ui-state-disabled .ui-slider-handle,
.ui-slider.ui-state-disabled .ui-slider-range {
- filter: inherit;
+ filter: inherit;
}
.ui-slider-horizontal {
- height: .8em;
+ height: .8em;
}
.ui-slider-horizontal .ui-slider-handle {
- top: -.3em;
- margin-left: -.6em;
+ top: -.3em;
+ margin-left: -.6em;
}
.ui-slider-horizontal .ui-slider-range {
- top: 0;
- height: 100%;
+ top: 0;
+ height: 100%;
}
.ui-slider-horizontal .ui-slider-range-min {
- left: 0;
+ left: 0;
}
.ui-slider-horizontal .ui-slider-range-max {
- right: 0;
+ right: 0;
}
.ui-slider-vertical {
- width: .8em;
- height: 100px;
+ width: .8em;
+ height: 100px;
}
.ui-slider-vertical .ui-slider-handle {
- left: -.3em;
- margin-left: 0;
- margin-bottom: -.6em;
+ left: -.3em;
+ margin-left: 0;
+ margin-bottom: -.6em;
}
.ui-slider-vertical .ui-slider-range {
- left: 0;
- width: 100%;
+ left: 0;
+ width: 100%;
}
.ui-slider-vertical .ui-slider-range-min {
- bottom: 0;
+ bottom: 0;
}
.ui-slider-vertical .ui-slider-range-max {
- top: 0;
+ top: 0;
}
.ui-spinner {
- position: relative;
- display: inline-block;
- overflow: hidden;
- padding: 0;
- vertical-align: middle;
+ position: relative;
+ display: inline-block;
+ overflow: hidden;
+ padding: 0;
+ vertical-align: middle;
}
.ui-spinner-input {
- border: none;
- background: none;
- color: inherit;
- padding: 0;
- margin: .2em 0;
- vertical-align: middle;
- margin-left: .4em;
- margin-right: 22px;
+ border: none;
+ background: none;
+ color: inherit;
+ padding: 0;
+ margin: .2em 0;
+ vertical-align: middle;
+ margin-left: .4em;
+ margin-right: 22px;
}
.ui-spinner-button {
- width: 16px;
- height: 50%;
- font-size: .5em;
- padding: 0;
- margin: 0;
- text-align: center;
- position: absolute;
- cursor: default;
- display: block;
- overflow: hidden;
- right: 0;
+ width: 16px;
+ height: 50%;
+ font-size: .5em;
+ padding: 0;
+ margin: 0;
+ text-align: center;
+ position: absolute;
+ cursor: default;
+ display: block;
+ overflow: hidden;
+ right: 0;
}
/* more specificity required here to overide default borders */
.ui-spinner a.ui-spinner-button {
- border-top: none;
- border-bottom: none;
- border-right: none;
+ border-top: none;
+ border-bottom: none;
+ border-right: none;
}
/* vertical centre icon */
.ui-spinner .ui-icon {
- position: absolute;
- margin-top: -8px;
- top: 50%;
- left: 0;
+ position: absolute;
+ margin-top: -8px;
+ top: 50%;
+ left: 0;
}
.ui-spinner-up {
- top: 0;
+ top: 0;
}
.ui-spinner-down {
- bottom: 0;
+ bottom: 0;
}
/* TR overrides */
.ui-spinner .ui-icon-triangle-1-s {
- /* need to fix icons sprite */
- background-position: -65px -16px;
+ /* need to fix icons sprite */
+ background-position: -65px -16px;
}
.ui-tabs {
- position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
- padding: .2em;
+ position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+ padding: .2em;
}
.ui-tabs .ui-tabs-nav {
- margin: 0;
- padding: .2em .2em 0;
+ margin: 0;
+ padding: .2em .2em 0;
}
.ui-tabs .ui-tabs-nav li {
- list-style: none;
- float: left;
- position: relative;
- top: 0;
- margin: 1px .2em 0 0;
- border-bottom-width: 0;
- padding: 0;
- white-space: nowrap;
+ list-style: none;
+ float: left;
+ position: relative;
+ top: 0;
+ margin: 1px .2em 0 0;
+ border-bottom-width: 0;
+ padding: 0;
+ white-space: nowrap;
}
.ui-tabs .ui-tabs-nav li a {
- float: left;
- padding: .5em 1em;
- text-decoration: none;
+ float: left;
+ padding: .5em 1em;
+ text-decoration: none;
}
.ui-tabs .ui-tabs-nav li.ui-tabs-active {
- margin-bottom: -1px;
- padding-bottom: 1px;
+ margin-bottom: -1px;
+ padding-bottom: 1px;
}
.ui-tabs .ui-tabs-nav li.ui-tabs-active a,
.ui-tabs .ui-tabs-nav li.ui-state-disabled a,
.ui-tabs .ui-tabs-nav li.ui-tabs-loading a {
- cursor: text;
+ cursor: text;
}
.ui-tabs .ui-tabs-nav li a, /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a {
- cursor: pointer;
+ cursor: pointer;
}
.ui-tabs .ui-tabs-panel {
- display: block;
- border-width: 0;
- padding: 1em 1.4em;
- background: none;
+ display: block;
+ border-width: 0;
+ padding: 1em 1.4em;
+ background: none;
}
.ui-tooltip {
- padding: 8px;
- position: absolute;
- z-index: 9999;
- max-width: 300px;
- -webkit-box-shadow: 0 0 5px #aaa;
- box-shadow: 0 0 5px #aaa;
+ padding: 8px;
+ position: absolute;
+ z-index: 9999;
+ max-width: 300px;
+ -webkit-box-shadow: 0 0 5px #aaa;
+ box-shadow: 0 0 5px #aaa;
}
body .ui-tooltip {
- border-width: 2px;
+ border-width: 2px;
}
/* Component containers
----------------------------------*/
.ui-widget {
- font-family: Verdana,Arial,sans-serif;
- font-size: 1.1em;
+ font-family: Verdana,Arial,sans-serif;
+ font-size: 1.1em;
}
.ui-widget .ui-widget {
- font-size: 1em;
+ font-size: 1em;
}
.ui-widget input,
.ui-widget select,
.ui-widget textarea,
.ui-widget button {
- font-family: Verdana,Arial,sans-serif;
- font-size: 1em;
+ font-family: Verdana,Arial,sans-serif;
+ font-size: 1em;
}
.ui-widget-content {
- border: 1px solid #aaaaaa;
- background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x;
- color: #222222;
+ border: 1px solid #aaaaaa;
+ background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x;
+ color: #222222;
}
.ui-widget-content a {
- color: #222222;
+ color: #222222;
}
.ui-widget-header {
- border: 1px solid #aaaaaa;
- background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;
- color: #222222;
- font-weight: bold;
+ border: 1px solid #aaaaaa;
+ background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;
+ color: #222222;
+ font-weight: bold;
}
.ui-widget-header a {
- color: #222222;
+ color: #222222;
}
/* Interaction states
@@ -824,16 +824,16 @@ body .ui-tooltip {
.ui-state-default,
.ui-widget-content .ui-state-default,
.ui-widget-header .ui-state-default {
- border: 1px solid #d3d3d3;
- background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x;
- font-weight: normal;
- color: #555555;
+ border: 1px solid #d3d3d3;
+ background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x;
+ font-weight: normal;
+ color: #555555;
}
.ui-state-default a,
.ui-state-default a:link,
.ui-state-default a:visited {
- color: #555555;
- text-decoration: none;
+ color: #555555;
+ text-decoration: none;
}
.ui-state-hover,
.ui-widget-content .ui-state-hover,
@@ -841,31 +841,31 @@ body .ui-tooltip {
.ui-state-focus,
.ui-widget-content .ui-state-focus,
.ui-widget-header .ui-state-focus {
- border: 1px solid #999999;
- background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x;
- font-weight: normal;
- color: #212121;
+ border: 1px solid #999999;
+ background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x;
+ font-weight: normal;
+ color: #212121;
}
.ui-state-hover a,
.ui-state-hover a:hover,
.ui-state-hover a:link,
.ui-state-hover a:visited {
- color: #212121;
- text-decoration: none;
+ color: #212121;
+ text-decoration: none;
}
.ui-state-active,
.ui-widget-content .ui-state-active,
.ui-widget-header .ui-state-active {
- border: 1px solid #aaaaaa;
- background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x;
- font-weight: normal;
- color: #212121;
+ border: 1px solid #aaaaaa;
+ background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x;
+ font-weight: normal;
+ color: #212121;
}
.ui-state-active a,
.ui-state-active a:link,
.ui-state-active a:visited {
- color: #212121;
- text-decoration: none;
+ color: #212121;
+ text-decoration: none;
}
/* Interaction Cues
@@ -873,53 +873,53 @@ body .ui-tooltip {
.ui-state-highlight,
.ui-widget-content .ui-state-highlight,
.ui-widget-header .ui-state-highlight {
- border: 1px solid #fcefa1;
- background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x;
- color: #363636;
+ border: 1px solid #fcefa1;
+ background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x;
+ color: #363636;
}
.ui-state-highlight a,
.ui-widget-content .ui-state-highlight a,
.ui-widget-header .ui-state-highlight a {
- color: #363636;
+ color: #363636;
}
.ui-state-error,
.ui-widget-content .ui-state-error,
.ui-widget-header .ui-state-error {
- border: 1px solid #cd0a0a;
- background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x;
- color: #cd0a0a;
+ border: 1px solid #cd0a0a;
+ background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x;
+ color: #cd0a0a;
}
.ui-state-error a,
.ui-widget-content .ui-state-error a,
.ui-widget-header .ui-state-error a {
- color: #cd0a0a;
+ color: #cd0a0a;
}
.ui-state-error-text,
.ui-widget-content .ui-state-error-text,
.ui-widget-header .ui-state-error-text {
- color: #cd0a0a;
+ color: #cd0a0a;
}
.ui-priority-primary,
.ui-widget-content .ui-priority-primary,
.ui-widget-header .ui-priority-primary {
- font-weight: bold;
+ font-weight: bold;
}
.ui-priority-secondary,
.ui-widget-content .ui-priority-secondary,
.ui-widget-header .ui-priority-secondary {
- opacity: .7;
- filter:Alpha(Opacity=70);
- font-weight: normal;
+ opacity: .7;
+ filter:Alpha(Opacity=70);
+ font-weight: normal;
}
.ui-state-disabled,
.ui-widget-content .ui-state-disabled,
.ui-widget-header .ui-state-disabled {
- opacity: .35;
- filter:Alpha(Opacity=35);
- background-image: none;
+ opacity: .35;
+ filter:Alpha(Opacity=35);
+ background-image: none;
}
.ui-state-disabled .ui-icon {
- filter:Alpha(Opacity=35); /* For IE8 - See #6059 */
+ filter:Alpha(Opacity=35); /* For IE8 - See #6059 */
}
/* Icons
@@ -927,32 +927,32 @@ body .ui-tooltip {
/* states and images */
.ui-icon {
- width: 16px;
- height: 16px;
+ width: 16px;
+ height: 16px;
}
.ui-icon,
.ui-widget-content .ui-icon {
- background-image: url(images/ui-icons_222222_256x240.png);
+ background-image: url(images/ui-icons_222222_256x240.png);
}
.ui-widget-header .ui-icon {
- background-image: url(images/ui-icons_222222_256x240.png);
+ background-image: url(images/ui-icons_222222_256x240.png);
}
.ui-state-default .ui-icon {
- background-image: url(images/ui-icons_888888_256x240.png);
+ background-image: url(images/ui-icons_888888_256x240.png);
}
.ui-state-hover .ui-icon,
.ui-state-focus .ui-icon {
- background-image: url(images/ui-icons_454545_256x240.png);
+ background-image: url(images/ui-icons_454545_256x240.png);
}
.ui-state-active .ui-icon {
- background-image: url(images/ui-icons_454545_256x240.png);
+ background-image: url(images/ui-icons_454545_256x240.png);
}
.ui-state-highlight .ui-icon {
- background-image: url(images/ui-icons_2e83ff_256x240.png);
+ background-image: url(images/ui-icons_2e83ff_256x240.png);
}
.ui-state-error .ui-icon,
.ui-state-error-text .ui-icon {
- background-image: url(images/ui-icons_cd0a0a_256x240.png);
+ background-image: url(images/ui-icons_cd0a0a_256x240.png);
}
/* positioning */
@@ -1142,38 +1142,38 @@ body .ui-tooltip {
.ui-corner-top,
.ui-corner-left,
.ui-corner-tl {
- border-top-left-radius: 4px;
+ border-top-left-radius: 4px;
}
.ui-corner-all,
.ui-corner-top,
.ui-corner-right,
.ui-corner-tr {
- border-top-right-radius: 4px;
+ border-top-right-radius: 4px;
}
.ui-corner-all,
.ui-corner-bottom,
.ui-corner-left,
.ui-corner-bl {
- border-bottom-left-radius: 4px;
+ border-bottom-left-radius: 4px;
}
.ui-corner-all,
.ui-corner-bottom,
.ui-corner-right,
.ui-corner-br {
- border-bottom-right-radius: 4px;
+ border-bottom-right-radius: 4px;
}
/* Overlays */
.ui-widget-overlay {
- background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;
- opacity: .3;
- filter: Alpha(Opacity=30);
+ background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;
+ opacity: .3;
+ filter: Alpha(Opacity=30);
}
.ui-widget-shadow {
- margin: -8px 0 0 -8px;
- padding: 8px;
- background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;
- opacity: .3;
- filter: Alpha(Opacity=30);
- border-radius: 8px;
+ margin: -8px 0 0 -8px;
+ padding: 8px;
+ background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;
+ opacity: .3;
+ filter: Alpha(Opacity=30);
+ border-radius: 8px;
}
diff --git a/etc/http/files/dabc.css b/etc/http/files/dabc.css
index 4015e3eea45..8f16af481b8 100644
--- a/etc/http/files/dabc.css
+++ b/etc/http/files/dabc.css
@@ -76,32 +76,32 @@ input.tb {
|--------------------------------------------------*/
.dtree {
- font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
- font-size: 11px;
- color: #666;
- white-space: nowrap;
+ font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ color: #666;
+ white-space: nowrap;
}
.dtree img {
- border: 0px;
- vertical-align: middle;
+ border: 0px;
+ vertical-align: middle;
}
.dtree a {
- color: #333;
- text-decoration: none;
+ color: #333;
+ text-decoration: none;
}
.dtree a.node, .dtree a.nodeSel {
- white-space: nowrap;
- padding: 1px 2px 1px 2px;
+ white-space: nowrap;
+ padding: 1px 2px 1px 2px;
}
.dtree a.node:hover, .dtree a.nodeSel:hover {
- color: #333;
- text-decoration: underline;
+ color: #333;
+ text-decoration: underline;
}
.dtree a.nodeSel {
- background-color: #c0d2ec;
+ background-color: #c0d2ec;
}
.dtree .clip {
- overflow: hidden;
+ overflow: hidden;
}
/*--------------------------------------------------|
diff --git a/geom/gdml/src/TGDMLParse.cxx b/geom/gdml/src/TGDMLParse.cxx
index e7cd7277a30..454a80fea09 100644
--- a/geom/gdml/src/TGDMLParse.cxx
+++ b/geom/gdml/src/TGDMLParse.cxx
@@ -1740,10 +1740,10 @@ XMLNodePointer_t TGDMLParse::Ellipsoid(TXMLEngine* gdml, XMLNodePointer_t node,
z1 = Evaluate(zcut1line);
}
if (zcut2 == "") {
- z2 = radius;
+ z2 = radius;
} else {
- zcut2line = TString::Format("(%s)*%s", zcut2.Data(), retunit.Data());
- z2 = Evaluate(zcut2line);
+ zcut2line = TString::Format("(%s)*%s", zcut2.Data(), retunit.Data());
+ z2 = Evaluate(zcut2line);
}
TGeoSphere *sph = new TGeoSphere(0, radius);
diff --git a/geom/gdml/writer.py b/geom/gdml/writer.py
index 80be7497965..dea698b3d28 100644
--- a/geom/gdml/writer.py
+++ b/geom/gdml/writer.py
@@ -54,10 +54,10 @@ class writer(object):
def addBox(self, name, dx, dy, dz):
self.solids[2].append(['box',{'name':name, 'x':dx, 'y':dy, 'z':dz, 'lunit':'cm'},[]])
-
+
def addParaboloid(self, name, rlo, rhi, dz):
self.solids[2].append(['paraboloid',{'name':name, 'rlo':rlo, 'rhi':rhi, 'dz':dz, 'lunit':'cm'},[]])
-
+
def addArb8(self, name, v1x, v1y, v2x, v2y, v3x, v3y, v4x, v4y, v5x, v5y, v6x, v6y, v7x, v7y, v8x, v8y, dz):
self.solids[2].append(['arb8',{'name':name, 'v1x':v1x, 'v1y':v1y, 'v2x':v2x, 'v2y':v2y, 'v3x':v3x, 'v3y':v3y, 'v4x':v4x, 'v4y':v4y, 'v5x':v5x, 'v5y':v5y, 'v6x':v6x, 'v6y':v6y, 'v7x':v7x, 'v7y':v7y, 'v8x':v8x, 'v8y':v8y, 'dz':dz, 'lunit':'cm'},[]])
@@ -80,7 +80,7 @@ class writer(object):
self.solids[2].append(['trap', {'name':name, 'z':z, 'theta':theta, 'phi':phi,
'x1':x1, 'x2':x2, 'x3':x3, 'x4':x4,
'y1':y1, 'y2':y2, 'alpha1':alpha1, 'alpha2':alpha2, 'lunit':'cm', 'aunit':'deg'}, []])
-
+
def addTwistedTrap(self, name, z, theta, phi, y1, x1, x2, alpha1, y2, x3, x4, alpha2, twist):
self.solids[2].append(['twistTrap', {'name':name, 'z':z, 'theta':theta, 'phi':phi,
'x1':x1, 'x2':x2, 'x3':x3, 'x4':x4,
@@ -93,7 +93,7 @@ class writer(object):
def addTube(self, name, rmin, rmax, z, startphi, deltaphi):
self.solids[2].append(['tube',{'name':name, 'rmin':rmin, 'rmax':rmax,
'z':z, 'startphi':startphi, 'deltaphi':deltaphi, 'lunit':'cm', 'aunit':'deg'},[]])
-
+
def addCutTube(self, name, rmin, rmax, z, startphi, deltaphi, lowX, lowY, lowZ, highX, highY, highZ):
self.solids[2].append(['cutTube',{'name':name, 'rmin':rmin, 'rmax':rmax,
'z':z, 'startphi':startphi, 'deltaphi':deltaphi,
diff --git a/geom/geom/inc/TGeoNode.h b/geom/geom/inc/TGeoNode.h
index c1a6c270f54..023a0adf9a7 100644
--- a/geom/geom/inc/TGeoNode.h
+++ b/geom/geom/inc/TGeoNode.h
@@ -144,7 +144,7 @@ public:
virtual void LocalToMasterVect(const Double_t *local, Double_t *master) const;
virtual void ls(Option_t *option = "") const;
- virtual void Paint(Option_t *option = "");
+ virtual void Paint(Option_t *option = "");
void PrintCandidates() const; // *MENU*
void PrintOverlaps() const; // *MENU*
void VisibleDaughters(Bool_t vis=kTRUE); // *MENU*
diff --git a/geom/geom/inc/TGeoPatternFinder.h b/geom/geom/inc/TGeoPatternFinder.h
index d06de8eb5ca..36aa47cade8 100644
--- a/geom/geom/inc/TGeoPatternFinder.h
+++ b/geom/geom/inc/TGeoPatternFinder.h
@@ -499,7 +499,7 @@ public:
class TGeoPatternSphPhi : public TGeoPatternFinder
{
private:
- Double_t *fSinCos; //! Sincos table
+ Double_t *fSinCos; //! Sincos table
protected:
TGeoPatternSphPhi(const TGeoPatternSphPhi& pfc); // Not implemented
diff --git a/geom/geom/inc/TGeoRCPtr.h b/geom/geom/inc/TGeoRCPtr.h
index 1450e2560e6..ac069516b44 100644
--- a/geom/geom/inc/TGeoRCPtr.h
+++ b/geom/geom/inc/TGeoRCPtr.h
@@ -36,14 +36,14 @@ private:
Usage:
======
// Module 1 creates an object
- TGeoRCPtr<MyExtension> a2 = new MyExtension(); //fRC=1
-
+ TGeoRCPtr<MyExtension> a2 = new MyExtension(); //fRC=1
+
// Module 2 grabs object
- TGeoRCPtr<MyExtension> ptr2 = a2; //fRC=2
+ TGeoRCPtr<MyExtension> ptr2 = a2; //fRC=2
// Module 2 invokes a method
ptr2->Print();
- (*ptr2).Print();
+ (*ptr2).Print();
// Module 1 no longer needs object
a2 = 0; //RC=1
@@ -62,54 +62,54 @@ class TGeoRCPtr
{
public:
//Construct using a C pointer, e.g. TGeoRCPtr<T> x = new T();
- TGeoRCPtr(T* ptr = 0)
- : fPtr(ptr)
- {
- if(ptr != 0) ptr->Grab();
- }
-
- //Copy constructor
- TGeoRCPtr(const TGeoRCPtr &ptr)
- : fPtr(ptr.fPtr)
- {
- if(fPtr != 0) fPtr->Grab();
- }
-
- ~TGeoRCPtr()
- {
- if(fPtr != 0) fPtr->Release();
- }
-
- //Assign a pointer, e.g. x = new T();
- TGeoRCPtr &operator=(T* ptr)
- {
- if(ptr != 0) ptr->Grab();
- if(fPtr != 0) fPtr->Release();
- fPtr = ptr;
- return (*this);
- }
-
- //Assign another TGeoRCPtr
- TGeoRCPtr &operator=(const TGeoRCPtr &ptr)
- {
- return (*this) = ptr.fPtr;
- }
-
- //Retrieve actual pointer
- T* Get() const
- {
- return fPtr;
- }
-
- //Some overloaded operators to facilitate dealing with an TGeoRCPtr as a convetional C pointer.
- //Without these operators, one can still use the less transparent Get() method to access the pointer.
- T* operator->() const {return fPtr;} //x->member
- T &operator*() const {return *fPtr;} //*x, (*x).member
- operator T*() const {return fPtr;} //T* y = x;
- operator bool() const {return fPtr != 0;} //if(x) {/*x is not NULL*/}
- bool operator==(const TGeoRCPtr &ptr) {return fPtr == ptr.fPtr;}
- bool operator==(const T *ptr) {return fPtr == ptr;}
+ TGeoRCPtr(T* ptr = 0)
+ : fPtr(ptr)
+ {
+ if(ptr != 0) ptr->Grab();
+ }
+
+ //Copy constructor
+ TGeoRCPtr(const TGeoRCPtr &ptr)
+ : fPtr(ptr.fPtr)
+ {
+ if(fPtr != 0) fPtr->Grab();
+ }
+
+ ~TGeoRCPtr()
+ {
+ if(fPtr != 0) fPtr->Release();
+ }
+
+ //Assign a pointer, e.g. x = new T();
+ TGeoRCPtr &operator=(T* ptr)
+ {
+ if(ptr != 0) ptr->Grab();
+ if(fPtr != 0) fPtr->Release();
+ fPtr = ptr;
+ return (*this);
+ }
+
+ //Assign another TGeoRCPtr
+ TGeoRCPtr &operator=(const TGeoRCPtr &ptr)
+ {
+ return (*this) = ptr.fPtr;
+ }
+
+ //Retrieve actual pointer
+ T* Get() const
+ {
+ return fPtr;
+ }
+
+ //Some overloaded operators to facilitate dealing with an TGeoRCPtr as a convetional C pointer.
+ //Without these operators, one can still use the less transparent Get() method to access the pointer.
+ T* operator->() const {return fPtr;} //x->member
+ T &operator*() const {return *fPtr;} //*x, (*x).member
+ operator T*() const {return fPtr;} //T* y = x;
+ operator bool() const {return fPtr != 0;} //if(x) {/*x is not NULL*/}
+ bool operator==(const TGeoRCPtr &ptr) {return fPtr == ptr.fPtr;}
+ bool operator==(const T *ptr) {return fPtr == ptr;}
private:
- T *fPtr; //Actual pointer
+ T *fPtr; //Actual pointer
};
diff --git a/geom/geom/src/TGeoCone.cxx b/geom/geom/src/TGeoCone.cxx
index c9a77fd3f72..f02a1eae3ce 100644
--- a/geom/geom/src/TGeoCone.cxx
+++ b/geom/geom/src/TGeoCone.cxx
@@ -1457,7 +1457,7 @@ Double_t TGeoConeSeg::DistToCons(const Double_t *point, const Double_t *dir, Dou
if (phi < 0 ) phi+=360.;
ddp = phi-phi1;
if (ddp < 0) ddp+=360.;
-// printf("snxt1=%f phi=%f ddp=%f\n", snxt, phi, ddp);
+ // printf("snxt1=%f phi=%f ddp=%f\n", snxt, phi, ddp);
if (ddp<=dphi) return snxt;
}
}
@@ -1474,7 +1474,7 @@ Double_t TGeoConeSeg::DistToCons(const Double_t *point, const Double_t *dir, Dou
if (phi < 0 ) phi+=360.;
ddp = phi-phi1;
if (ddp < 0) ddp+=360.;
-// printf("snxt2=%f phi=%f ddp=%f\n", snxt, phi, ddp);
+ // printf("snxt2=%f phi=%f ddp=%f\n", snxt, phi, ddp);
if (ddp<=dphi) return snxt;
}
}
diff --git a/geom/geom/src/TGeoManager.cxx b/geom/geom/src/TGeoManager.cxx
index e85f661a296..87db1c5bdba 100644
--- a/geom/geom/src/TGeoManager.cxx
+++ b/geom/geom/src/TGeoManager.cxx
@@ -3521,10 +3521,10 @@ Int_t TGeoManager::Export(const char *filename, const char *name, Option_t *opti
if (sfile.Contains(".gdml")) {
//Save geometry as a gdml file
if (fgVerboseLevel>0) Info("Export","Exporting %s %s as gdml code", GetName(), GetTitle());
- //C++ version
+ //C++ version
TString cmd ;
- cmd = TString::Format("TGDMLWrite::StartGDMLWriting(gGeoManager,\"%s\",\"%s\")", filename, option);
- gROOT->ProcessLineFast(cmd);
+ cmd = TString::Format("TGDMLWrite::StartGDMLWriting(gGeoManager,\"%s\",\"%s\")", filename, option);
+ gROOT->ProcessLineFast(cmd);
return 1;
}
if (sfile.Contains(".root") || sfile.Contains(".xml")) {
diff --git a/geom/geom/src/TGeoNavigator.cxx b/geom/geom/src/TGeoNavigator.cxx
index 46a4025b54e..997aca6e175 100644
--- a/geom/geom/src/TGeoNavigator.cxx
+++ b/geom/geom/src/TGeoNavigator.cxx
@@ -17,14 +17,14 @@
// allowed for a single geometry.
// A default navigator is provided for any geometry but one may add several
// others for parallel navigation:
-//
-// TGeoNavigator *navig = new TGeoNavigator(gGeoManager);
-// Int_t inav = gGeoManager->AddNavigator(navig);
-// gGeoManager->SetCurrentNavigator(inav);
//
-// .... and then switch back to the default navigator:
+// TGeoNavigator *navig = new TGeoNavigator(gGeoManager);
+// Int_t inav = gGeoManager->AddNavigator(navig);
+// gGeoManager->SetCurrentNavigator(inav);
//
-// gGeoManager->SetCurrentNavigator(0);
+// .... and then switch back to the default navigator:
+//
+// gGeoManager->SetCurrentNavigator(0);
//_____________________________________________________________________________
#include "TGeoNavigator.h"
diff --git a/geom/geom/src/TGeoScaledShape.cxx b/geom/geom/src/TGeoScaledShape.cxx
index 3b7207b1135..ae25eaeb069 100644
--- a/geom/geom/src/TGeoScaledShape.cxx
+++ b/geom/geom/src/TGeoScaledShape.cxx
@@ -218,7 +218,7 @@ void TGeoScaledShape::GetMeshNumbers(Int_t &nvert, Int_t &nsegs, Int_t &npols) c
// Returns numbers of vertices, segments and polygons composing the shape mesh.
fShape->GetMeshNumbers(nvert, nsegs, npols);
}
-
+
//_____________________________________________________________________________
void TGeoScaledShape::InspectShape() const
{
diff --git a/geom/geom/src/TGeoVoxelFinder.cxx b/geom/geom/src/TGeoVoxelFinder.cxx
index bfe088e0a8b..1460bc73340 100644
--- a/geom/geom/src/TGeoVoxelFinder.cxx
+++ b/geom/geom/src/TGeoVoxelFinder.cxx
@@ -810,44 +810,44 @@ Int_t *TGeoVoxelFinder::GetNextCandidates(const Double_t *point, Int_t &ncheck,
// increment/decrement X slice
td.fVoxSlices[0]=dind[0];
if (iforced) {
- // we have to recompute Y and Z slices
+ // we have to recompute Y and Z slices
if (dslice>td.fVoxLimits[1]) return 0;
if (dslice>td.fVoxLimits[2]) return 0;
if ((dslice>dmin[1]) && td.fVoxInc[1]) {
xptnew = point[1]+dslice/td.fVoxInvdir[1];
-// printf(" recomputing Y slice, pos=%g\n", xptnew);
+ // printf(" recomputing Y slice, pos=%g\n", xptnew);
while (1) {
td.fVoxSlices[1] += td.fVoxInc[1];
if (td.fVoxInc[1]==1) {
- if (td.fVoxSlices[1]<-1 || td.fVoxSlices[1]>fIby-2) break; // outside range
+ if (td.fVoxSlices[1]<-1 || td.fVoxSlices[1]>fIby-2) break; // outside range
if (fYb[td.fVoxSlices[1]+1]>=xptnew) break;
} else {
if (td.fVoxSlices[1]<0 || td.fVoxSlices[1]>fIby-1) break; // outside range
if (fYb[td.fVoxSlices[1]]<= xptnew) break;
}
}
-// printf(" %i/%i\n", td.fVoxSlices[1], fIby-2);
+ // printf(" %i/%i\n", td.fVoxSlices[1], fIby-2);
}
- if ((dslice>dmin[2]) && td.fVoxInc[2]) {
+ if ((dslice>dmin[2]) && td.fVoxInc[2]) {
xptnew = point[2]+dslice/td.fVoxInvdir[2];
-// printf(" recomputing Z slice, pos=%g\n", xptnew);
+ // printf(" recomputing Z slice, pos=%g\n", xptnew);
while (1) {
td.fVoxSlices[2] += td.fVoxInc[2];
if (td.fVoxInc[2]==1) {
- if (td.fVoxSlices[2]<-1 || td.fVoxSlices[2]>fIbz-2) break; // outside range
+ if (td.fVoxSlices[2]<-1 || td.fVoxSlices[2]>fIbz-2) break; // outside range
if (fZb[td.fVoxSlices[2]+1]>=xptnew) break;
} else {
if (td.fVoxSlices[2]<0 || td.fVoxSlices[2]>fIbz-1) break; // outside range
if (fZb[td.fVoxSlices[2]]<= xptnew) break;
}
- }
-// printf(" %i/%i\n", td.fVoxSlices[2], fIbz-2);
+ }
+ // printf(" %i/%i\n", td.fVoxSlices[2], fIbz-2);
}
}
- // new indices are set -> Get new candidates
+ // new indices are set -> Get new candidates
if (fPriority[0]==1) {
- // we are entering the unique slice on this axis
- //---> intersect and store Y and Z
+ // we are entering the unique slice on this axis
+ //---> intersect and store Y and Z
if (fPriority[1]==2) {
if (td.fVoxSlices[1]<0 || td.fVoxSlices[1]>=fIby-1) return td.fVoxCheckList; // outside range
ndd[0] = fNsliceY[td.fVoxSlices[1]];
@@ -1034,27 +1034,27 @@ Int_t *TGeoVoxelFinder::GetNextCandidates(const Double_t *point, Int_t &ncheck,
// increment/decrement Z slice
td.fVoxSlices[2]=dind[2];
if (iforced) {
- // we have to recompute Y and X slices
+ // we have to recompute Y and X slices
if (dslice>td.fVoxLimits[1]) return 0;
if (dslice>td.fVoxLimits[0]) return 0;
if ((dslice>dmin[1]) && td.fVoxInc[1]) {
xptnew = point[1]+dslice/td.fVoxInvdir[1];
-// printf(" recomputing Y slice, pos=%g\n", xptnew);
+ // printf(" recomputing Y slice, pos=%g\n", xptnew);
while (1) {
td.fVoxSlices[1] += td.fVoxInc[1];
if (td.fVoxInc[1]==1) {
- if (td.fVoxSlices[1]<-1 || td.fVoxSlices[1]>fIby-2) break; // outside range
+ if (td.fVoxSlices[1]<-1 || td.fVoxSlices[1]>fIby-2) break; // outside range
if (fYb[td.fVoxSlices[1]+1]>=xptnew) break;
} else {
if (td.fVoxSlices[1]<0 || td.fVoxSlices[1]>fIby-1) break; // outside range
if (fYb[td.fVoxSlices[1]]<= xptnew) break;
}
}
-// printf(" %i/%i\n", td.fVoxSlices[1], fIby-2);
+ // printf(" %i/%i\n", td.fVoxSlices[1], fIby-2);
}
- if ((dslice>dmin[0]) && td.fVoxInc[0]) {
+ if ((dslice>dmin[0]) && td.fVoxInc[0]) {
xptnew = point[0]+dslice/td.fVoxInvdir[0];
-// printf(" recomputing X slice, pos=%g\n", xptnew);
+ // printf(" recomputing X slice, pos=%g\n", xptnew);
while (1) {
td.fVoxSlices[0] += td.fVoxInc[0];
if (td.fVoxInc[0]==1) {
diff --git a/geom/geompainter/src/TGeoChecker.cxx b/geom/geompainter/src/TGeoChecker.cxx
index 9d8d6ace36a..d377ab8d997 100644
--- a/geom/geompainter/src/TGeoChecker.cxx
+++ b/geom/geompainter/src/TGeoChecker.cxx
@@ -327,7 +327,7 @@ void TGeoChecker::CheckBoundaryErrors(Int_t ntracks, Double_t radius)
strncpy(cdir,"Forward",10);
bug->Fill();
}
- break;
+ break;
}
}
@@ -354,7 +354,7 @@ void TGeoChecker::CheckBoundaryErrors(Int_t ntracks, Double_t radius)
fTimer->Stop();
if (itry) printf("CPU time/point = %5.2emus: Real time/point = %5.2emus\n",
- 1000000.*fTimer->CpuTime()/itry,1000000.*fTimer->RealTime()/itry);
+ 1000000.*fTimer->CpuTime()/itry,1000000.*fTimer->RealTime()/itry);
bug->Write();
delete bug;
bug=0;
@@ -403,7 +403,7 @@ void TGeoChecker::CheckBoundaryReference(Int_t icheck)
for (Int_t i=0;i<nentries;i++) {
bug->GetEntry(i);
printf("%-9s error push=%g p=%5.4f %5.4f %5.4f s=%5.4f dot=%5.4f path=%s\n",
- cdir,push,xyz[0],xyz[1],xyz[2],1.,1.,path);
+ cdir,push,xyz[0],xyz[1],xyz[2],1.,1.,path);
}
} else {
if (icheck>=nentries) return;
@@ -411,7 +411,7 @@ void TGeoChecker::CheckBoundaryReference(Int_t icheck)
TGeoManager::SetVerboseLevel(5);
bug->GetEntry(icheck);
printf("%-9s error push=%g p=%5.4f %5.4f %5.4f s=%5.4f dot=%5.4f path=%s\n",
- cdir,push,xyz[0],xyz[1],xyz[2],1.,1.,path);
+ cdir,push,xyz[0],xyz[1],xyz[2],1.,1.,path);
fGeoManager->SetCurrentPoint(xyz);
fGeoManager->SetCurrentDirection(dir);
fGeoManager->FindNode();
diff --git a/graf2d/cocoa/src/MenuLoader.mm b/graf2d/cocoa/src/MenuLoader.mm
index 6f6790913ca..ba61b655f96 100644
--- a/graf2d/cocoa/src/MenuLoader.mm
+++ b/graf2d/cocoa/src/MenuLoader.mm
@@ -22,32 +22,32 @@ void PopulateMainMenu()
{
const Util::AutoreleasePool pool;
- NSMenu * const mainMenu = [[NSMenu alloc] initWithTitle : @"NSMainMenu"];
+ NSMenu * const mainMenu = [[NSMenu alloc] initWithTitle : @"NSMainMenu"];
const Util::NSScopeGuard<NSMenu> mainMenuGuard(mainMenu);
-
- // The strings in the menu bar come from the submenu titles,
- // except for the application menu, whose title is ignored at runtime.
+
+ // The strings in the menu bar come from the submenu titles,
+ // except for the application menu, whose title is ignored at runtime.
NSMenuItem *menuItem = [mainMenu addItemWithTitle : @"Apple" action : nil keyEquivalent:@""];
- NSMenu *submenu = [[NSMenu alloc] initWithTitle : @"Apple"];
+ NSMenu *submenu = [[NSMenu alloc] initWithTitle : @"Apple"];
const Util::NSScopeGuard<NSMenu> submenuGuard1(submenu);
PopulateApplicationMenu(submenu);
- [mainMenu setSubmenu : submenu forItem : menuItem];
-
- menuItem = [mainMenu addItemWithTitle : @"Window" action : nil keyEquivalent : @""];
- submenu = [[NSMenu alloc] initWithTitle : NSLocalizedString(@"Window", @"The Window menu")];
+ [mainMenu setSubmenu : submenu forItem : menuItem];
+
+ menuItem = [mainMenu addItemWithTitle : @"Window" action : nil keyEquivalent : @""];
+ submenu = [[NSMenu alloc] initWithTitle : NSLocalizedString(@"Window", @"The Window menu")];
const Util::NSScopeGuard<NSMenu> submenuGuard2(submenu);
- PopulateWindowMenu(submenu);
- [mainMenu setSubmenu : submenu forItem : menuItem];
- [NSApp setWindowsMenu : submenu];
-
- menuItem = [mainMenu addItemWithTitle:@"Help" action:NULL keyEquivalent:@""];
- submenu = [[NSMenu alloc] initWithTitle:NSLocalizedString(@"Help", @"The Help menu")];
+ PopulateWindowMenu(submenu);
+ [mainMenu setSubmenu : submenu forItem : menuItem];
+ [NSApp setWindowsMenu : submenu];
+
+ menuItem = [mainMenu addItemWithTitle:@"Help" action:NULL keyEquivalent:@""];
+ submenu = [[NSMenu alloc] initWithTitle:NSLocalizedString(@"Help", @"The Help menu")];
const Util::NSScopeGuard<NSMenu> submenuGuard3(submenu);
- PopulateHelpMenu(submenu);
- [mainMenu setSubmenu : submenu forItem : menuItem];
-
- [NSApp setMainMenu : mainMenu];
+ PopulateHelpMenu(submenu);
+ [mainMenu setSubmenu : submenu forItem : menuItem];
+
+ [NSApp setMainMenu : mainMenu];
[NSMenu setMenuBarVisible : YES];
}
@@ -56,31 +56,31 @@ void PopulateApplicationMenu(NSMenu *aMenu)
{
assert(aMenu != nil && "PopulateApplicationMenu, aMenu parameter is nil");
- NSString * const applicationName = @"root";
-
- NSMenuItem *menuItem = [aMenu addItemWithTitle : [NSString stringWithFormat : @"%@ %@",
+ NSString * const applicationName = @"root";
+
+ NSMenuItem *menuItem = [aMenu addItemWithTitle : [NSString stringWithFormat : @"%@ %@",
NSLocalizedString(@"About", nil), applicationName]
action : @selector(orderFrontStandardAboutPanel:) keyEquivalent : @""];
- [menuItem setTarget : NSApp];
- [aMenu addItem : [NSMenuItem separatorItem]];
+ [menuItem setTarget : NSApp];
+ [aMenu addItem : [NSMenuItem separatorItem]];
- menuItem = [aMenu addItemWithTitle : [NSString stringWithFormat : @"%@ %@",
+ menuItem = [aMenu addItemWithTitle : [NSString stringWithFormat : @"%@ %@",
NSLocalizedString(@"Hide", nil), applicationName] action : @selector(hide:) keyEquivalent : @"h"];
- [menuItem setTarget : NSApp];
-
- menuItem = [aMenu addItemWithTitle : NSLocalizedString(@"Hide Others", nil)
+ [menuItem setTarget : NSApp];
+
+ menuItem = [aMenu addItemWithTitle : NSLocalizedString(@"Hide Others", nil)
action : @selector(hideOtherApplications:) keyEquivalent : @"h"];
- [menuItem setKeyEquivalentModifierMask : NSCommandKeyMask | NSAlternateKeyMask];
- [menuItem setTarget : NSApp];
-
- menuItem = [aMenu addItemWithTitle : NSLocalizedString(@"Show All", nil)
+ [menuItem setKeyEquivalentModifierMask : NSCommandKeyMask | NSAlternateKeyMask];
+ [menuItem setTarget : NSApp];
+
+ menuItem = [aMenu addItemWithTitle : NSLocalizedString(@"Show All", nil)
action : @selector(unhideAllApplications:) keyEquivalent : @""];
- [menuItem setTarget : NSApp];
-
- [aMenu addItem : [NSMenuItem separatorItem]];
- menuItem = [aMenu addItemWithTitle : [NSString stringWithFormat : @"%@ %@",
+ [menuItem setTarget : NSApp];
+
+ [aMenu addItem : [NSMenuItem separatorItem]];
+ menuItem = [aMenu addItemWithTitle : [NSString stringWithFormat : @"%@ %@",
NSLocalizedString(@"Quit", nil), applicationName] action : @selector(terminate:) keyEquivalent : @"q"];
- [menuItem setTarget : NSApp];
+ [menuItem setTarget : NSApp];
}
//______________________________________________________________________________
@@ -88,12 +88,12 @@ void PopulateWindowMenu(NSMenu *aMenu)
{
assert(aMenu != nil && "PopulateWindowMenu, aMenu parameter is nil");
- NSMenuItem *menuItem = [aMenu addItemWithTitle : NSLocalizedString(@"Minimize", nil)
+ NSMenuItem *menuItem = [aMenu addItemWithTitle : NSLocalizedString(@"Minimize", nil)
action : @selector(performMinimize:) keyEquivalent : @"m"];
- menuItem = [aMenu addItemWithTitle : NSLocalizedString(@"Zoom", nil)
+ menuItem = [aMenu addItemWithTitle : NSLocalizedString(@"Zoom", nil)
action : @selector(performZoom:) keyEquivalent : @""];
- [aMenu addItem : [NSMenuItem separatorItem]];
- menuItem = [aMenu addItemWithTitle : NSLocalizedString(@"Bring All to Front", nil)
+ [aMenu addItem : [NSMenuItem separatorItem]];
+ menuItem = [aMenu addItemWithTitle : NSLocalizedString(@"Bring All to Front", nil)
action : @selector(arrangeInFront:) keyEquivalent : @""];
}
@@ -102,7 +102,7 @@ void PopulateHelpMenu(NSMenu *aMenu)
{
NSMenuItem * const menuItem = [aMenu addItemWithTitle : [NSString stringWithFormat : @"%@ %@", @"root",
NSLocalizedString(@"Help", nil)] action : @selector(showHelp:) keyEquivalent : @"?"];
- [menuItem setTarget : NSApp];
+ [menuItem setTarget : NSApp];
}
}//Detail
diff --git a/graf2d/graf/inc/TMathText.h b/graf2d/graf/inc/TMathText.h
index b392e015956..d782469fa1e 100644
--- a/graf2d/graf/inc/TMathText.h
+++ b/graf2d/graf/inc/TMathText.h
@@ -23,48 +23,47 @@
class TMathTextRenderer;
-class TMathText
- : public TText, public TAttFill {
+class TMathText : public TText, public TAttFill {
protected:
- void *fRenderer; //!TMathText Painter
- TMathText &operator=(const TMathText &);
+ void *fRenderer; //!TMathText Painter
+ TMathText &operator=(const TMathText &);
- void Render(const Double_t x, const Double_t y,
- const Double_t size, const Double_t angle,
- const Char_t *t, const Int_t length);
- void GetSize(Double_t &x0, Double_t &y0,
- Double_t &x1, Double_t &y1,
- const Double_t size, const Double_t angle,
- const Char_t *t, const Int_t length);
- void GetAlignPoint(Double_t &x0, Double_t &y0,
- const Double_t size, const Double_t angle,
- const Char_t *t, const Int_t length,
- const Short_t align);
+ void Render(const Double_t x, const Double_t y,
+ const Double_t size, const Double_t angle,
+ const Char_t *t, const Int_t length);
+ void GetSize(Double_t &x0, Double_t &y0,
+ Double_t &x1, Double_t &y1,
+ const Double_t size, const Double_t angle,
+ const Char_t *t, const Int_t length);
+ void GetAlignPoint(Double_t &x0, Double_t &y0,
+ const Double_t size, const Double_t angle,
+ const Char_t *t, const Int_t length,
+ const Short_t align);
public:
- enum {
- kTextNDC = BIT(14)
- };
- TMathText(void);
- TMathText(
- Double_t x, Double_t y, const char *text);
- TMathText(const TMathText &text);
- virtual ~TMathText(void);
- void Copy(TObject &text) const;
- TMathText *DrawMathText(
- Double_t x, Double_t y, const char *text);
- void GetBoundingBox(
- UInt_t &w, UInt_t &h, Bool_t angle = kFALSE);
- Double_t GetXsize(void);
- Double_t GetYsize(void);
- virtual void Paint(Option_t *option = "");
- virtual void PaintMathText(
- Double_t x, Double_t y, Double_t angle, Double_t size,
- const char *text);
- virtual void SavePrimitive(
- std::ostream &out, Option_t *option = "");
- friend class TMathTextRenderer;
+ enum {
+ kTextNDC = BIT(14)
+ };
+ TMathText(void);
+ TMathText(
+ Double_t x, Double_t y, const char *text);
+ TMathText(const TMathText &text);
+ virtual ~TMathText(void);
+ void Copy(TObject &text) const;
+ TMathText *DrawMathText(
+ Double_t x, Double_t y, const char *text);
+ void GetBoundingBox(
+ UInt_t &w, UInt_t &h, Bool_t angle = kFALSE);
+ Double_t GetXsize(void);
+ Double_t GetYsize(void);
+ virtual void Paint(Option_t *option = "");
+ virtual void PaintMathText(
+ Double_t x, Double_t y, Double_t angle, Double_t size,
+ const char *text);
+ virtual void SavePrimitive(
+ std::ostream &out, Option_t *option = "");
+ friend class TMathTextRenderer;
- ClassDef(TMathText,2) //TeX mathematical formula
+ ClassDef(TMathText,2) //TeX mathematical formula
};
#endif
diff --git a/graf2d/graf/src/TCurlyArc.cxx b/graf2d/graf/src/TCurlyArc.cxx
index 2cc84ce62d5..5d2d3fd1c3f 100644
--- a/graf2d/graf/src/TCurlyArc.cxx
+++ b/graf2d/graf/src/TCurlyArc.cxx
@@ -402,7 +402,7 @@ void TCurlyArc::ExecuteEvent(Int_t event, Int_t px, Int_t py)
rLx = gPad->AbsPixeltoX(px1+r1);
rRx = gPad->AbsPixeltoX(px1-r1);
fR1 = TMath::Abs(rRx-rLx)/2;
- }
+ }
Build();
gPad->Modified(kTRUE);
if (!opaque) gVirtualX->SetLineColor(-1);
diff --git a/graf2d/graf/src/TGraphPolar.cxx b/graf2d/graf/src/TGraphPolar.cxx
index 00f0e5d84f5..d3fbd8d3cc0 100644
--- a/graf2d/graf/src/TGraphPolar.cxx
+++ b/graf2d/graf/src/TGraphPolar.cxx
@@ -26,7 +26,7 @@ Begin_Macro(source)
Double_t radius[8];
Double_t etheta[8];
Double_t eradius[8];
-
+
for (int i=0; i<8; i++) {
theta[i] = (i+1)*(TMath::Pi()/4.);
radius[i] = (i+1)*0.05;
diff --git a/graf2d/graf/src/TTF.cxx b/graf2d/graf/src/TTF.cxx
index f48ae382136..2c46747e02b 100644
--- a/graf2d/graf/src/TTF.cxx
+++ b/graf2d/graf/src/TTF.cxx
@@ -502,38 +502,38 @@ void TTF::SetTextFont(Font_t fontnumber)
// Table of Microsoft and (for non-MSFT operating systems) backup
// FreeFont TTF fonts.
static const char *fonttable[][2] = {
- { "Root.TTFont.0", "FreeSansBold.otf" },
- { "Root.TTFont.1", "FreeSerifItalic.otf" },
- { "Root.TTFont.2", "FreeSerifBold.otf" },
- { "Root.TTFont.3", "FreeSerifBoldItalic.otf" },
- { "Root.TTFont.4", "FreeSans.otf" },
- { "Root.TTFont.5", "FreeSansOblique.otf" },
- { "Root.TTFont.6", "FreeSansBold.otf" },
- { "Root.TTFont.7", "FreeSansBoldOblique.otf" },
- { "Root.TTFont.8", "FreeMono.otf" },
- { "Root.TTFont.9", "FreeMonoOblique.otf" },
- { "Root.TTFont.10", "FreeMonoBold.otf" },
- { "Root.TTFont.11", "FreeMonoBoldOblique.otf" },
- { "Root.TTFont.12", "symbol.ttf" },
- { "Root.TTFont.13", "FreeSerif.otf" },
- { "Root.TTFont.14", "wingding.ttf" },
- { "Root.TTFont.15", "symbol.ttf" },
- { "Root.TTFont.STIXGen", "STIXGeneral.otf" },
- { "Root.TTFont.STIXGenIt", "STIXGeneralItalic.otf" },
- { "Root.TTFont.STIXGenBd", "STIXGeneralBol.otf" },
- { "Root.TTFont.STIXGenBdIt", "STIXGeneralBolIta.otf" },
- { "Root.TTFont.STIXSiz1Sym", "STIXSiz1Sym.otf" },
- { "Root.TTFont.STIXSiz1SymBd", "STIXSiz1SymBol.otf" },
- { "Root.TTFont.STIXSiz2Sym", "STIXSiz2Sym.otf" },
- { "Root.TTFont.STIXSiz2SymBd", "STIXSiz2SymBol.otf" },
- { "Root.TTFont.STIXSiz3Sym", "STIXSiz3Sym.otf" },
- { "Root.TTFont.STIXSiz3SymBd", "STIXSiz3SymBol.otf" },
- { "Root.TTFont.STIXSiz4Sym", "STIXSiz4Sym.otf" },
- { "Root.TTFont.STIXSiz4SymBd", "STIXSiz4SymBol.otf" },
- { "Root.TTFont.STIXSiz5Sym", "STIXSiz5Sym.otf" },
- { "Root.TTFont.ME", "DroidSansFallback.ttf" },
- { "Root.TTFont.CJKMing", "DroidSansFallback.ttf" },
- { "Root.TTFont.CJKGothic", "DroidSansFallback.ttf" }
+ { "Root.TTFont.0", "FreeSansBold.otf" },
+ { "Root.TTFont.1", "FreeSerifItalic.otf" },
+ { "Root.TTFont.2", "FreeSerifBold.otf" },
+ { "Root.TTFont.3", "FreeSerifBoldItalic.otf" },
+ { "Root.TTFont.4", "FreeSans.otf" },
+ { "Root.TTFont.5", "FreeSansOblique.otf" },
+ { "Root.TTFont.6", "FreeSansBold.otf" },
+ { "Root.TTFont.7", "FreeSansBoldOblique.otf" },
+ { "Root.TTFont.8", "FreeMono.otf" },
+ { "Root.TTFont.9", "FreeMonoOblique.otf" },
+ { "Root.TTFont.10", "FreeMonoBold.otf" },
+ { "Root.TTFont.11", "FreeMonoBoldOblique.otf" },
+ { "Root.TTFont.12", "symbol.ttf" },
+ { "Root.TTFont.13", "FreeSerif.otf" },
+ { "Root.TTFont.14", "wingding.ttf" },
+ { "Root.TTFont.15", "symbol.ttf" },
+ { "Root.TTFont.STIXGen", "STIXGeneral.otf" },
+ { "Root.TTFont.STIXGenIt", "STIXGeneralItalic.otf" },
+ { "Root.TTFont.STIXGenBd", "STIXGeneralBol.otf" },
+ { "Root.TTFont.STIXGenBdIt", "STIXGeneralBolIta.otf" },
+ { "Root.TTFont.STIXSiz1Sym", "STIXSiz1Sym.otf" },
+ { "Root.TTFont.STIXSiz1SymBd", "STIXSiz1SymBol.otf" },
+ { "Root.TTFont.STIXSiz2Sym", "STIXSiz2Sym.otf" },
+ { "Root.TTFont.STIXSiz2SymBd", "STIXSiz2SymBol.otf" },
+ { "Root.TTFont.STIXSiz3Sym", "STIXSiz3Sym.otf" },
+ { "Root.TTFont.STIXSiz3SymBd", "STIXSiz3SymBol.otf" },
+ { "Root.TTFont.STIXSiz4Sym", "STIXSiz4Sym.otf" },
+ { "Root.TTFont.STIXSiz4SymBd", "STIXSiz4SymBol.otf" },
+ { "Root.TTFont.STIXSiz5Sym", "STIXSiz5Sym.otf" },
+ { "Root.TTFont.ME", "DroidSansFallback.ttf" },
+ { "Root.TTFont.CJKMing", "DroidSansFallback.ttf" },
+ { "Root.TTFont.CJKGothic", "DroidSansFallback.ttf" }
};
static int fontset = -1;
diff --git a/graf2d/gviz/src/TGraphEdge.cxx b/graf2d/gviz/src/TGraphEdge.cxx
index a9342febee6..b697cc32ad4 100644
--- a/graf2d/gviz/src/TGraphEdge.cxx
+++ b/graf2d/gviz/src/TGraphEdge.cxx
@@ -169,8 +169,8 @@ void TGraphEdge::Layout()
fArrY = bz.ep.y;
for (j=0; j<fN[i+1]; j++) {
fX[k] = bz.list[j].x;
- fY[k] = bz.list[j].y;
- k++;
+ fY[k] = bz.list[j].y;
+ k++;
}
}
}
@@ -220,7 +220,7 @@ void TGraphEdge::SaveAttributes(std::ostream &out, const char* name)
{
// Save attributes as a C++ statement(s) on output stream out
// called by TGraphStruct::SavePrimitive.
-
+
SaveLineAttributes(out,name,1,1,1);
}
diff --git a/graf2d/mathtext/inc/fontembed.h b/graf2d/mathtext/inc/fontembed.h
index 9318dbf4046..9cdeb729e74 100644
--- a/graf2d/mathtext/inc/fontembed.h
+++ b/graf2d/mathtext/inc/fontembed.h
@@ -36,87 +36,87 @@ typedef unsigned __int64 uint64_t;
namespace mathtext {
- class font_embed_t {
- private:
- struct table_data_s {
- char tag[4];
- std::vector<uint8_t> data;
- };
- static void subset_rename_otf_name_table(
- struct table_data_s &table_data, uint8_t *glyph_usage);
- static void subset_ttf_glyf_table(
- struct table_data_s &table_data, uint8_t *glyph_usage);
- static void subset_ttf_loca_table(
- struct table_data_s &table_data, uint8_t *glyph_usage);
- static void subset_ttf_post_table(
- struct table_data_s &table_data, uint8_t *glyph_usage);
- static void subset_otf_cff_table(
- struct table_data_s &table_data, uint8_t *glyph_usage);
- static void parse_ttf_encoding_subtable_format4(
- std::map<wchar_t, uint16_t> &cid_map,
- const std::vector<uint8_t> &font_data,
- const size_t offset, const uint16_t length);
- static unsigned int otf_check_sum(
- const std::vector<unsigned char> &table_data);
- public:
- // I/O
- static std::vector<unsigned char> read_font_data(FILE *);
- static std::vector<unsigned char> read_font_data(const std::string &filename);
- // Font parsing
- static bool parse_otf_cff_header(
- std::string &font_name, unsigned short &cid_encoding_id,
- unsigned int &cff_offset, unsigned int &cff_length,
- const std::vector<unsigned char> &font_data);
- static bool parse_ttf_header(
- std::string &font_name, double *font_bbox,
- std::map<wchar_t, uint16_t> &cid_map,
- std::vector<std::string> &char_strings,
- const std::vector<unsigned char> &font_data);
- // Font subsetting
- static std::vector<unsigned char> subset_otf(
- const std::vector<unsigned char> &font_data,
- const std::map<wchar_t, bool> &glyph_usage);
- };
+ class font_embed_t {
+ private:
+ struct table_data_s {
+ char tag[4];
+ std::vector<uint8_t> data;
+ };
+ static void subset_rename_otf_name_table(
+ struct table_data_s &table_data, uint8_t *glyph_usage);
+ static void subset_ttf_glyf_table(
+ struct table_data_s &table_data, uint8_t *glyph_usage);
+ static void subset_ttf_loca_table(
+ struct table_data_s &table_data, uint8_t *glyph_usage);
+ static void subset_ttf_post_table(
+ struct table_data_s &table_data, uint8_t *glyph_usage);
+ static void subset_otf_cff_table(
+ struct table_data_s &table_data, uint8_t *glyph_usage);
+ static void parse_ttf_encoding_subtable_format4(
+ std::map<wchar_t, uint16_t> &cid_map,
+ const std::vector<uint8_t> &font_data,
+ const size_t offset, const uint16_t length);
+ static unsigned int otf_check_sum(
+ const std::vector<unsigned char> &table_data);
+ public:
+ // I/O
+ static std::vector<unsigned char> read_font_data(FILE *);
+ static std::vector<unsigned char> read_font_data(const std::string &filename);
+ // Font parsing
+ static bool parse_otf_cff_header(
+ std::string &font_name, unsigned short &cid_encoding_id,
+ unsigned int &cff_offset, unsigned int &cff_length,
+ const std::vector<unsigned char> &font_data);
+ static bool parse_ttf_header(
+ std::string &font_name, double *font_bbox,
+ std::map<wchar_t, uint16_t> &cid_map,
+ std::vector<std::string> &char_strings,
+ const std::vector<unsigned char> &font_data);
+ // Font subsetting
+ static std::vector<unsigned char> subset_otf(
+ const std::vector<unsigned char> &font_data,
+ const std::map<wchar_t, bool> &glyph_usage);
+ };
- class font_embed_postscript_t : public font_embed_t {
- public:
- static void append_asciihex(
- std::string &ascii, const uint8_t *buffer,
- const size_t length);
- static unsigned int ascii85_line_count(
- const uint8_t *buffer, const size_t length);
- static void append_ascii85(
- std::string &ascii, const uint8_t *buffer,
- const size_t length);
- public:
- static std::string font_embed_type_1(
- std::string &font_name,
- const std::vector<unsigned char> &font_data);
- static std::string font_embed_type_2(
- std::string &font_name,
- const std::vector<unsigned char> &font_data);
- static std::string font_embed_type_42(
- std::string &font_name,
- const std::vector<unsigned char> &font_data);
- };
+ class font_embed_postscript_t : public font_embed_t {
+ public:
+ static void append_asciihex(
+ std::string &ascii, const uint8_t *buffer,
+ const size_t length);
+ static unsigned int ascii85_line_count(
+ const uint8_t *buffer, const size_t length);
+ static void append_ascii85(
+ std::string &ascii, const uint8_t *buffer,
+ const size_t length);
+ public:
+ static std::string font_embed_type_1(
+ std::string &font_name,
+ const std::vector<unsigned char> &font_data);
+ static std::string font_embed_type_2(
+ std::string &font_name,
+ const std::vector<unsigned char> &font_data);
+ static std::string font_embed_type_42(
+ std::string &font_name,
+ const std::vector<unsigned char> &font_data);
+ };
- class font_embed_pdf_t : public font_embed_t {
- public:
- static std::string font_embed_type_1(
- std::string &font_name,
- const std::vector<unsigned char> &font_data);
- static std::string font_embed_type_2(
- std::string &font_name,
- const std::vector<unsigned char> &font_data);
- static std::string font_embed_type_42(
- std::string &font_name,
- const std::vector<unsigned char> &font_data);
- };
+ class font_embed_pdf_t : public font_embed_t {
+ public:
+ static std::string font_embed_type_1(
+ std::string &font_name,
+ const std::vector<unsigned char> &font_data);
+ static std::string font_embed_type_2(
+ std::string &font_name,
+ const std::vector<unsigned char> &font_data);
+ static std::string font_embed_type_42(
+ std::string &font_name,
+ const std::vector<unsigned char> &font_data);
+ };
- class font_embed_svg_t : public font_embed_t {
- static std::string font_embed_svg(
- std::string &font_name,
- const std::vector<unsigned char> &font_data);
- };
+ class font_embed_svg_t : public font_embed_t {
+ static std::string font_embed_svg(
+ std::string &font_name,
+ const std::vector<unsigned char> &font_data);
+ };
}
diff --git a/graf2d/mathtext/inc/mathrender.h b/graf2d/mathtext/inc/mathrender.h
index fb314319bbb..a106b33cc11 100644
--- a/graf2d/mathtext/inc/mathrender.h
+++ b/graf2d/mathtext/inc/mathrender.h
@@ -39,850 +39,850 @@ typedef unsigned __int64 uint64_t;
namespace mathtext {
- /**
- * 2D point (and vector)
- */
- class point_t {
- private:
- float _x[2];
- public:
+ /**
+ * 2D point (and vector)
+ */
+ class point_t {
+ private:
+ float _x[2];
+ public:
inline point_t(void) : _x()
- {
- }
- inline point_t(const point_t &point)
- {
- _x[0] = point._x[0];
- _x[1] = point._x[1];
- }
- inline point_t(const float x0, const float y0)
- {
- _x[0] = x0;
- _x[1] = y0;
- }
- inline const float *x(void) const
- {
- return _x;
- }
- inline float *x(void)
- {
- return _x;
- }
- inline float operator[](const int n) const
- {
- return _x[n];
- }
- inline float &operator[](const int n)
- {
- return _x[n];
- }
- inline point_t operator+(const point_t &point) const
- {
- return point_t(_x[0] + point._x[0],
- _x[1] + point._x[1]);
- }
- inline point_t operator-(const point_t &point) const
- {
- return point_t(_x[0] - point._x[0],
- _x[1] - point._x[1]);
- }
- inline point_t operator+=(const point_t &point)
- {
- _x[0] += point._x[0];
- _x[1] += point._x[1];
+ {
+ }
+ inline point_t(const point_t &point)
+ {
+ _x[0] = point._x[0];
+ _x[1] = point._x[1];
+ }
+ inline point_t(const float x0, const float y0)
+ {
+ _x[0] = x0;
+ _x[1] = y0;
+ }
+ inline const float *x(void) const
+ {
+ return _x;
+ }
+ inline float *x(void)
+ {
+ return _x;
+ }
+ inline float operator[](const int n) const
+ {
+ return _x[n];
+ }
+ inline float &operator[](const int n)
+ {
+ return _x[n];
+ }
+ inline point_t operator+(const point_t &point) const
+ {
+ return point_t(_x[0] + point._x[0],
+ _x[1] + point._x[1]);
+ }
+ inline point_t operator-(const point_t &point) const
+ {
+ return point_t(_x[0] - point._x[0],
+ _x[1] - point._x[1]);
+ }
+ inline point_t operator+=(const point_t &point)
+ {
+ _x[0] += point._x[0];
+ _x[1] += point._x[1];
- return *this;
- }
- inline point_t operator-=(const point_t &point)
- {
- _x[0] -= point._x[0];
- _x[1] -= point._x[1];
+ return *this;
+ }
+ inline point_t operator-=(const point_t &point)
+ {
+ _x[0] -= point._x[0];
+ _x[1] -= point._x[1];
- return *this;
- }
- inline point_t operator*(const float scale) const
- {
- return point_t(_x[0] * scale, _x[1] * scale);
- }
- inline point_t operator/(const float scale) const
- {
- return point_t(_x[0] / scale, _x[1] / scale);
- }
- inline point_t operator*=(const float scale)
- {
- _x[0] *= scale;
- _x[1] *= scale;
+ return *this;
+ }
+ inline point_t operator*(const float scale) const
+ {
+ return point_t(_x[0] * scale, _x[1] * scale);
+ }
+ inline point_t operator/(const float scale) const
+ {
+ return point_t(_x[0] / scale, _x[1] / scale);
+ }
+ inline point_t operator*=(const float scale)
+ {
+ _x[0] *= scale;
+ _x[1] *= scale;
- return *this;
- }
- inline float dot(const point_t &point) const
- {
- return _x[0] * point._x[0] + _x[1] * point._x[1];
- }
- inline float cross(const point_t &point) const
- {
- return _x[0] * point._x[1] - _x[1] * point._x[0];
- }
- inline float norm_square(void) const
- {
- return _x[0] * _x[0] + _x[1] * _x[1];
- }
- inline float norm(void) const
- {
- return sqrtf(norm_square());
- }
- inline point_t unit_vector(void) const
- {
- return *this / norm();
- }
- inline point_t rotate_cw(void) const
- {
- return point_t(_x[1], -_x[0]);
- }
- inline point_t rotate_ccw(void) const
- {
- return point_t(-_x[1], _x[0]);
- }
- inline bool operator==(const point_t &point) const
- {
- return _x[0] == point._x[0] && _x[1] == point._x[1];
- }
- inline bool operator!=(const point_t &point) const
- {
- return _x[0] != point._x[0] || _x[1] != point._x[1];
- }
- friend point_t operator*(const float scale,
- const point_t &point);
- operator std::string(void) const;
- };
+ return *this;
+ }
+ inline float dot(const point_t &point) const
+ {
+ return _x[0] * point._x[0] + _x[1] * point._x[1];
+ }
+ inline float cross(const point_t &point) const
+ {
+ return _x[0] * point._x[1] - _x[1] * point._x[0];
+ }
+ inline float norm_square(void) const
+ {
+ return _x[0] * _x[0] + _x[1] * _x[1];
+ }
+ inline float norm(void) const
+ {
+ return sqrtf(norm_square());
+ }
+ inline point_t unit_vector(void) const
+ {
+ return *this / norm();
+ }
+ inline point_t rotate_cw(void) const
+ {
+ return point_t(_x[1], -_x[0]);
+ }
+ inline point_t rotate_ccw(void) const
+ {
+ return point_t(-_x[1], _x[0]);
+ }
+ inline bool operator==(const point_t &point) const
+ {
+ return _x[0] == point._x[0] && _x[1] == point._x[1];
+ }
+ inline bool operator!=(const point_t &point) const
+ {
+ return _x[0] != point._x[0] || _x[1] != point._x[1];
+ }
+ friend point_t operator*(const float scale,
+ const point_t &point);
+ operator std::string(void) const;
+ };
- inline point_t operator*(const float scale, const point_t &point)
- {
- return point_t(scale * point._x[0], scale * point._x[1]);
- }
+ inline point_t operator*(const float scale, const point_t &point)
+ {
+ return point_t(scale * point._x[0], scale * point._x[1]);
+ }
- /**
- * General 2D affine transform of the Adobe Imaging Model
- *
- * The n-D affine transform is generally represented by
- *
- * ( xt ) ( a0 a1 a2 ) ( x )
- * ( yt ) = ( a3 a4 a5 ) ( y )
- * ( 1 ) ( 0 0 1 ) ( 1 )
- *
- * with (a0, a1, a3, a4) representing the linear component of the
- * transform, i.e. rotation and scaling, while (a2, a5) is the
- * translation vector
- *
- * @see Adobe Systems, Inc., PostScript Language Reference Manual
- * (Addison-Wesley, Reading, MA, 1999), section 4.3.3, pp.
- * 187-189.
- * @see Adobe Systems, Inc., PDF Reference, 6th Edition, Version
- * 1.7 (Adobe Systems, Inc., San Jose, CA, 2006), section
- * 4.2.2-4.2.3, pp. 204-209.
- */
- class affine_transform_t {
- private:
- float _a[6];
- public:
- static const affine_transform_t identity;
- static const affine_transform_t flip_y;
- static affine_transform_t
- translate(const float tx, const float ty);
- static affine_transform_t
- scale(const float sx, const float sy);
- static affine_transform_t rotate(const float angle);
- inline affine_transform_t(
- const float a0, const float b, const float c,
- const float d, const float tx, const float ty)
- {
- _a[0] = a0;
- _a[1] = b;
- _a[2] = c;
- _a[3] = d;
- _a[4] = tx;
- _a[5] = ty;
- }
- inline const float *a(void) const
- {
- return _a;
- }
- inline float *a(void)
- {
- return _a;
- }
- inline float operator[](const int n) const
- {
- return _a[n];
- }
- inline float &operator[](const int n)
- {
- return _a[n];
- }
- inline affine_transform_t linear(void) const
- {
- return affine_transform_t(
- _a[0], _a[1], _a[2], _a[3], 0.0F, 0.0F);
- }
- inline affine_transform_t translate(void) const
- {
- return affine_transform_t(
- 1.0F, 0.0F, 0.0F, 1.0F, _a[4], _a[5]);
- }
- inline affine_transform_t operator*(const float s) const
- {
- return affine_transform_t(
- _a[0] * s, _a[1] * s, _a[2] * s, _a[3] * s,
- _a[4] * s, _a[5] * s);
- }
- inline affine_transform_t operator/(const float s) const
- {
- return affine_transform_t(
- _a[0] / s, _a[1] / s, _a[2] / s, _a[3] / s,
- _a[4] / s, _a[5] / s);
- }
- inline point_t operator*(const point_t x) const
- {
- return point_t(
- _a[0] * x[0] + _a[2] * x[1] + _a[4],
- _a[1] * x[0] + _a[3] * x[1] + _a[5]);
- }
- /**
- * Returns the affine transform of b, i.e. the matrix-vector
- * product (*this) (b^T, 1)^T, of the vector b
- *
- * @returns the affine transform of the vector b
- */
- inline affine_transform_t
- operator*(const affine_transform_t b) const
- {
- return affine_transform_t(
- _a[0] * b._a[0] + _a[1] * b._a[2],
- _a[0] * b._a[1] + _a[1] * b._a[3],
- _a[2] * b._a[0] + _a[3] * b._a[2],
- _a[2] * b._a[1] + _a[3] * b._a[3],
- _a[4] * b._a[0] + _a[5] * b._a[2] + b._a[4],
- _a[4] * b._a[1] + _a[5] * b._a[3] + b._a[5]);
- }
- /**
- * Returns the determinant det(*this) of the affine transform
- *
- * @returns the determinant det(*this) of the affine transform
- */
- inline float determinant(void) const
- {
- return _a[0] * _a[3] - _a[1] * _a[2];
- }
- /**
- * Returns the determinant (*this)^(-1) of the affine
- * transform
- *
- * @returns the determinant (*this)^(-1) of the affine
- * transform
- */
- inline affine_transform_t inverse(void) const
- {
- return affine_transform_t(
- _a[3], -_a[1], -_a[2], _a[0],
- _a[2] * _a[5] - _a[3] * _a[4],
- _a[1] * _a[4] - _a[0] * _a[5]) *
- (1.0F / determinant());
- }
- operator std::string(void) const;
- };
+ /**
+ * General 2D affine transform of the Adobe Imaging Model
+ *
+ * The n-D affine transform is generally represented by
+ *
+ * ( xt ) ( a0 a1 a2 ) ( x )
+ * ( yt ) = ( a3 a4 a5 ) ( y )
+ * ( 1 ) ( 0 0 1 ) ( 1 )
+ *
+ * with (a0, a1, a3, a4) representing the linear component of the
+ * transform, i.e. rotation and scaling, while (a2, a5) is the
+ * translation vector
+ *
+ * @see Adobe Systems, Inc., PostScript Language Reference Manual
+ * (Addison-Wesley, Reading, MA, 1999), section 4.3.3, pp.
+ * 187-189.
+ * @see Adobe Systems, Inc., PDF Reference, 6th Edition, Version
+ * 1.7 (Adobe Systems, Inc., San Jose, CA, 2006), section
+ * 4.2.2-4.2.3, pp. 204-209.
+ */
+ class affine_transform_t {
+ private:
+ float _a[6];
+ public:
+ static const affine_transform_t identity;
+ static const affine_transform_t flip_y;
+ static affine_transform_t
+ translate(const float tx, const float ty);
+ static affine_transform_t
+ scale(const float sx, const float sy);
+ static affine_transform_t rotate(const float angle);
+ inline affine_transform_t(
+ const float a0, const float b, const float c,
+ const float d, const float tx, const float ty)
+ {
+ _a[0] = a0;
+ _a[1] = b;
+ _a[2] = c;
+ _a[3] = d;
+ _a[4] = tx;
+ _a[5] = ty;
+ }
+ inline const float *a(void) const
+ {
+ return _a;
+ }
+ inline float *a(void)
+ {
+ return _a;
+ }
+ inline float operator[](const int n) const
+ {
+ return _a[n];
+ }
+ inline float &operator[](const int n)
+ {
+ return _a[n];
+ }
+ inline affine_transform_t linear(void) const
+ {
+ return affine_transform_t(
+ _a[0], _a[1], _a[2], _a[3], 0.0F, 0.0F);
+ }
+ inline affine_transform_t translate(void) const
+ {
+ return affine_transform_t(
+ 1.0F, 0.0F, 0.0F, 1.0F, _a[4], _a[5]);
+ }
+ inline affine_transform_t operator*(const float s) const
+ {
+ return affine_transform_t(
+ _a[0] * s, _a[1] * s, _a[2] * s, _a[3] * s,
+ _a[4] * s, _a[5] * s);
+ }
+ inline affine_transform_t operator/(const float s) const
+ {
+ return affine_transform_t(
+ _a[0] / s, _a[1] / s, _a[2] / s, _a[3] / s,
+ _a[4] / s, _a[5] / s);
+ }
+ inline point_t operator*(const point_t x) const
+ {
+ return point_t(
+ _a[0] * x[0] + _a[2] * x[1] + _a[4],
+ _a[1] * x[0] + _a[3] * x[1] + _a[5]);
+ }
+ /**
+ * Returns the affine transform of b, i.e. the matrix-vector
+ * product (*this) (b^T, 1)^T, of the vector b
+ *
+ * @returns the affine transform of the vector b
+ */
+ inline affine_transform_t
+ operator*(const affine_transform_t b) const
+ {
+ return affine_transform_t(
+ _a[0] * b._a[0] + _a[1] * b._a[2],
+ _a[0] * b._a[1] + _a[1] * b._a[3],
+ _a[2] * b._a[0] + _a[3] * b._a[2],
+ _a[2] * b._a[1] + _a[3] * b._a[3],
+ _a[4] * b._a[0] + _a[5] * b._a[2] + b._a[4],
+ _a[4] * b._a[1] + _a[5] * b._a[3] + b._a[5]);
+ }
+ /**
+ * Returns the determinant det(*this) of the affine transform
+ *
+ * @returns the determinant det(*this) of the affine transform
+ */
+ inline float determinant(void) const
+ {
+ return _a[0] * _a[3] - _a[1] * _a[2];
+ }
+ /**
+ * Returns the determinant (*this)^(-1) of the affine
+ * transform
+ *
+ * @returns the determinant (*this)^(-1) of the affine
+ * transform
+ */
+ inline affine_transform_t inverse(void) const
+ {
+ return affine_transform_t(
+ _a[3], -_a[1], -_a[2], _a[0],
+ _a[2] * _a[5] - _a[3] * _a[4],
+ _a[1] * _a[4] - _a[0] * _a[5]) *
+ (1.0F / determinant());
+ }
+ operator std::string(void) const;
+ };
- /**
- * General TeX bounding box
- */
- // FIXME: The skewchar mechanism is missing
- class bounding_box_t {
- private:
- point_t _lower_left;
- point_t _upper_right;
- float _advance;
- float _italic_correction;
- public:
+ /**
+ * General TeX bounding box
+ */
+ // FIXME: The skewchar mechanism is missing
+ class bounding_box_t {
+ private:
+ point_t _lower_left;
+ point_t _upper_right;
+ float _advance;
+ float _italic_correction;
+ public:
inline bounding_box_t(void) : _lower_left(), _upper_right(), _advance(), _italic_correction()
- {
- }
- inline bounding_box_t(
- const point_t lower_left_0, const point_t upper_right_0,
- const float advance_0, const float italic_correction_0)
- : _lower_left(lower_left_0), _upper_right(upper_right_0),
- _advance(advance_0),
- _italic_correction(italic_correction_0)
- {
- }
- inline bounding_box_t(
- const float left_0, const float bottom_0, const float right_0,
- const float top_0, const float advance_0,
- const float italic_correction_0)
- : _advance(advance_0),
- _italic_correction(italic_correction_0)
- {
- _lower_left[0] = left_0;
- _lower_left[1] = bottom_0;
- _upper_right[0] = right_0;
- _upper_right[1] = top_0;
- }
- inline point_t lower_left(void) const
- {
- return _lower_left;
- }
- inline point_t &lower_left(void)
- {
- return _lower_left;
- }
- inline point_t upper_right(void) const
- {
- return _upper_right;
- }
- inline point_t &upper_right(void)
- {
- return _upper_right;
- }
- inline float left(void) const
- {
- return _lower_left[0];
- }
- inline float &left(void)
- {
- return _lower_left[0];
- }
- inline float top(void) const
- {
- return _upper_right[1];
- }
- inline float &top(void)
- {
- return _upper_right[1];
- }
- inline float right(void) const
- {
- return _upper_right[0];
- }
- inline float &right(void)
- {
- return _upper_right[0];
- }
- inline float bottom(void) const
- {
- return _lower_left[1];
- }
- inline float &bottom(void)
- {
- return _lower_left[1];
- }
- inline float advance(void) const
- {
- return _advance;
- }
- inline float &advance(void)
- {
- return _advance;
- }
- inline float italic_correction(void) const
- {
- return _italic_correction;
- }
- inline float &italic_correction(void)
- {
- return _italic_correction;
- }
- inline float width(void) const
- {
- return _upper_right[0] - _lower_left[0];
- }
- inline float height(void) const
- {
- return _upper_right[1] - _lower_left[1];
- }
- inline float horizontal_center(void) const
- {
- return 0.5F * (_lower_left[0] + _upper_right[0]);
- }
- inline float vertical_center(void) const
- {
- return 0.5F * (_lower_left[1] + _upper_right[1]);
- }
- inline float ascent(void) const
- {
- return _upper_right[1];
- }
- inline float descent(void) const
- {
- return -_lower_left[1];
- }
- inline bounding_box_t
- merge(const bounding_box_t &bounding_box) const
- {
- bounding_box_t ret;
+ {
+ }
+ inline bounding_box_t(
+ const point_t lower_left_0, const point_t upper_right_0,
+ const float advance_0, const float italic_correction_0)
+ : _lower_left(lower_left_0), _upper_right(upper_right_0),
+ _advance(advance_0),
+ _italic_correction(italic_correction_0)
+ {
+ }
+ inline bounding_box_t(
+ const float left_0, const float bottom_0, const float right_0,
+ const float top_0, const float advance_0,
+ const float italic_correction_0)
+ : _advance(advance_0),
+ _italic_correction(italic_correction_0)
+ {
+ _lower_left[0] = left_0;
+ _lower_left[1] = bottom_0;
+ _upper_right[0] = right_0;
+ _upper_right[1] = top_0;
+ }
+ inline point_t lower_left(void) const
+ {
+ return _lower_left;
+ }
+ inline point_t &lower_left(void)
+ {
+ return _lower_left;
+ }
+ inline point_t upper_right(void) const
+ {
+ return _upper_right;
+ }
+ inline point_t &upper_right(void)
+ {
+ return _upper_right;
+ }
+ inline float left(void) const
+ {
+ return _lower_left[0];
+ }
+ inline float &left(void)
+ {
+ return _lower_left[0];
+ }
+ inline float top(void) const
+ {
+ return _upper_right[1];
+ }
+ inline float &top(void)
+ {
+ return _upper_right[1];
+ }
+ inline float right(void) const
+ {
+ return _upper_right[0];
+ }
+ inline float &right(void)
+ {
+ return _upper_right[0];
+ }
+ inline float bottom(void) const
+ {
+ return _lower_left[1];
+ }
+ inline float &bottom(void)
+ {
+ return _lower_left[1];
+ }
+ inline float advance(void) const
+ {
+ return _advance;
+ }
+ inline float &advance(void)
+ {
+ return _advance;
+ }
+ inline float italic_correction(void) const
+ {
+ return _italic_correction;
+ }
+ inline float &italic_correction(void)
+ {
+ return _italic_correction;
+ }
+ inline float width(void) const
+ {
+ return _upper_right[0] - _lower_left[0];
+ }
+ inline float height(void) const
+ {
+ return _upper_right[1] - _lower_left[1];
+ }
+ inline float horizontal_center(void) const
+ {
+ return 0.5F * (_lower_left[0] + _upper_right[0]);
+ }
+ inline float vertical_center(void) const
+ {
+ return 0.5F * (_lower_left[1] + _upper_right[1]);
+ }
+ inline float ascent(void) const
+ {
+ return _upper_right[1];
+ }
+ inline float descent(void) const
+ {
+ return -_lower_left[1];
+ }
+ inline bounding_box_t
+ merge(const bounding_box_t &bounding_box) const
+ {
+ bounding_box_t ret;
- ret._lower_left[0] =
- std::min(_lower_left[0],
- bounding_box._lower_left[0]);
- ret._lower_left[1] =
- std::min(_lower_left[1],
- bounding_box._lower_left[1]);
- if(bounding_box._upper_right[0] > _upper_right[0]) {
- ret._upper_right[0] = bounding_box._upper_right[0];
- ret._italic_correction =
- bounding_box._italic_correction;
- }
- else {
- ret._upper_right[0] = _upper_right[0];
- ret._italic_correction = _italic_correction;
- }
- ret._upper_right[1] =
- std::max(_upper_right[1],
- bounding_box._upper_right[1]);
- ret._advance =
- std::max(_upper_right[0] + _advance,
- bounding_box._upper_right[0] +
- bounding_box._advance) -
- ret._upper_right[0];
+ ret._lower_left[0] =
+ std::min(_lower_left[0],
+ bounding_box._lower_left[0]);
+ ret._lower_left[1] =
+ std::min(_lower_left[1],
+ bounding_box._lower_left[1]);
+ if(bounding_box._upper_right[0] > _upper_right[0]) {
+ ret._upper_right[0] = bounding_box._upper_right[0];
+ ret._italic_correction =
+ bounding_box._italic_correction;
+ }
+ else {
+ ret._upper_right[0] = _upper_right[0];
+ ret._italic_correction = _italic_correction;
+ }
+ ret._upper_right[1] =
+ std::max(_upper_right[1],
+ bounding_box._upper_right[1]);
+ ret._advance =
+ std::max(_upper_right[0] + _advance,
+ bounding_box._upper_right[0] +
+ bounding_box._advance) -
+ ret._upper_right[0];
- return ret;
- }
- inline bounding_box_t operator+(const point_t &point) const
- {
- return bounding_box_t(
- _lower_left + point, _upper_right + point,
- _advance + point[0], _italic_correction);
- }
- inline bounding_box_t operator-(const point_t &point) const
- {
- return bounding_box_t(
- _lower_left - point, _upper_right - point,
- _advance - point[0], _italic_correction);
- }
- inline bounding_box_t operator+=(const point_t &point)
- {
- _lower_left += point;
- _upper_right += point;
- _advance += point[0];
+ return ret;
+ }
+ inline bounding_box_t operator+(const point_t &point) const
+ {
+ return bounding_box_t(
+ _lower_left + point, _upper_right + point,
+ _advance + point[0], _italic_correction);
+ }
+ inline bounding_box_t operator-(const point_t &point) const
+ {
+ return bounding_box_t(
+ _lower_left - point, _upper_right - point,
+ _advance - point[0], _italic_correction);
+ }
+ inline bounding_box_t operator+=(const point_t &point)
+ {
+ _lower_left += point;
+ _upper_right += point;
+ _advance += point[0];
- return *this;
- }
- inline bounding_box_t operator-=(const point_t &point)
- {
- _lower_left -= point;
- _upper_right -= point;
- _advance -= point[0];
+ return *this;
+ }
+ inline bounding_box_t operator-=(const point_t &point)
+ {
+ _lower_left -= point;
+ _upper_right -= point;
+ _advance -= point[0];
- return *this;
- }
- inline bounding_box_t operator*(const float scale) const
- {
- return bounding_box_t(
- _lower_left * scale, _upper_right * scale,
- _advance * scale, _italic_correction * scale);
- }
- inline bounding_box_t operator*=(const float scale)
- {
- _lower_left *= scale;
- _upper_right *= scale;
- _advance *= scale;
- _italic_correction *= scale;
+ return *this;
+ }
+ inline bounding_box_t operator*(const float scale) const
+ {
+ return bounding_box_t(
+ _lower_left * scale, _upper_right * scale,
+ _advance * scale, _italic_correction * scale);
+ }
+ inline bounding_box_t operator*=(const float scale)
+ {
+ _lower_left *= scale;
+ _upper_right *= scale;
+ _advance *= scale;
+ _italic_correction *= scale;
- return *this;
- }
- friend bounding_box_t
- operator+(const point_t &, const bounding_box_t &);
- friend bounding_box_t
- operator-(const point_t &, const bounding_box_t &);
- friend bounding_box_t
- operator*(const affine_transform_t &,
- const bounding_box_t &);
- };
+ return *this;
+ }
+ friend bounding_box_t
+ operator+(const point_t &, const bounding_box_t &);
+ friend bounding_box_t
+ operator-(const point_t &, const bounding_box_t &);
+ friend bounding_box_t
+ operator*(const affine_transform_t &,
+ const bounding_box_t &);
+ };
- inline bounding_box_t
- operator+(const point_t &point,
- const bounding_box_t &bounding_box)
- {
- return bounding_box_t(
- point + bounding_box._lower_left,
- point + bounding_box._upper_right,
- point[0] + bounding_box._advance,
- bounding_box._italic_correction);
- }
+ inline bounding_box_t
+ operator+(const point_t &point,
+ const bounding_box_t &bounding_box)
+ {
+ return bounding_box_t(
+ point + bounding_box._lower_left,
+ point + bounding_box._upper_right,
+ point[0] + bounding_box._advance,
+ bounding_box._italic_correction);
+ }
- inline bounding_box_t
- operator-(const point_t &point,
- const bounding_box_t &bounding_box)
- {
- return bounding_box_t(
- point - bounding_box._lower_left,
- point - bounding_box._upper_right,
- point[0] + bounding_box._advance,
- bounding_box._italic_correction);
- }
+ inline bounding_box_t
+ operator-(const point_t &point,
+ const bounding_box_t &bounding_box)
+ {
+ return bounding_box_t(
+ point - bounding_box._lower_left,
+ point - bounding_box._upper_right,
+ point[0] + bounding_box._advance,
+ bounding_box._italic_correction);
+ }
- inline bounding_box_t
- operator*(const affine_transform_t &transform,
- const bounding_box_t &bounding_box)
- {
- return bounding_box_t(
- transform * bounding_box._lower_left,
- transform * bounding_box._upper_right,
- (transform * point_t(bounding_box._advance, 0))[0],
- (transform * point_t(
- bounding_box._italic_correction, 0))[0]);
- }
+ inline bounding_box_t
+ operator*(const affine_transform_t &transform,
+ const bounding_box_t &bounding_box)
+ {
+ return bounding_box_t(
+ transform * bounding_box._lower_left,
+ transform * bounding_box._upper_right,
+ (transform * point_t(bounding_box._advance, 0))[0],
+ (transform * point_t(
+ bounding_box._italic_correction, 0))[0]);
+ }
#ifdef __INTEL_COMPILER
#pragma warning(push)
#pragma warning(disable: 869)
#endif // __INTEL_COMPILER
- /**
- * Mathematical layout engine for formulae represented by
- * math_text_t
- *
- * The class math_text_renderer_t is a layout engine based on
- * TeX's conversion algorithm from a math list to a horizontal
- * list.
- *
- * @see ISO/IEC JTC1/SC2/WG2, ISO/IEC 10646:2003/Amd.2:2006 (ISO,
- * Geneva, 2006).
- * @see D. E. Knuth, The TeXbook (Addision-Wesley, Cambridge, MA,
- * 1986).
- * @see D. E. Knuth, The METAFONTbook (Addision-Wesley, Cambridge,
- * MA, 1986).
- * @see W. Schmidt, The macro package lucimatx (2005),
- * unpublished.
- * @see W. Schmidt, Using the MathTime Professional II fonts with
- * LaTeX (2006), unpublished.
- * @see B. Beeton, A. Freytag, M. Sargent III, Unicode support for
- * mathematics, Unicode Technical Report #25
- * @author Yue Shi Lai <ylai@phys.columbia.edu>
- * @version 1.0
- */
- class math_text_renderer_t {
- public:
- enum {
- DIRECTION_LEFT_TO_RIGHT = 0,
- DIRECTION_RIGHT_TO_LEFT,
- DIRECTION_TOP_TO_BOTTOM
- };
- enum {
- MATH_STYLE_LATIN = 0,
- MATH_STYLE_MAGHREB
- };
- enum {
- FAMILY_PLAIN = 0,
- FAMILY_REGULAR,
- FAMILY_ITALIC,
- FAMILY_BOLD,
- FAMILY_BOLD_ITALIC,
- FAMILY_STIX_REGULAR,
- FAMILY_STIX_ITALIC,
- FAMILY_STIX_BOLD,
- FAMILY_STIX_BOLD_ITALIC,
- FAMILY_STIX_SIZE_1_REGULAR,
- FAMILY_STIX_SIZE_1_BOLD,
- FAMILY_STIX_SIZE_2_REGULAR,
- FAMILY_STIX_SIZE_2_BOLD,
- FAMILY_STIX_SIZE_3_REGULAR,
- FAMILY_STIX_SIZE_3_BOLD,
- FAMILY_STIX_SIZE_4_REGULAR,
- FAMILY_STIX_SIZE_4_BOLD,
- FAMILY_STIX_SIZE_5_REGULAR,
- NFAMILY
- };
- private:
- /////////////////////////////////////////////////////////////
- // Font parameter
- static const float script_ratio;
- static const float script_script_ratio;
- static const float thin_mu_skip;
- static const float med_mu_skip;
- static const float thick_mu_skip;
- static const float delimiter_factor;
- static const float delimiter_shortfall;
- /////////////////////////////////////////////////////////////
- static const float num_1;
- static const float num_2;
- static const float num_3;
- static const float denom_1;
- static const float denom_2;
- static const float sup_1;
- static const float sup_2;
- static const float sup_3;
- static const float sub_1;
- static const float sub_2;
- static const float sup_drop;
- static const float sub_drop;
- static const float delim_1;
- static const float delim_2;
- static const float axis_height;
- static const float default_rule_thickness;
- static const float big_op_spacing_1;
- static const float big_op_spacing_2;
- static const float big_op_spacing_3;
- static const float big_op_spacing_4;
- static const float big_op_spacing_5;
- /////////////////////////////////////////////////////////////
- static const float radical_rule_thickness;
- static const float large_operator_display_scale;
- /////////////////////////////////////////////////////////////
- static const float baselineskip_factor;
- /////////////////////////////////////////////////////////////
- // Token
- class math_token_t {
- public:
- point_t _offset;
- bounding_box_t _bounding_box;
- struct extension_t {
- wchar_t _glyph;
- unsigned int _family;
- float _size;
- };
- union {
- unsigned int _style;
- extension_t _extensible;
- };
- float _delimiter_height;
- inline math_token_t(
- const bounding_box_t bounding_box,
- const unsigned int style,
- const float delimiter_height = 0.0F)
- : _offset(0, 0), _bounding_box(bounding_box),
- _style(style), _delimiter_height(delimiter_height)
- {
- }
- inline math_token_t(
- const point_t offset,
- const bounding_box_t bounding_box,
- const unsigned int style,
- const float delimiter_height = 0.0F)
- : _offset(offset), _bounding_box(bounding_box),
- _style(style), _delimiter_height(delimiter_height)
- {
- }
- inline math_token_t(
- const bounding_box_t bounding_box,
- const wchar_t glyph, const unsigned int family,
- const float size)
- : _offset(0, 0), _bounding_box(bounding_box),
- _delimiter_height(0.0F)
- {
- _extensible._glyph = glyph;
- _extensible._family = family;
- _extensible._size = size;
- }
- inline math_token_t(
- const point_t offset,
- const bounding_box_t bounding_box,
- const wchar_t glyph, const unsigned int family,
- const float size)
- : _offset(offset), _bounding_box(bounding_box),
- _delimiter_height(0.0F)
- {
- _extensible._glyph = glyph;
- _extensible._family = family;
- _extensible._size = size;
- }
- };
- /////////////////////////////////////////////////////////////
- // Style test and change
- float style_size(const unsigned int style) const;
- bool is_display_style(const unsigned int style) const;
- bool is_script_style(const unsigned int style) const;
- unsigned int prime_style(const unsigned int style) const;
- bool is_prime_style(const unsigned int style) const;
- template<typename value_t>
- inline value_t
- if_else_display(const unsigned int style,
- const value_t display_value,
- const value_t otherwise_value) const
- {
- switch(style) {
- case math_text_t::item_t::STYLE_DISPLAY:
- case math_text_t::item_t::STYLE_DISPLAY_PRIME:
- return display_value;
- default:
- return otherwise_value;
- }
- }
- unsigned int next_superscript_style(const unsigned int style)
- const;
- unsigned int next_subscript_style(const unsigned int style)
- const;
- unsigned int next_numerator_style(const unsigned int style)
- const;
- unsigned int next_denominator_style(const unsigned int style)
- const;
- /////////////////////////////////////////////////////////////
- float x_height(const unsigned int style);
- float quad(const unsigned int style) const;
- unsigned int
- math_family(const math_text_t::math_symbol_t &math_symbol)
- const;
- void post_process_atom_type_initial(unsigned int &atom_type)
- const;
- void post_process_atom_type_interior(
- unsigned int &previous_atom_type,
- unsigned int &atom_type)
- const;
- bool valid_accent(
- bool &vertical_alignment,
- const std::vector<math_text_t::item_t>::const_iterator &
- iterator,
- const std::vector<math_text_t::item_t>::const_iterator &
- math_list_end) const;
- float kerning_mu(float amount) const;
- float math_spacing(
- unsigned int left_type, unsigned int right_type,
- unsigned int style) const;
- protected:
- inline virtual affine_transform_t
- transform_logical_to_pixel(void) const = 0;
- virtual affine_transform_t
- transform_pixel_to_logical(void) const = 0;
- /////////////////////////////////////////////////////////////
- // Box rendering
- bounding_box_t math_bounding_box(
- const math_text_t::box_t &box, const unsigned int style);
- void math_text(
- const point_t origin, const math_text_t::box_t &box,
- const unsigned int style, const bool render_structure);
- /////////////////////////////////////////////////////////////
- // Symbol rendering
- static bool is_wgl_4(const wchar_t c);
- static bool is_left_to_right(const wchar_t c);
- static bool is_right_to_left(const wchar_t c);
- static bool is_top_to_bottom(const wchar_t c);
- static bool is_cyrillic(const wchar_t c);
- static bool is_cjk(const wchar_t c);
- static bool is_cjk_punctuation_open(const wchar_t c);
- static bool is_cjk_punctuation_closed(const wchar_t c);
- bounding_box_t math_bounding_box(
- const wchar_t &glyph, const unsigned int family,
- const float size);
- void math_text(
- const point_t origin, const wchar_t &glyph,
- const unsigned int family, const float size,
- const bool render_structure);
- bounding_box_t math_bounding_box(
- const math_text_t::math_symbol_t &math_symbol,
- const unsigned int style);
- void math_text(
- const point_t origin,
- const math_text_t::math_symbol_t &math_symbol,
- const unsigned int style, const bool render_structure);
- /////////////////////////////////////////////////////////////
- // Extensible glyph rendering
- void large_family(
- unsigned long &nfamily, const unsigned int *&family,
- const math_text_t::math_symbol_t &math_symbol) const;
- void extensible_glyph(
- wchar_t glyph[4], unsigned long &nrepeat,
- const math_text_t::math_symbol_t &math_symbol,
- const unsigned int style, const float height);
- std::vector<math_token_t> math_tokenize(
- const math_text_t::math_symbol_t &math_symbol,
- const unsigned int style, const float height);
- bounding_box_t math_bounding_box(
- const math_text_t::math_symbol_t &math_symbol,
- const unsigned int style, const float height);
- void math_text(
- const point_t origin,
- const math_text_t::math_symbol_t &math_symbol,
- const unsigned int style, const float height,
- const bool render_structure);
- /////////////////////////////////////////////////////////////
- // Math list rendering
- std::vector<math_token_t> math_tokenize(
- const std::vector<math_text_t::item_t>::const_iterator &
- math_list_begin,
- const std::vector<math_text_t::item_t>::const_iterator &
- math_list_end,
- unsigned int style);
- bounding_box_t math_bounding_box(
- const std::vector<math_text_t::item_t>::const_iterator &
- math_list_begin,
- const std::vector<math_text_t::item_t>::const_iterator &
- math_list_end,
- unsigned int style);
- void math_text(
- const point_t origin,
- const std::vector<math_text_t::item_t>::const_iterator &
- math_list_begin,
- const std::vector<math_text_t::item_t>::const_iterator &
- math_list_end,
- const unsigned int style, const bool render_structure);
- /////////////////////////////////////////////////////////////
- // Field rendering
- bounding_box_t math_bounding_box(
- const math_text_t::field_t &field,
- const unsigned int style);
- void math_text(
- const point_t origin, const math_text_t::field_t &field,
- const unsigned int style, const bool render_structure);
- /////////////////////////////////////////////////////////////
- // Atom rendering
- std::vector<math_token_t> math_tokenize(
- const math_text_t::atom_t &atom, unsigned int style);
- bounding_box_t math_bounding_box(
- const math_text_t::atom_t &atom,
- const unsigned int style);
- void math_text(
- const point_t origin, const math_text_t::atom_t &atom,
- const unsigned int style, const bool render_structure);
- /////////////////////////////////////////////////////////////
- public:
- /////////////////////////////////////////////////////////////
- // Constructor and destructor
- inline math_text_renderer_t(void)
- {
- }
- inline virtual ~math_text_renderer_t(void)
- {
- }
- /////////////////////////////////////////////////////////////
- // Virtual functions
- virtual float font_size(
- const unsigned int family = FAMILY_PLAIN) const = 0;
- virtual void set_font_size(
- const float size, const unsigned int family) = 0;
- inline virtual void set_font_size(const float size) = 0;
- virtual void reset_font_size(
- const unsigned int family) = 0;
- virtual void point(const float x, const float y) = 0;
- virtual void filled_rectangle(
- const bounding_box_t &bounding_box) = 0;
- virtual void rectangle(
- const bounding_box_t &bounding_box) = 0;
- virtual bounding_box_t bounding_box(
- const std::wstring string,
- const unsigned int family = FAMILY_PLAIN) = 0;
- virtual void text_raw(
- const float x, const float y, const std::wstring string,
- const unsigned int family = FAMILY_PLAIN) = 0;
- virtual void text_with_bounding_box(
- const float x, const float y, const std::wstring string,
- const unsigned int family = FAMILY_PLAIN) = 0;
- /////////////////////////////////////////////////////////////
- // Interface
- bounding_box_t bounding_box(
- const math_text_t &math_text,
- const bool display_style = false);
- void text(
- const float x, const float y,
- const math_text_t &math_text,
- const bool display_style = false);
- /////////////////////////////////////////////////////////////
- inline float default_axis_height(
- const bool /*display_style = false*/) const
- {
- return axis_height * style_size(
- math_text_t::item_t::STYLE_TEXT);
- }
- /////////////////////////////////////////////////////////////
- };
+ /**
+ * Mathematical layout engine for formulae represented by
+ * math_text_t
+ *
+ * The class math_text_renderer_t is a layout engine based on
+ * TeX's conversion algorithm from a math list to a horizontal
+ * list.
+ *
+ * @see ISO/IEC JTC1/SC2/WG2, ISO/IEC 10646:2003/Amd.2:2006 (ISO,
+ * Geneva, 2006).
+ * @see D. E. Knuth, The TeXbook (Addision-Wesley, Cambridge, MA,
+ * 1986).
+ * @see D. E. Knuth, The METAFONTbook (Addision-Wesley, Cambridge,
+ * MA, 1986).
+ * @see W. Schmidt, The macro package lucimatx (2005),
+ * unpublished.
+ * @see W. Schmidt, Using the MathTime Professional II fonts with
+ * LaTeX (2006), unpublished.
+ * @see B. Beeton, A. Freytag, M. Sargent III, Unicode support for
+ * mathematics, Unicode Technical Report #25
+ * @author Yue Shi Lai <ylai@phys.columbia.edu>
+ * @version 1.0
+ */
+ class math_text_renderer_t {
+ public:
+ enum {
+ DIRECTION_LEFT_TO_RIGHT = 0,
+ DIRECTION_RIGHT_TO_LEFT,
+ DIRECTION_TOP_TO_BOTTOM
+ };
+ enum {
+ MATH_STYLE_LATIN = 0,
+ MATH_STYLE_MAGHREB
+ };
+ enum {
+ FAMILY_PLAIN = 0,
+ FAMILY_REGULAR,
+ FAMILY_ITALIC,
+ FAMILY_BOLD,
+ FAMILY_BOLD_ITALIC,
+ FAMILY_STIX_REGULAR,
+ FAMILY_STIX_ITALIC,
+ FAMILY_STIX_BOLD,
+ FAMILY_STIX_BOLD_ITALIC,
+ FAMILY_STIX_SIZE_1_REGULAR,
+ FAMILY_STIX_SIZE_1_BOLD,
+ FAMILY_STIX_SIZE_2_REGULAR,
+ FAMILY_STIX_SIZE_2_BOLD,
+ FAMILY_STIX_SIZE_3_REGULAR,
+ FAMILY_STIX_SIZE_3_BOLD,
+ FAMILY_STIX_SIZE_4_REGULAR,
+ FAMILY_STIX_SIZE_4_BOLD,
+ FAMILY_STIX_SIZE_5_REGULAR,
+ NFAMILY
+ };
+ private:
+ /////////////////////////////////////////////////////////////
+ // Font parameter
+ static const float script_ratio;
+ static const float script_script_ratio;
+ static const float thin_mu_skip;
+ static const float med_mu_skip;
+ static const float thick_mu_skip;
+ static const float delimiter_factor;
+ static const float delimiter_shortfall;
+ /////////////////////////////////////////////////////////////
+ static const float num_1;
+ static const float num_2;
+ static const float num_3;
+ static const float denom_1;
+ static const float denom_2;
+ static const float sup_1;
+ static const float sup_2;
+ static const float sup_3;
+ static const float sub_1;
+ static const float sub_2;
+ static const float sup_drop;
+ static const float sub_drop;
+ static const float delim_1;
+ static const float delim_2;
+ static const float axis_height;
+ static const float default_rule_thickness;
+ static const float big_op_spacing_1;
+ static const float big_op_spacing_2;
+ static const float big_op_spacing_3;
+ static const float big_op_spacing_4;
+ static const float big_op_spacing_5;
+ /////////////////////////////////////////////////////////////
+ static const float radical_rule_thickness;
+ static const float large_operator_display_scale;
+ /////////////////////////////////////////////////////////////
+ static const float baselineskip_factor;
+ /////////////////////////////////////////////////////////////
+ // Token
+ class math_token_t {
+ public:
+ point_t _offset;
+ bounding_box_t _bounding_box;
+ struct extension_t {
+ wchar_t _glyph;
+ unsigned int _family;
+ float _size;
+ };
+ union {
+ unsigned int _style;
+ extension_t _extensible;
+ };
+ float _delimiter_height;
+ inline math_token_t(
+ const bounding_box_t bounding_box,
+ const unsigned int style,
+ const float delimiter_height = 0.0F)
+ : _offset(0, 0), _bounding_box(bounding_box),
+ _style(style), _delimiter_height(delimiter_height)
+ {
+ }
+ inline math_token_t(
+ const point_t offset,
+ const bounding_box_t bounding_box,
+ const unsigned int style,
+ const float delimiter_height = 0.0F)
+ : _offset(offset), _bounding_box(bounding_box),
+ _style(style), _delimiter_height(delimiter_height)
+ {
+ }
+ inline math_token_t(
+ const bounding_box_t bounding_box,
+ const wchar_t glyph, const unsigned int family,
+ const float size)
+ : _offset(0, 0), _bounding_box(bounding_box),
+ _delimiter_height(0.0F)
+ {
+ _extensible._glyph = glyph;
+ _extensible._family = family;
+ _extensible._size = size;
+ }
+ inline math_token_t(
+ const point_t offset,
+ const bounding_box_t bounding_box,
+ const wchar_t glyph, const unsigned int family,
+ const float size)
+ : _offset(offset), _bounding_box(bounding_box),
+ _delimiter_height(0.0F)
+ {
+ _extensible._glyph = glyph;
+ _extensible._family = family;
+ _extensible._size = size;
+ }
+ };
+ /////////////////////////////////////////////////////////////
+ // Style test and change
+ float style_size(const unsigned int style) const;
+ bool is_display_style(const unsigned int style) const;
+ bool is_script_style(const unsigned int style) const;
+ unsigned int prime_style(const unsigned int style) const;
+ bool is_prime_style(const unsigned int style) const;
+ template<typename value_t>
+ inline value_t
+ if_else_display(const unsigned int style,
+ const value_t display_value,
+ const value_t otherwise_value) const
+ {
+ switch(style) {
+ case math_text_t::item_t::STYLE_DISPLAY:
+ case math_text_t::item_t::STYLE_DISPLAY_PRIME:
+ return display_value;
+ default:
+ return otherwise_value;
+ }
+ }
+ unsigned int next_superscript_style(const unsigned int style)
+ const;
+ unsigned int next_subscript_style(const unsigned int style)
+ const;
+ unsigned int next_numerator_style(const unsigned int style)
+ const;
+ unsigned int next_denominator_style(const unsigned int style)
+ const;
+ /////////////////////////////////////////////////////////////
+ float x_height(const unsigned int style);
+ float quad(const unsigned int style) const;
+ unsigned int
+ math_family(const math_text_t::math_symbol_t &math_symbol)
+ const;
+ void post_process_atom_type_initial(unsigned int &atom_type)
+ const;
+ void post_process_atom_type_interior(
+ unsigned int &previous_atom_type,
+ unsigned int &atom_type)
+ const;
+ bool valid_accent(
+ bool &vertical_alignment,
+ const std::vector<math_text_t::item_t>::const_iterator &
+ iterator,
+ const std::vector<math_text_t::item_t>::const_iterator &
+ math_list_end) const;
+ float kerning_mu(float amount) const;
+ float math_spacing(
+ unsigned int left_type, unsigned int right_type,
+ unsigned int style) const;
+ protected:
+ inline virtual affine_transform_t
+ transform_logical_to_pixel(void) const = 0;
+ virtual affine_transform_t
+ transform_pixel_to_logical(void) const = 0;
+ /////////////////////////////////////////////////////////////
+ // Box rendering
+ bounding_box_t math_bounding_box(
+ const math_text_t::box_t &box, const unsigned int style);
+ void math_text(
+ const point_t origin, const math_text_t::box_t &box,
+ const unsigned int style, const bool render_structure);
+ /////////////////////////////////////////////////////////////
+ // Symbol rendering
+ static bool is_wgl_4(const wchar_t c);
+ static bool is_left_to_right(const wchar_t c);
+ static bool is_right_to_left(const wchar_t c);
+ static bool is_top_to_bottom(const wchar_t c);
+ static bool is_cyrillic(const wchar_t c);
+ static bool is_cjk(const wchar_t c);
+ static bool is_cjk_punctuation_open(const wchar_t c);
+ static bool is_cjk_punctuation_closed(const wchar_t c);
+ bounding_box_t math_bounding_box(
+ const wchar_t &glyph, const unsigned int family,
+ const float size);
+ void math_text(
+ const point_t origin, const wchar_t &glyph,
+ const unsigned int family, const float size,
+ const bool render_structure);
+ bounding_box_t math_bounding_box(
+ const math_text_t::math_symbol_t &math_symbol,
+ const unsigned int style);
+ void math_text(
+ const point_t origin,
+ const math_text_t::math_symbol_t &math_symbol,
+ const unsigned int style, const bool render_structure);
+ /////////////////////////////////////////////////////////////
+ // Extensible glyph rendering
+ void large_family(
+ unsigned long &nfamily, const unsigned int *&family,
+ const math_text_t::math_symbol_t &math_symbol) const;
+ void extensible_glyph(
+ wchar_t glyph[4], unsigned long &nrepeat,
+ const math_text_t::math_symbol_t &math_symbol,
+ const unsigned int style, const float height);
+ std::vector<math_token_t> math_tokenize(
+ const math_text_t::math_symbol_t &math_symbol,
+ const unsigned int style, const float height);
+ bounding_box_t math_bounding_box(
+ const math_text_t::math_symbol_t &math_symbol,
+ const unsigned int style, const float height);
+ void math_text(
+ const point_t origin,
+ const math_text_t::math_symbol_t &math_symbol,
+ const unsigned int style, const float height,
+ const bool render_structure);
+ /////////////////////////////////////////////////////////////
+ // Math list rendering
+ std::vector<math_token_t> math_tokenize(
+ const std::vector<math_text_t::item_t>::const_iterator &
+ math_list_begin,
+ const std::vector<math_text_t::item_t>::const_iterator &
+ math_list_end,
+ unsigned int style);
+ bounding_box_t math_bounding_box(
+ const std::vector<math_text_t::item_t>::const_iterator &
+ math_list_begin,
+ const std::vector<math_text_t::item_t>::const_iterator &
+ math_list_end,
+ unsigned int style);
+ void math_text(
+ const point_t origin,
+ const std::vector<math_text_t::item_t>::const_iterator &
+ math_list_begin,
+ const std::vector<math_text_t::item_t>::const_iterator &
+ math_list_end,
+ const unsigned int style, const bool render_structure);
+ /////////////////////////////////////////////////////////////
+ // Field rendering
+ bounding_box_t math_bounding_box(
+ const math_text_t::field_t &field,
+ const unsigned int style);
+ void math_text(
+ const point_t origin, const math_text_t::field_t &field,
+ const unsigned int style, const bool render_structure);
+ /////////////////////////////////////////////////////////////
+ // Atom rendering
+ std::vector<math_token_t> math_tokenize(
+ const math_text_t::atom_t &atom, unsigned int style);
+ bounding_box_t math_bounding_box(
+ const math_text_t::atom_t &atom,
+ const unsigned int style);
+ void math_text(
+ const point_t origin, const math_text_t::atom_t &atom,
+ const unsigned int style, const bool render_structure);
+ /////////////////////////////////////////////////////////////
+ public:
+ /////////////////////////////////////////////////////////////
+ // Constructor and destructor
+ inline math_text_renderer_t(void)
+ {
+ }
+ inline virtual ~math_text_renderer_t(void)
+ {
+ }
+ /////////////////////////////////////////////////////////////
+ // Virtual functions
+ virtual float font_size(
+ const unsigned int family = FAMILY_PLAIN) const = 0;
+ virtual void set_font_size(
+ const float size, const unsigned int family) = 0;
+ inline virtual void set_font_size(const float size) = 0;
+ virtual void reset_font_size(
+ const unsigned int family) = 0;
+ virtual void point(const float x, const float y) = 0;
+ virtual void filled_rectangle(
+ const bounding_box_t &bounding_box) = 0;
+ virtual void rectangle(
+ const bounding_box_t &bounding_box) = 0;
+ virtual bounding_box_t bounding_box(
+ const std::wstring string,
+ const unsigned int family = FAMILY_PLAIN) = 0;
+ virtual void text_raw(
+ const float x, const float y, const std::wstring string,
+ const unsigned int family = FAMILY_PLAIN) = 0;
+ virtual void text_with_bounding_box(
+ const float x, const float y, const std::wstring string,
+ const unsigned int family = FAMILY_PLAIN) = 0;
+ /////////////////////////////////////////////////////////////
+ // Interface
+ bounding_box_t bounding_box(
+ const math_text_t &math_text,
+ const bool display_style = false);
+ void text(
+ const float x, const float y,
+ const math_text_t &math_text,
+ const bool display_style = false);
+ /////////////////////////////////////////////////////////////
+ inline float default_axis_height(
+ const bool /*display_style = false*/) const
+ {
+ return axis_height * style_size(
+ math_text_t::item_t::STYLE_TEXT);
+ }
+ /////////////////////////////////////////////////////////////
+ };
#ifdef __INTEL_COMPILER
#pragma warning(pop)
#endif // __INTEL_COMPILER
-
+
}
#endif // MATHRENDER_H_
diff --git a/graf2d/mathtext/inc/mathtext.h b/graf2d/mathtext/inc/mathtext.h
index 30f036f8747..3d78e7cb553 100644
--- a/graf2d/mathtext/inc/mathtext.h
+++ b/graf2d/mathtext/inc/mathtext.h
@@ -24,7 +24,7 @@
namespace mathtext {
- class surface_t;
+ class surface_t;
/**
* Hierarchical representation of mathematical formulae
@@ -505,17 +505,16 @@ namespace mathtext {
inline void tree_view(void) const
{
std::vector<bool> branch;
+ tree_view(_math_list, branch, true);
+ }
+ friend class math_text_renderer_t;
+ };
- tree_view(_math_list, branch, true);
- }
- friend class math_text_renderer_t;
- };
-
- /**
- * Returns the TeX-formatted scientific representation of a real
- * number
- */
- extern std::string tex_form(const double x);
+ /**
+ * Returns the TeX-formatted scientific representation of a real
+ * number
+ */
+ extern std::string tex_form(const double x);
}
diff --git a/graf2d/mathtext/src/fontembed.cxx b/graf2d/mathtext/src/fontembed.cxx
index 005c616af0d..435a8614e1f 100644
--- a/graf2d/mathtext/src/fontembed.cxx
+++ b/graf2d/mathtext/src/fontembed.cxx
@@ -31,8 +31,8 @@
#define LITTLE_ENDIAN 1
#endif // LITTLE_ENDIAN
#include "Byteswap.h"
-#define bswap_16(x) Rbswap_16((x))
-#define bswap_32(x) Rbswap_32((x))
+#define bswap_16(x) Rbswap_16((x))
+#define bswap_32(x) Rbswap_32((x))
#else // R__BYTESWAP
#ifdef LITTLE_ENDIAN
#undef LITTLE_ENDIAN
@@ -51,1139 +51,1139 @@
namespace mathtext {
- typedef int32_t fixed_t;
-
- void font_embed_t::parse_ttf_encoding_subtable_format4(
- std::map<wchar_t, uint16_t> &cid_map,
- const std::vector<uint8_t> &font_data, const size_t offset,
- const uint16_t length)
- {
- cid_map.clear();
-
- size_t offset_current = offset;
-
- struct ttf_encoding_subtable_format4_s {
- uint16_t seg_count_x2;
- uint16_t search_range;
- uint16_t entry_selector;
- uint16_t range_shift;
- } encoding_subtable_format4;
-
- memcpy(&encoding_subtable_format4,
- &font_data[offset_current],
- sizeof(struct ttf_encoding_subtable_format4_s));
- offset_current +=
- sizeof(struct ttf_encoding_subtable_format4_s);
+ typedef int32_t fixed_t;
+
+ void font_embed_t::parse_ttf_encoding_subtable_format4(
+ std::map<wchar_t, uint16_t> &cid_map,
+ const std::vector<uint8_t> &font_data, const size_t offset,
+ const uint16_t length)
+ {
+ cid_map.clear();
+
+ size_t offset_current = offset;
+
+ struct ttf_encoding_subtable_format4_s {
+ uint16_t seg_count_x2;
+ uint16_t search_range;
+ uint16_t entry_selector;
+ uint16_t range_shift;
+ } encoding_subtable_format4;
+
+ memcpy(&encoding_subtable_format4,
+ &font_data[offset_current],
+ sizeof(struct ttf_encoding_subtable_format4_s));
+ offset_current +=
+ sizeof(struct ttf_encoding_subtable_format4_s);
#ifdef LITTLE_ENDIAN
- encoding_subtable_format4.seg_count_x2 =
- bswap_16(encoding_subtable_format4.seg_count_x2);
+ encoding_subtable_format4.seg_count_x2 =
+ bswap_16(encoding_subtable_format4.seg_count_x2);
#endif // LITTLE_ENDIAN
- const uint16_t seg_count =
- encoding_subtable_format4.seg_count_x2 >> 1;
- uint16_t *end_code = new uint16_t[seg_count];
+ const uint16_t seg_count =
+ encoding_subtable_format4.seg_count_x2 >> 1;
+ uint16_t *end_code = new uint16_t[seg_count];
- memcpy(end_code, &font_data[offset_current],
- seg_count * sizeof(uint16_t));
- offset_current += seg_count * sizeof(uint16_t);
+ memcpy(end_code, &font_data[offset_current],
+ seg_count * sizeof(uint16_t));
+ offset_current += seg_count * sizeof(uint16_t);
#ifdef LITTLE_ENDIAN
- for (uint16_t segment = 0; segment < seg_count; segment++) {
- end_code[segment] = bswap_16(end_code[segment]);
- }
+ for (uint16_t segment = 0; segment < seg_count; segment++) {
+ end_code[segment] = bswap_16(end_code[segment]);
+ }
#endif // LITTLE_ENDIAN
- uint16_t reserved_pad;
+ uint16_t reserved_pad;
- memcpy(&reserved_pad, &font_data[offset_current],
- sizeof(uint16_t));
- offset_current += sizeof(uint16_t);
+ memcpy(&reserved_pad, &font_data[offset_current],
+ sizeof(uint16_t));
+ offset_current += sizeof(uint16_t);
- uint16_t *start_code = new uint16_t[seg_count];
+ uint16_t *start_code = new uint16_t[seg_count];
- memcpy(start_code, &font_data[offset_current],
- seg_count * sizeof(uint16_t));
- offset_current += seg_count * sizeof(uint16_t);
+ memcpy(start_code, &font_data[offset_current],
+ seg_count * sizeof(uint16_t));
+ offset_current += seg_count * sizeof(uint16_t);
#ifdef LITTLE_ENDIAN
- for (uint16_t segment = 0; segment < seg_count; segment++) {
- start_code[segment] = bswap_16(start_code[segment]);
- }
+ for (uint16_t segment = 0; segment < seg_count; segment++) {
+ start_code[segment] = bswap_16(start_code[segment]);
+ }
#endif // LITTLE_ENDIAN
- uint16_t *id_delta = new uint16_t[seg_count];
+ uint16_t *id_delta = new uint16_t[seg_count];
- memcpy(id_delta, &font_data[offset_current],
- seg_count * sizeof(uint16_t));
- offset_current += seg_count * sizeof(uint16_t);
+ memcpy(id_delta, &font_data[offset_current],
+ seg_count * sizeof(uint16_t));
+ offset_current += seg_count * sizeof(uint16_t);
#ifdef LITTLE_ENDIAN
- for (uint16_t segment = 0; segment < seg_count; segment++) {
- id_delta[segment] = bswap_16(id_delta[segment]);
- }
+ for (uint16_t segment = 0; segment < seg_count; segment++) {
+ id_delta[segment] = bswap_16(id_delta[segment]);
+ }
#endif // LITTLE_ENDIAN
- const uint16_t variable =
- (length >> 1) - (seg_count << 2) - 8;
- uint16_t *id_range_offset =
- new uint16_t[seg_count + variable];
+ const uint16_t variable =
+ (length >> 1) - (seg_count << 2) - 8;
+ uint16_t *id_range_offset =
+ new uint16_t[seg_count + variable];
- memcpy(id_range_offset, &font_data[offset_current],
- (seg_count + variable) * sizeof(uint16_t));
- offset_current += (seg_count + variable) * sizeof(uint16_t);
+ memcpy(id_range_offset, &font_data[offset_current],
+ (seg_count + variable) * sizeof(uint16_t));
+ offset_current += (seg_count + variable) * sizeof(uint16_t);
#ifdef LITTLE_ENDIAN
- for (uint16_t j = 0; j < seg_count + variable; j++) {
- id_range_offset[j] = bswap_16(id_range_offset[j]);
- }
+ for (uint16_t j = 0; j < seg_count + variable; j++) {
+ id_range_offset[j] = bswap_16(id_range_offset[j]);
+ }
#endif // LITTLE_ENDIAN
- for (uint16_t segment = 0; segment < seg_count; segment++) {
- for (uint32_t code = start_code[segment];
- code <= end_code[segment]; code++) {
- const uint16_t inner_offset = segment +
- (id_range_offset[segment] >> 1) +
- (code - start_code[segment]);
- const uint16_t glyph_index =
- id_range_offset[segment] == 0 ?
- id_delta[segment] + code :
- inner_offset >= seg_count + variable ?
- 0 : id_range_offset[inner_offset];
-
- cid_map[static_cast<wchar_t>(code)] = glyph_index;
- }
- }
-
- delete [] end_code;
- delete [] start_code;
- delete [] id_delta;
- delete [] id_range_offset;
- }
-
-/////////////////////////////////////////////////////////////////////
-// Currently unfinished font subsetting code below
-/////////////////////////////////////////////////////////////////////
+ for (uint16_t segment = 0; segment < seg_count; segment++) {
+ for (uint32_t code = start_code[segment];
+ code <= end_code[segment]; code++) {
+ const uint16_t inner_offset = segment +
+ (id_range_offset[segment] >> 1) +
+ (code - start_code[segment]);
+ const uint16_t glyph_index =
+ id_range_offset[segment] == 0 ?
+ id_delta[segment] + code :
+ inner_offset >= seg_count + variable ?
+ 0 : id_range_offset[inner_offset];
+
+ cid_map[static_cast<wchar_t>(code)] = glyph_index;
+ }
+ }
+
+ delete [] end_code;
+ delete [] start_code;
+ delete [] id_delta;
+ delete [] id_range_offset;
+ }
+
+ /////////////////////////////////////////////////////////////////////
+ // Currently unfinished font subsetting code below
+ /////////////////////////////////////////////////////////////////////
#if 0
- // Rename:
- // name
- // Subset:
- // glyf, loca, hmtx, vmtx, cmap, hdmx, VDMX, kern, LTSH, VORG
- // Conditional subset:
- // post 2.0
- // Remove completely:
- // DSIG, BASE, GDEF, GPOS, GSUB, JSTF, EBDT, EBLC, EBSC
-
- void font_embed_t::subset_rename_otf_name_table(
- struct table_data_s &table_data,
- std::map<wchar_t, bool> glyph_usage)
- {
- // Prefix name IDs 1, 4, 6, 16, 19, 20, 21
-
- // No platform ID other than 1 and 3 is permitted for the name
- // table
-
- // Platform ID = 1: 1 byte
- // Platform ID = 3: 2 byte
-
- // Reset UID 4,000,000 and 4,999,999 and XUID
- }
-
- void font_embed_t::subset_ttf_glyf_table(
- struct table_data_s &table_data,
- std::map<wchar_t, bool> glyph_usage)
- {
- }
-
- void font_embed_t::subset_ttf_loca_table(
- struct table_data_s &table_data,
- std::map<wchar_t, bool> glyph_usage)
- {
- }
-
- void font_embed_t::subset_ttf_post_table(
- struct table_data_s &table_data,
- std::map<wchar_t, bool> glyph_usage)
- {
- }
-
- class cff_index_t {
- public:
- uint16_t count;
- uint8_t off_size;
- std::vector<uint32_t> offset;
- std::vector<uint8_t> data;
- cff_index_t(const uint8_t *input_data)
- {
- memcpy(&count, input_data, sizeof(uint16_t));
+ // Rename:
+ // name
+ // Subset:
+ // glyf, loca, hmtx, vmtx, cmap, hdmx, VDMX, kern, LTSH, VORG
+ // Conditional subset:
+ // post 2.0
+ // Remove completely:
+ // DSIG, BASE, GDEF, GPOS, GSUB, JSTF, EBDT, EBLC, EBSC
+
+ void font_embed_t::subset_rename_otf_name_table(
+ struct table_data_s &table_data,
+ std::map<wchar_t, bool> glyph_usage)
+ {
+ // Prefix name IDs 1, 4, 6, 16, 19, 20, 21
+
+ // No platform ID other than 1 and 3 is permitted for the name
+ // table
+
+ // Platform ID = 1: 1 byte
+ // Platform ID = 3: 2 byte
+
+ // Reset UID 4,000,000 and 4,999,999 and XUID
+ }
+
+ void font_embed_t::subset_ttf_glyf_table(
+ struct table_data_s &table_data,
+ std::map<wchar_t, bool> glyph_usage)
+ {
+ }
+
+ void font_embed_t::subset_ttf_loca_table(
+ struct table_data_s &table_data,
+ std::map<wchar_t, bool> glyph_usage)
+ {
+ }
+
+ void font_embed_t::subset_ttf_post_table(
+ struct table_data_s &table_data,
+ std::map<wchar_t, bool> glyph_usage)
+ {
+ }
+
+ class cff_index_t {
+ public:
+ uint16_t count;
+ uint8_t off_size;
+ std::vector<uint32_t> offset;
+ std::vector<uint8_t> data;
+ cff_index_t(const uint8_t *input_data)
+ {
+ memcpy(&count, input_data, sizeof(uint16_t));
#ifdef LITTLE_ENDIAN
- count = bswap_16(count);
+ count = bswap_16(count);
#endif // LITTLE_ENDIAN
- memcpy(&off_size, input_data + sizeof(uint16_t),
- sizeof(uint8_t));
-
- if (!(off_size >= 1 && off_size < 5)) {
- return;
- }
-
- const uint8_t *input_data_offset =
- input_data + sizeof(uint16_t) + sizeof(uint8_t);
-
- // The off by one or indexing from one convention in CFF
- // is corrected here, i.e. the resulting offset table is
- // zero-based, and not the CFF one.
-
- offset.reserve(count + 1);
- switch (off_size) {
- case 1:
- for (size_t i = 0; i < count + 1; i++) {
- offset.push_back(input_data_offset[i]);
- }
- break;
- case 2:
- for (size_t i = 0; i < count + 1; i++) {
- offset.push_back(reinterpret_cast<uint16_t *>(
- input_data_offset)[i]);
+ memcpy(&off_size, input_data + sizeof(uint16_t),
+ sizeof(uint8_t));
+
+ if (!(off_size >= 1 && off_size < 5)) {
+ return;
+ }
+
+ const uint8_t *input_data_offset =
+ input_data + sizeof(uint16_t) + sizeof(uint8_t);
+
+ // The off by one or indexing from one convention in CFF
+ // is corrected here, i.e. the resulting offset table is
+ // zero-based, and not the CFF one.
+
+ offset.reserve(count + 1);
+ switch (off_size) {
+ case 1:
+ for (size_t i = 0; i < count + 1; i++) {
+ offset.push_back(input_data_offset[i]);
+ }
+ break;
+ case 2:
+ for (size_t i = 0; i < count + 1; i++) {
+ offset.push_back(reinterpret_cast<uint16_t *>(
+ input_data_offset)[i]);
#ifdef LITTLE_ENDIAN
- offset.back() = bswap_16(offset.back());
+ offset.back() = bswap_16(offset.back());
#endif // LITTLE_ENDIAN
- }
- break;
- case 3:
- for (size_t i = 0; i < 3 * (count + 1); i += 3) {
- const uint32_t value =
- input_data_offset[3 * i] << 16 |
- input_data_offset[3 * i + 1] << 8 |
- input_data_offset[3 * i + 2];
-
- offset.push_back(value);
- }
- break;
- case 4:
- for (size_t i = 0; i < count + 1; i++) {
- offset.push_back(reinterpret_cast<uint32_t *>(
- input_data_offset)[i]);
+ }
+ break;
+ case 3:
+ for (size_t i = 0; i < 3 * (count + 1); i += 3) {
+ const uint32_t value =
+ input_data_offset[3 * i] << 16 |
+ input_data_offset[3 * i + 1] << 8 |
+ input_data_offset[3 * i + 2];
+
+ offset.push_back(value);
+ }
+ break;
+ case 4:
+ for (size_t i = 0; i < count + 1; i++) {
+ offset.push_back(reinterpret_cast<uint32_t *>(
+ input_data_offset)[i]);
#ifdef LITTLE_ENDIAN
- offset.back() = bswap_32(offset.back());
+ offset.back() = bswap_32(offset.back());
#endif // LITTLE_ENDIAN
- }
- break;
- }
-
- const uint8_t *input_data_data =
- input_data_offset + off_size * (count + 1);
-
- data = std::vector<uint8_t>(input_data_data, input_data_data
- }
- ~cff_index_t(void)
- {
- }
- };
-
- void font_embed_t::subset_otf_cff_table(
- struct table_data_s &table_data,
- std::map<wchar_t, bool> glyph_usage)
- {
- }
+ }
+ break;
+ }
+
+ const uint8_t *input_data_data =
+ input_data_offset + off_size * (count + 1);
+
+ data = std::vector<uint8_t>(input_data_data, input_data_data
+ }
+ ~cff_index_t(void)
+ {
+ }
+ };
+
+ void font_embed_t::subset_otf_cff_table(
+ struct table_data_s &table_data,
+ std::map<wchar_t, bool> glyph_usage)
+ {
+ }
#endif
- uint32_t font_embed_t::otf_check_sum(
- const std::vector<uint8_t> &table_data)
- {
- const uint32_t *table =
- reinterpret_cast<const uint32_t *>(&(table_data[0]));
- const uint32_t nword = table_data.size() >> 2;
- uint32_t sum = 0;
+ uint32_t font_embed_t::otf_check_sum(
+ const std::vector<uint8_t> &table_data)
+ {
+ const uint32_t *table =
+ reinterpret_cast<const uint32_t *>(&(table_data[0]));
+ const uint32_t nword = table_data.size() >> 2;
+ uint32_t sum = 0;
- for (size_t i = 0; i < nword; i++) {
+ for (size_t i = 0; i < nword; i++) {
#ifdef LITTLE_ENDIAN
- sum += bswap_32(table[i]);
+ sum += bswap_32(table[i]);
#else // LITTLE_ENDIAN
- sum += table[i];
+ sum += table[i];
#endif // LITTLE_ENDIAN
- }
-
- // Do not assume 0x00 padding and calculate partial uint32_t
- // checksums directly.
- const uint8_t *table_tail =
- reinterpret_cast<const uint8_t *>(&(table[nword]));
-
- switch(table_data.size() & 3U) {
- case 3: sum += table_tail[2] << 8;
- case 2: sum += table_tail[1] << 16;
- case 1: sum += table_tail[0] << 24; break;
- }
-
- return sum;
- }
-
- std::vector<uint8_t> font_embed_t::read_font_data(
- FILE *fp)
- {
- std::vector<uint8_t> font_data;
-
- if (fp == NULL) {
- return font_data;
- }
- if (fseek(fp, 0L, SEEK_SET) == -1) {
- perror("fseek");
- return font_data;
- }
- if (fseek(fp, 0L, SEEK_END) == -1) {
- perror("fseek");
- return font_data;
- }
-
- const long length = ftell(fp);
-
- if (length == -1) {
- perror("ftell");
- return font_data;
- }
- font_data.resize(length);
- if (fseek(fp, 0L, SEEK_SET) == -1) {
- perror("fseek");
- font_data.clear();
- return font_data;
- }
- if (fread(&font_data[0], sizeof(uint8_t),
- length, fp) != static_cast<unsigned long>(length)) {
- perror("fread");
- font_data.clear();
- return font_data;
- }
- fseek(fp, 0L, SEEK_SET);
-
- return font_data;
- }
-
- std::vector<uint8_t> font_embed_t::read_font_data(
- const std::string &filename)
- {
- FILE *fp = fopen(filename.c_str(), "r");
- std::vector<uint8_t> font_data;
-
- if (fp == NULL) {
- perror("fopen");
- return font_data;
- }
- font_data = read_font_data(fp);
- fclose(fp);
-
- return font_data;
- }
-
- bool font_embed_t::parse_otf_cff_header(
- std::string &font_name, unsigned short &cid_encoding_id,
- unsigned int &cff_offset, unsigned int &cff_length,
- const std::vector<uint8_t> &font_data)
- {
- // OpenType file structure
- struct otf_offset_table_s {
- char sfnt_version[4];
- uint16_t num_tables;
- uint16_t search_range;
- uint16_t entry_selector;
- uint16_t range_shift;
- } offset_table;
-
- memcpy(&offset_table, &font_data[0],
- sizeof(struct otf_offset_table_s));
- if (strncmp(offset_table.sfnt_version, "OTTO", 4) != 0) {
- // Not a OpenType CFF/Type 2 font
- return false;
- }
+ }
+
+ // Do not assume 0x00 padding and calculate partial uint32_t
+ // checksums directly.
+ const uint8_t *table_tail =
+ reinterpret_cast<const uint8_t *>(&(table[nword]));
+
+ switch(table_data.size() & 3U) {
+ case 3: sum += table_tail[2] << 8;
+ case 2: sum += table_tail[1] << 16;
+ case 1: sum += table_tail[0] << 24; break;
+ }
+
+ return sum;
+ }
+
+ std::vector<uint8_t> font_embed_t::read_font_data(
+ FILE *fp)
+ {
+ std::vector<uint8_t> font_data;
+
+ if (fp == NULL) {
+ return font_data;
+ }
+ if (fseek(fp, 0L, SEEK_SET) == -1) {
+ perror("fseek");
+ return font_data;
+ }
+ if (fseek(fp, 0L, SEEK_END) == -1) {
+ perror("fseek");
+ return font_data;
+ }
+
+ const long length = ftell(fp);
+
+ if (length == -1) {
+ perror("ftell");
+ return font_data;
+ }
+ font_data.resize(length);
+ if (fseek(fp, 0L, SEEK_SET) == -1) {
+ perror("fseek");
+ font_data.clear();
+ return font_data;
+ }
+ if (fread(&font_data[0], sizeof(uint8_t),
+ length, fp) != static_cast<unsigned long>(length)) {
+ perror("fread");
+ font_data.clear();
+ return font_data;
+ }
+ fseek(fp, 0L, SEEK_SET);
+
+ return font_data;
+ }
+
+ std::vector<uint8_t> font_embed_t::read_font_data(
+ const std::string &filename)
+ {
+ FILE *fp = fopen(filename.c_str(), "r");
+ std::vector<uint8_t> font_data;
+
+ if (fp == NULL) {
+ perror("fopen");
+ return font_data;
+ }
+ font_data = read_font_data(fp);
+ fclose(fp);
+
+ return font_data;
+ }
+
+ bool font_embed_t::parse_otf_cff_header(
+ std::string &font_name, unsigned short &cid_encoding_id,
+ unsigned int &cff_offset, unsigned int &cff_length,
+ const std::vector<uint8_t> &font_data)
+ {
+ // OpenType file structure
+ struct otf_offset_table_s {
+ char sfnt_version[4];
+ uint16_t num_tables;
+ uint16_t search_range;
+ uint16_t entry_selector;
+ uint16_t range_shift;
+ } offset_table;
+
+ memcpy(&offset_table, &font_data[0],
+ sizeof(struct otf_offset_table_s));
+ if (strncmp(offset_table.sfnt_version, "OTTO", 4) != 0) {
+ // Not a OpenType CFF/Type 2 font
+ return false;
+ }
#ifdef LITTLE_ENDIAN
- offset_table.num_tables = bswap_16(offset_table.num_tables);
+ offset_table.num_tables = bswap_16(offset_table.num_tables);
#endif // LITTLE_ENDIAN
- bool name_table_exists = false;
- bool cff_table_exists = false;
- uint32_t name_offset = 0;
-
- for (uint16_t i = 0; i < offset_table.num_tables; i++) {
- struct otf_table_directory_s {
- char tag[4];
- uint32_t check_sum;
- uint32_t offset;
- uint32_t length;
- } table_directory;
-
- memcpy(&table_directory,
- &font_data[sizeof(struct otf_offset_table_s) + i *
- sizeof(struct otf_table_directory_s)],
- sizeof(struct otf_table_directory_s));
+ bool name_table_exists = false;
+ bool cff_table_exists = false;
+ uint32_t name_offset = 0;
+
+ for (uint16_t i = 0; i < offset_table.num_tables; i++) {
+ struct otf_table_directory_s {
+ char tag[4];
+ uint32_t check_sum;
+ uint32_t offset;
+ uint32_t length;
+ } table_directory;
+
+ memcpy(&table_directory,
+ &font_data[sizeof(struct otf_offset_table_s) + i *
+ sizeof(struct otf_table_directory_s)],
+ sizeof(struct otf_table_directory_s));
#ifdef LITTLE_ENDIAN
- table_directory.offset =
- bswap_32(table_directory.offset);
- table_directory.length =
- bswap_32(table_directory.length);
+ table_directory.offset =
+ bswap_32(table_directory.offset);
+ table_directory.length =
+ bswap_32(table_directory.length);
#endif // LITTLE_ENDIAN
- if (strncmp(table_directory.tag, "name", 4) == 0) {
- name_offset = table_directory.offset;
- name_table_exists = true;
- }
- else if (strncmp(table_directory.tag, "CFF ", 4) == 0) {
- cff_offset = table_directory.offset;
- cff_length = table_directory.length;
- cff_table_exists = true;
- }
- }
-
- if (!(name_table_exists && cff_table_exists)) {
- return false;
- }
-
- // name
-
- struct otf_naming_table_header_s {
- uint16_t format;
- uint16_t count;
- uint16_t string_offset;
- } naming_table_header;
-
- memcpy(&naming_table_header, &font_data[name_offset],
- sizeof(struct otf_naming_table_header_s));
+ if (strncmp(table_directory.tag, "name", 4) == 0) {
+ name_offset = table_directory.offset;
+ name_table_exists = true;
+ }
+ else if (strncmp(table_directory.tag, "CFF ", 4) == 0) {
+ cff_offset = table_directory.offset;
+ cff_length = table_directory.length;
+ cff_table_exists = true;
+ }
+ }
+
+ if (!(name_table_exists && cff_table_exists)) {
+ return false;
+ }
+
+ // name
+
+ struct otf_naming_table_header_s {
+ uint16_t format;
+ uint16_t count;
+ uint16_t string_offset;
+ } naming_table_header;
+
+ memcpy(&naming_table_header, &font_data[name_offset],
+ sizeof(struct otf_naming_table_header_s));
#ifdef LITTLE_ENDIAN
- naming_table_header.format =
- bswap_16(naming_table_header.format);
- naming_table_header.count =
- bswap_16(naming_table_header.count);
- naming_table_header.string_offset =
- bswap_16(naming_table_header.string_offset);
+ naming_table_header.format =
+ bswap_16(naming_table_header.format);
+ naming_table_header.count =
+ bswap_16(naming_table_header.count);
+ naming_table_header.string_offset =
+ bswap_16(naming_table_header.string_offset);
#endif // LITTLE_ENDIAN
- cid_encoding_id = 0xffffU;
-
- for (uint16_t i = 0; i < naming_table_header.count; i++) {
- struct otf_name_record_s {
- uint16_t platform_id;
- uint16_t encoding_id;
- uint16_t language_id;
- uint16_t name_id;
- uint16_t length;
- uint16_t offset;
- } name_record;
- const size_t base_offset = name_offset +
- sizeof(struct otf_naming_table_header_s);
-
- memcpy(&name_record,
- &font_data[base_offset + i *
- sizeof(struct otf_name_record_s)],
- sizeof(struct otf_name_record_s));
+ cid_encoding_id = 0xffffU;
+
+ for (uint16_t i = 0; i < naming_table_header.count; i++) {
+ struct otf_name_record_s {
+ uint16_t platform_id;
+ uint16_t encoding_id;
+ uint16_t language_id;
+ uint16_t name_id;
+ uint16_t length;
+ uint16_t offset;
+ } name_record;
+ const size_t base_offset = name_offset +
+ sizeof(struct otf_naming_table_header_s);
+
+ memcpy(&name_record,
+ &font_data[base_offset + i *
+ sizeof(struct otf_name_record_s)],
+ sizeof(struct otf_name_record_s));
#ifdef LITTLE_ENDIAN
- name_record.platform_id =
- bswap_16(name_record.platform_id);
- name_record.encoding_id =
- bswap_16(name_record.encoding_id);
- name_record.name_id = bswap_16(name_record.name_id);
+ name_record.platform_id =
+ bswap_16(name_record.platform_id);
+ name_record.encoding_id =
+ bswap_16(name_record.encoding_id);
+ name_record.name_id = bswap_16(name_record.name_id);
#endif // LITTLE_ENDIAN
- if (name_record.platform_id == 1 &&
- name_record.encoding_id == 0 &&
- name_record.name_id == 6) {
- // Postscript name in Mac OS Roman
- //
- // The font name in Mac OS Roman encoding is
- // sufficient to obtain an ASCII PostScript name (and
- // is required by OpenType specification), while the
- // Windows platform uses a UCS-2 string that would
- // require conversion.
+ if (name_record.platform_id == 1 &&
+ name_record.encoding_id == 0 &&
+ name_record.name_id == 6) {
+ // Postscript name in Mac OS Roman
+ //
+ // The font name in Mac OS Roman encoding is
+ // sufficient to obtain an ASCII PostScript name (and
+ // is required by OpenType specification), while the
+ // Windows platform uses a UCS-2 string that would
+ // require conversion.
#ifdef LITTLE_ENDIAN
- name_record.length = bswap_16(name_record.length);
- name_record.offset = bswap_16(name_record.offset);
+ name_record.length = bswap_16(name_record.length);
+ name_record.offset = bswap_16(name_record.offset);
#endif // LITTLE_ENDIAN
- char *buffer = new char[name_record.length + 1];
-
- memcpy(buffer,
- &font_data[name_offset +
- naming_table_header.string_offset +
- name_record.offset],
- name_record.length);
- buffer[name_record.length] = '\0';
- font_name = buffer;
-
- delete [] buffer;
- }
- if (name_record.platform_id == 1 &&
- name_record.name_id == 20) {
- // PostScript CID findfont name
- //
- // encoding_id Macintosh CMap
- // ---------------------------
- // 1 83pv-RKSJ-H
- // 2 B5pc-H
- // 3 KSCpc-EUC-H
- // 25 GBpc-EUC-H
- cid_encoding_id = name_record.encoding_id;
- // The actual Macintosh encoding CMap name is of no
- // further use. Note that Adobe currently only
- // actively maintains the Unicode based CMaps.
- }
- }
-
- return true;
- }
-
- bool font_embed_t::parse_ttf_header(
- std::string &font_name, double *font_bbox,
- std::map<wchar_t, uint16_t> &cid_map,
- std::vector<std::string> &char_strings,
- const std::vector<uint8_t> &font_data)
- {
- cid_map.clear();
- char_strings.clear();
-
- struct ttf_offset_table_s {
- fixed_t sfnt_version;
- uint16_t num_tables;
- uint16_t search_range;
- uint16_t entry_selector;
- uint16_t range_shift;
- } offset_table;
-
- memcpy(&offset_table, &font_data[0],
- sizeof(struct ttf_offset_table_s));
+ char *buffer = new char[name_record.length + 1];
+
+ memcpy(buffer,
+ &font_data[name_offset +
+ naming_table_header.string_offset +
+ name_record.offset],
+ name_record.length);
+ buffer[name_record.length] = '\0';
+ font_name = buffer;
+
+ delete [] buffer;
+ }
+ if (name_record.platform_id == 1 &&
+ name_record.name_id == 20) {
+ // PostScript CID findfont name
+ //
+ // encoding_id Macintosh CMap
+ // ---------------------------
+ // 1 83pv-RKSJ-H
+ // 2 B5pc-H
+ // 3 KSCpc-EUC-H
+ // 25 GBpc-EUC-H
+ cid_encoding_id = name_record.encoding_id;
+ // The actual Macintosh encoding CMap name is of no
+ // further use. Note that Adobe currently only
+ // actively maintains the Unicode based CMaps.
+ }
+ }
+
+ return true;
+ }
+
+ bool font_embed_t::parse_ttf_header(
+ std::string &font_name, double *font_bbox,
+ std::map<wchar_t, uint16_t> &cid_map,
+ std::vector<std::string> &char_strings,
+ const std::vector<uint8_t> &font_data)
+ {
+ cid_map.clear();
+ char_strings.clear();
+
+ struct ttf_offset_table_s {
+ fixed_t sfnt_version;
+ uint16_t num_tables;
+ uint16_t search_range;
+ uint16_t entry_selector;
+ uint16_t range_shift;
+ } offset_table;
+
+ memcpy(&offset_table, &font_data[0],
+ sizeof(struct ttf_offset_table_s));
#ifdef LITTLE_ENDIAN
- offset_table.sfnt_version =
- bswap_32(offset_table.sfnt_version);
- offset_table.num_tables = bswap_16(offset_table.num_tables);
+ offset_table.sfnt_version =
+ bswap_32(offset_table.sfnt_version);
+ offset_table.num_tables = bswap_16(offset_table.num_tables);
#endif // LITTLE_ENDIAN
- if (offset_table.sfnt_version != 0x00010000) {
- return false;
- }
-
- size_t name_offset = 0;
- //size_t name_length = 0;
- size_t head_offset = 0;
- //size_t head_length = 0;
- size_t cmap_offset = 0;
- //size_t cmap_length = 0;
- size_t post_offset = 0;
- //size_t post_length = 0;
-
- for (uint16_t i = 0; i < offset_table.num_tables; i++) {
- struct ttf_table_directory_s {
- char tag[4];
- uint32_t check_sum;
- uint32_t offset;
- uint32_t length;
- } table_directory;
-
- memcpy(&table_directory,
- &font_data[sizeof(struct ttf_offset_table_s) + i *
- sizeof(struct ttf_table_directory_s)],
- sizeof(struct ttf_table_directory_s));
+ if (offset_table.sfnt_version != 0x00010000) {
+ return false;
+ }
+
+ size_t name_offset = 0;
+ //size_t name_length = 0;
+ size_t head_offset = 0;
+ //size_t head_length = 0;
+ size_t cmap_offset = 0;
+ //size_t cmap_length = 0;
+ size_t post_offset = 0;
+ //size_t post_length = 0;
+
+ for (uint16_t i = 0; i < offset_table.num_tables; i++) {
+ struct ttf_table_directory_s {
+ char tag[4];
+ uint32_t check_sum;
+ uint32_t offset;
+ uint32_t length;
+ } table_directory;
+
+ memcpy(&table_directory,
+ &font_data[sizeof(struct ttf_offset_table_s) + i *
+ sizeof(struct ttf_table_directory_s)],
+ sizeof(struct ttf_table_directory_s));
#ifdef LITTLE_ENDIAN
- table_directory.offset =
- bswap_32(table_directory.offset);
- table_directory.length =
- bswap_32(table_directory.length);
+ table_directory.offset =
+ bswap_32(table_directory.offset);
+ table_directory.length =
+ bswap_32(table_directory.length);
#endif // LITTLE_ENDIAN
#if 0
- fprintf(stderr, "%s:%d: tag = %c%c%c%c, offset = %u, "
- "length = %u\n", __FILE__, __LINE__,
- table_directory.tag[0], table_directory.tag[1],
- table_directory.tag[2], table_directory.tag[3],
- table_directory.offset, table_directory.length);
+ fprintf(stderr, "%s:%d: tag = %c%c%c%c, offset = %u, "
+ "length = %u\n", __FILE__, __LINE__,
+ table_directory.tag[0], table_directory.tag[1],
+ table_directory.tag[2], table_directory.tag[3],
+ table_directory.offset, table_directory.length);
#endif
- if (strncmp(table_directory.tag, "name", 4) == 0) {
- name_offset = table_directory.offset;
- //name_length = table_directory.length;
- }
- else if (strncmp(table_directory.tag, "head", 4) == 0) {
- head_offset = table_directory.offset;
- //head_length = table_directory.length;
- }
- else if (strncmp(table_directory.tag, "cmap", 4) == 0) {
- cmap_offset = table_directory.offset;
- //cmap_length = table_directory.length;
- }
- else if (strncmp(table_directory.tag, "post", 4) == 0) {
- post_offset = table_directory.offset;
- //post_length = table_directory.length;
- }
- }
-
- // name
-
- struct ttf_naming_table_header_s {
- uint16_t format;
- uint16_t count;
- uint16_t string_offset;
- } naming_table_header;
-
- memcpy(&naming_table_header,
- &font_data[name_offset],
- sizeof(struct ttf_naming_table_header_s));
+ if (strncmp(table_directory.tag, "name", 4) == 0) {
+ name_offset = table_directory.offset;
+ //name_length = table_directory.length;
+ }
+ else if (strncmp(table_directory.tag, "head", 4) == 0) {
+ head_offset = table_directory.offset;
+ //head_length = table_directory.length;
+ }
+ else if (strncmp(table_directory.tag, "cmap", 4) == 0) {
+ cmap_offset = table_directory.offset;
+ //cmap_length = table_directory.length;
+ }
+ else if (strncmp(table_directory.tag, "post", 4) == 0) {
+ post_offset = table_directory.offset;
+ //post_length = table_directory.length;
+ }
+ }
+
+ // name
+
+ struct ttf_naming_table_header_s {
+ uint16_t format;
+ uint16_t count;
+ uint16_t string_offset;
+ } naming_table_header;
+
+ memcpy(&naming_table_header,
+ &font_data[name_offset],
+ sizeof(struct ttf_naming_table_header_s));
#ifdef LITTLE_ENDIAN
- naming_table_header.format =
- bswap_16(naming_table_header.format);
- naming_table_header.count =
- bswap_16(naming_table_header.count);
- naming_table_header.string_offset =
- bswap_16(naming_table_header.string_offset);
+ naming_table_header.format =
+ bswap_16(naming_table_header.format);
+ naming_table_header.count =
+ bswap_16(naming_table_header.count);
+ naming_table_header.string_offset =
+ bswap_16(naming_table_header.string_offset);
#endif // LITTLE_ENDIAN
- for (uint16_t i = 0; i < naming_table_header.count; i++) {
- struct ttf_name_record_s {
- uint16_t platform_id;
- uint16_t encoding_id;
- uint16_t language_id;
- uint16_t name_id;
- uint16_t length;
- uint16_t offset;
- } name_record;
-
- memcpy(
- &name_record,
- &font_data[name_offset +
- sizeof(struct ttf_naming_table_header_s) +
- i * sizeof(struct ttf_name_record_s)],
- sizeof(struct ttf_name_record_s));
+ for (uint16_t i = 0; i < naming_table_header.count; i++) {
+ struct ttf_name_record_s {
+ uint16_t platform_id;
+ uint16_t encoding_id;
+ uint16_t language_id;
+ uint16_t name_id;
+ uint16_t length;
+ uint16_t offset;
+ } name_record;
+
+ memcpy(
+ &name_record,
+ &font_data[name_offset +
+ sizeof(struct ttf_naming_table_header_s) +
+ i * sizeof(struct ttf_name_record_s)],
+ sizeof(struct ttf_name_record_s));
#ifdef LITTLE_ENDIAN
- name_record.platform_id =
- bswap_16(name_record.platform_id);
- name_record.encoding_id =
- bswap_16(name_record.encoding_id);
- name_record.name_id = bswap_16(name_record.name_id);
+ name_record.platform_id =
+ bswap_16(name_record.platform_id);
+ name_record.encoding_id =
+ bswap_16(name_record.encoding_id);
+ name_record.name_id = bswap_16(name_record.name_id);
#endif // LITTLE_ENDIAN
- // the font name in mac os roman encoding is good enough
- // to obtain an ASCII post_script name, while the windows
- // platform uses a utF-16 string that would require
- // conversion.
- if (name_record.platform_id == 1 &&
- name_record.encoding_id == 0 &&
- name_record.name_id == 6) {
+ // the font name in mac os roman encoding is good enough
+ // to obtain an ASCII post_script name, while the windows
+ // platform uses a utF-16 string that would require
+ // conversion.
+ if (name_record.platform_id == 1 &&
+ name_record.encoding_id == 0 &&
+ name_record.name_id == 6) {
#ifdef LITTLE_ENDIAN
- name_record.length = bswap_16(name_record.length);
- name_record.offset = bswap_16(name_record.offset);
+ name_record.length = bswap_16(name_record.length);
+ name_record.offset = bswap_16(name_record.offset);
#endif // LITTLE_ENDIAN
- char *buffer = new char[name_record.length + 1];
-
- memcpy(buffer,
- &font_data[name_offset +
- naming_table_header.string_offset +
- name_record.offset],
- name_record.length * sizeof(char));
- buffer[name_record.length] = '\0';
- font_name = buffer;
-
- delete [] buffer;
- }
- else if (name_record.platform_id == 3 &&
- name_record.encoding_id == 1 &&
- name_record.name_id == 6) {
+ char *buffer = new char[name_record.length + 1];
+
+ memcpy(buffer,
+ &font_data[name_offset +
+ naming_table_header.string_offset +
+ name_record.offset],
+ name_record.length * sizeof(char));
+ buffer[name_record.length] = '\0';
+ font_name = buffer;
+
+ delete [] buffer;
+ }
+ else if (name_record.platform_id == 3 &&
+ name_record.encoding_id == 1 &&
+ name_record.name_id == 6) {
#ifdef LITTLE_ENDIAN
- name_record.length = bswap_16(name_record.length);
- name_record.offset = bswap_16(name_record.offset);
+ name_record.length = bswap_16(name_record.length);
+ name_record.offset = bswap_16(name_record.offset);
#endif // LITTLE_ENDIAN
- // Very ugly UCS-2 to ASCII conversion, but should
- // work for most font names
- char *buffer =
- new char[(name_record.length >> 1) + 1];
-
- for (uint16_t j = 0; j < (name_record.length >> 1);
- j++) {
- buffer[j] =
- font_data[name_offset +
- naming_table_header.string_offset +
- name_record.offset + j * 2 + 1];
- }
- buffer[name_record.length >> 1] = '\0';
- font_name = buffer;
-
- delete [] buffer;
- }
- }
-
- // head
-
- struct ttf_head_table_s {
- fixed_t version;
- fixed_t font_revision;
- uint32_t check_sum_adjustment;
- uint32_t magic_number;
- uint16_t flags;
- uint16_t units_per_em;
- char created[8];
- char modified[8];
- int16_t x_min;
- int16_t y_min;
- int16_t x_max;
- int16_t y_max;
- uint16_t mac_style;
- uint16_t lowest_rec_ppem;
- int16_t font_direction_hint;
- int16_t index_to_loc_format;
- int16_t glyph_data_format;
- } head_table;
-
- memcpy(&head_table, &font_data[head_offset],
- sizeof(struct ttf_head_table_s));
+ // Very ugly UCS-2 to ASCII conversion, but should
+ // work for most font names
+ char *buffer =
+ new char[(name_record.length >> 1) + 1];
+
+ for (uint16_t j = 0; j < (name_record.length >> 1);
+ j++) {
+ buffer[j] =
+ font_data[name_offset +
+ naming_table_header.string_offset +
+ name_record.offset + j * 2 + 1];
+ }
+ buffer[name_record.length >> 1] = '\0';
+ font_name = buffer;
+
+ delete [] buffer;
+ }
+ }
+
+ // head
+
+ struct ttf_head_table_s {
+ fixed_t version;
+ fixed_t font_revision;
+ uint32_t check_sum_adjustment;
+ uint32_t magic_number;
+ uint16_t flags;
+ uint16_t units_per_em;
+ char created[8];
+ char modified[8];
+ int16_t x_min;
+ int16_t y_min;
+ int16_t x_max;
+ int16_t y_max;
+ uint16_t mac_style;
+ uint16_t lowest_rec_ppem;
+ int16_t font_direction_hint;
+ int16_t index_to_loc_format;
+ int16_t glyph_data_format;
+ } head_table;
+
+ memcpy(&head_table, &font_data[head_offset],
+ sizeof(struct ttf_head_table_s));
#ifdef LITTLE_ENDIAN
- head_table.units_per_em = bswap_16(head_table.units_per_em);
- head_table.x_min = bswap_16(head_table.x_min);
- head_table.y_min = bswap_16(head_table.y_min);
- head_table.x_max = bswap_16(head_table.x_max);
- head_table.y_max = bswap_16(head_table.y_max);
+ head_table.units_per_em = bswap_16(head_table.units_per_em);
+ head_table.x_min = bswap_16(head_table.x_min);
+ head_table.y_min = bswap_16(head_table.y_min);
+ head_table.x_max = bswap_16(head_table.x_max);
+ head_table.y_max = bswap_16(head_table.y_max);
#endif // LITTLE_ENDIAN
-
- font_bbox[0] =
- (double)head_table.x_min / head_table.units_per_em;
- font_bbox[1] =
- (double)head_table.y_min / head_table.units_per_em;
- font_bbox[2] =
- (double)head_table.x_max / head_table.units_per_em;
- font_bbox[3] =
- (double)head_table.y_max / head_table.units_per_em;
-
- // post
-
- struct ttf_post_script_table_s {
- fixed_t format_type;
- fixed_t italic_angle;
- int16_t underline_position;
- int16_t underline_thickness;
- uint32_t is_fixed_pitch;
- uint32_t min_mem_type42;
- uint32_t max_mem_type42;
- uint32_t min_mem_type1;
- uint32_t max_mem_type1;
- } post_script_table;
-
- memcpy(&post_script_table,
- &font_data[post_offset],
- sizeof(struct ttf_post_script_table_s));
-
+
+ font_bbox[0] =
+ (double)head_table.x_min / head_table.units_per_em;
+ font_bbox[1] =
+ (double)head_table.y_min / head_table.units_per_em;
+ font_bbox[2] =
+ (double)head_table.x_max / head_table.units_per_em;
+ font_bbox[3] =
+ (double)head_table.y_max / head_table.units_per_em;
+
+ // post
+
+ struct ttf_post_script_table_s {
+ fixed_t format_type;
+ fixed_t italic_angle;
+ int16_t underline_position;
+ int16_t underline_thickness;
+ uint32_t is_fixed_pitch;
+ uint32_t min_mem_type42;
+ uint32_t max_mem_type42;
+ uint32_t min_mem_type1;
+ uint32_t max_mem_type1;
+ } post_script_table;
+
+ memcpy(&post_script_table,
+ &font_data[post_offset],
+ sizeof(struct ttf_post_script_table_s));
+
#ifdef LITTLE_ENDIAN
- post_script_table.format_type =
- bswap_32(post_script_table.format_type);
- post_script_table.min_mem_type42 =
- bswap_32(post_script_table.min_mem_type42);
- post_script_table.max_mem_type42 =
- bswap_32(post_script_table.max_mem_type42);
+ post_script_table.format_type =
+ bswap_32(post_script_table.format_type);
+ post_script_table.min_mem_type42 =
+ bswap_32(post_script_table.min_mem_type42);
+ post_script_table.max_mem_type42 =
+ bswap_32(post_script_table.max_mem_type42);
#endif // LITTLE_ENDIAN
-
- size_t offset_current = post_offset;
-
+
+ size_t offset_current = post_offset;
+
#if 0
- if (post_script_table.format_type == 0x00010000) {
- // Exactly the 258 glyphs in the standard Macintosh glyph
- // set
- }
+ if (post_script_table.format_type == 0x00010000) {
+ // Exactly the 258 glyphs in the standard Macintosh glyph
+ // set
+ }
#endif
- if (post_script_table.format_type == 0x00020000) {
- // Version required by TrueType-based fonts to be used on
- // Windows
- //
- // numberOfGlyphs, glyphNameIndex[numGlyphs],
- // names[numberNewGlyphs] table
-
- uint16_t num_glyphs;
-
- memcpy(&num_glyphs,
- &font_data[post_offset +
- sizeof(struct ttf_post_script_table_s)],
- sizeof(uint16_t));
+ if (post_script_table.format_type == 0x00020000) {
+ // Version required by TrueType-based fonts to be used on
+ // Windows
+ //
+ // numberOfGlyphs, glyphNameIndex[numGlyphs],
+ // names[numberNewGlyphs] table
+
+ uint16_t num_glyphs;
+
+ memcpy(&num_glyphs,
+ &font_data[post_offset +
+ sizeof(struct ttf_post_script_table_s)],
+ sizeof(uint16_t));
#ifdef LITTLE_ENDIAN
- num_glyphs = bswap_16(num_glyphs);
+ num_glyphs = bswap_16(num_glyphs);
#endif // LITTLE_ENDIAN
-
- uint16_t *glyph_name_index = new uint16_t[num_glyphs];
-
- memcpy(glyph_name_index,
- &font_data[post_offset +
- sizeof(struct ttf_post_script_table_s) +
- sizeof(uint16_t)],
- num_glyphs * sizeof(uint16_t));
+
+ uint16_t *glyph_name_index = new uint16_t[num_glyphs];
+
+ memcpy(glyph_name_index,
+ &font_data[post_offset +
+ sizeof(struct ttf_post_script_table_s) +
+ sizeof(uint16_t)],
+ num_glyphs * sizeof(uint16_t));
#ifdef LITTLE_ENDIAN
- for (uint16_t i = 0; i < num_glyphs; i++) {
- glyph_name_index[i] = bswap_16(glyph_name_index[i]);
- }
+ for (uint16_t i = 0; i < num_glyphs; i++) {
+ glyph_name_index[i] = bswap_16(glyph_name_index[i]);
+ }
#endif // LITTLE_ENDIAN
- size_t max_glyph_name_index = 0;
- for (int i = num_glyphs - 1; i >= 0; i--) {
- if (glyph_name_index[i] > max_glyph_name_index) {
- max_glyph_name_index = glyph_name_index[i];
- }
- }
-
- std::string *glyph_name =
- new std::string[max_glyph_name_index - 258 + 1];
-
- offset_current +=
- sizeof(struct ttf_post_script_table_s) +
- (num_glyphs + 1) * sizeof(uint16_t);
- for (uint16_t i = 0; i <= max_glyph_name_index - 258; i++) {
- uint8_t length;
-
- memcpy(&length, &font_data[offset_current],
- sizeof(uint8_t));
- offset_current += sizeof(uint8_t);
-
- char *buffer = new char[length + 1UL];
-
- memcpy(buffer, &font_data[offset_current],
- length * sizeof(uint8_t));
- offset_current += length * sizeof(uint8_t);
- buffer[length] = '\0';
- glyph_name[i] = buffer;
-
- delete [] buffer;
- }
-
- char_strings.resize(num_glyphs);
+ size_t max_glyph_name_index = 0;
+ for (int i = num_glyphs - 1; i >= 0; i--) {
+ if (glyph_name_index[i] > max_glyph_name_index) {
+ max_glyph_name_index = glyph_name_index[i];
+ }
+ }
+
+ std::string *glyph_name =
+ new std::string[max_glyph_name_index - 258 + 1];
+
+ offset_current +=
+ sizeof(struct ttf_post_script_table_s) +
+ (num_glyphs + 1) * sizeof(uint16_t);
+ for (uint16_t i = 0; i <= max_glyph_name_index - 258; i++) {
+ uint8_t length;
+
+ memcpy(&length, &font_data[offset_current],
+ sizeof(uint8_t));
+ offset_current += sizeof(uint8_t);
+
+ char *buffer = new char[length + 1UL];
+
+ memcpy(buffer, &font_data[offset_current],
+ length * sizeof(uint8_t));
+ offset_current += length * sizeof(uint8_t);
+ buffer[length] = '\0';
+ glyph_name[i] = buffer;
+
+ delete [] buffer;
+ }
+
+ char_strings.resize(num_glyphs);
#include "table/macintoshordering.h"
- for (uint16_t glyph = 0; glyph < num_glyphs; glyph++) {
- char_strings[glyph] = glyph_name_index[glyph] >= 258 ?
- glyph_name[glyph_name_index[glyph] - 258].c_str() :
- macintosh_ordering[glyph_name_index[glyph]];
- }
-
- delete [] glyph_name_index;
- delete [] glyph_name;
- }
- else if (post_script_table.format_type == 0x00030000) {
- // No PostScript name information is provided for the
- // glyphs
-
- // Do nothing, cid_map will be initialized with standard
- // Adobe glyph names once cmap is read
- }
- else {
- fprintf(stderr, "%s:%d: unsupported post table format "
- "0x%08x\n", __FILE__, __LINE__,
- post_script_table.format_type);
-
- return false;
- }
+ for (uint16_t glyph = 0; glyph < num_glyphs; glyph++) {
+ char_strings[glyph] = glyph_name_index[glyph] >= 258 ?
+ glyph_name[glyph_name_index[glyph] - 258].c_str() :
+ macintosh_ordering[glyph_name_index[glyph]];
+ }
+
+ delete [] glyph_name_index;
+ delete [] glyph_name;
+ }
+ else if (post_script_table.format_type == 0x00030000) {
+ // No PostScript name information is provided for the
+ // glyphs
+
+ // Do nothing, cid_map will be initialized with standard
+ // Adobe glyph names once cmap is read
+ }
+ else {
+ fprintf(stderr, "%s:%d: unsupported post table format "
+ "0x%08x\n", __FILE__, __LINE__,
+ post_script_table.format_type);
+
+ return false;
+ }
#if 0
- if (post_script_table.format_type == 0x00025000) {
- // Pure subset/simple reordering of the standard Macintosh
- // glyph set. Deprecated as of OpenType Specification v1.3
- //
- // numberOfGlyphs, offset[numGlyphs]
- return false;
- }
+ if (post_script_table.format_type == 0x00025000) {
+ // Pure subset/simple reordering of the standard Macintosh
+ // glyph set. Deprecated as of OpenType Specification v1.3
+ //
+ // numberOfGlyphs, offset[numGlyphs]
+ return false;
+ }
#endif
-
- // cmap
-
- struct ttf_mapping_table_s {
- uint16_t version;
- uint16_t num_encoding_tables;
- } mapping_table;
-
- memcpy(&mapping_table, &font_data[cmap_offset],
- sizeof(struct ttf_mapping_table_s));
+
+ // cmap
+
+ struct ttf_mapping_table_s {
+ uint16_t version;
+ uint16_t num_encoding_tables;
+ } mapping_table;
+
+ memcpy(&mapping_table, &font_data[cmap_offset],
+ sizeof(struct ttf_mapping_table_s));
#ifdef LITTLE_ENDIAN
- mapping_table.num_encoding_tables =
- bswap_16(mapping_table.num_encoding_tables);
+ mapping_table.num_encoding_tables =
+ bswap_16(mapping_table.num_encoding_tables);
#endif // LITTLE_ENDIAN
-
- uint32_t *subtable_offset =
- new uint32_t[mapping_table.num_encoding_tables];
-
- for (uint16_t i = 0;
- i < mapping_table.num_encoding_tables; i++) {
- struct ttf_encoding_table_s {
- uint16_t platform_id;
- uint16_t encoding_id;
- uint32_t offset;
- } encoding_table;
-
- memcpy(
- &encoding_table,
- &font_data[cmap_offset +
- sizeof(struct ttf_mapping_table_s) +
- i * sizeof(struct ttf_encoding_table_s)],
- sizeof(struct ttf_encoding_table_s));
+
+ uint32_t *subtable_offset =
+ new uint32_t[mapping_table.num_encoding_tables];
+
+ for (uint16_t i = 0;
+ i < mapping_table.num_encoding_tables; i++) {
+ struct ttf_encoding_table_s {
+ uint16_t platform_id;
+ uint16_t encoding_id;
+ uint32_t offset;
+ } encoding_table;
+
+ memcpy(
+ &encoding_table,
+ &font_data[cmap_offset +
+ sizeof(struct ttf_mapping_table_s) +
+ i * sizeof(struct ttf_encoding_table_s)],
+ sizeof(struct ttf_encoding_table_s));
#ifdef LITTLE_ENDIAN
- encoding_table.platform_id =
- bswap_16(encoding_table.platform_id);
- encoding_table.encoding_id =
- bswap_16(encoding_table.encoding_id);
- encoding_table.offset = bswap_32(encoding_table.offset);
+ encoding_table.platform_id =
+ bswap_16(encoding_table.platform_id);
+ encoding_table.encoding_id =
+ bswap_16(encoding_table.encoding_id);
+ encoding_table.offset = bswap_32(encoding_table.offset);
#endif // LITTLE_ENDIAN
- subtable_offset[i] = cmap_offset + encoding_table.offset;
- }
-
- int priority_max = 0;
-
- for (uint16_t i = 0;
- i < mapping_table.num_encoding_tables; i++) {
- struct ttf_encoding_subtable_common_s {
- uint16_t format;
- uint16_t length;
- uint16_t language;
- } encoding_subtable_common;
-
- memcpy(&encoding_subtable_common,
- &font_data[subtable_offset[i]],
- sizeof(struct ttf_encoding_subtable_common_s));
+ subtable_offset[i] = cmap_offset + encoding_table.offset;
+ }
+
+ int priority_max = 0;
+
+ for (uint16_t i = 0;
+ i < mapping_table.num_encoding_tables; i++) {
+ struct ttf_encoding_subtable_common_s {
+ uint16_t format;
+ uint16_t length;
+ uint16_t language;
+ } encoding_subtable_common;
+
+ memcpy(&encoding_subtable_common,
+ &font_data[subtable_offset[i]],
+ sizeof(struct ttf_encoding_subtable_common_s));
#ifdef LITTLE_ENDIAN
- encoding_subtable_common.format =
- bswap_16(encoding_subtable_common.format);
- encoding_subtable_common.length =
- bswap_16(encoding_subtable_common.length);
- encoding_subtable_common.language =
- bswap_16(encoding_subtable_common.language);
+ encoding_subtable_common.format =
+ bswap_16(encoding_subtable_common.format);
+ encoding_subtable_common.length =
+ bswap_16(encoding_subtable_common.length);
+ encoding_subtable_common.language =
+ bswap_16(encoding_subtable_common.language);
#endif // LITTLE_ENDIAN
-
- offset_current = subtable_offset[i] +
- sizeof(struct ttf_encoding_subtable_common_s);
+
+ offset_current = subtable_offset[i] +
+ sizeof(struct ttf_encoding_subtable_common_s);
#if 0
- fprintf(stderr, "%s:%d: encoding_subtable_common.format "
- "= %hu\n", __FILE__, __LINE__,
- encoding_subtable_common.format);
- fprintf(stderr, "%s:%d: encoding_subtable_common.length "
- "= %hu\n", __FILE__, __LINE__,
- encoding_subtable_common.length);
- fprintf(stderr, "%s:%d: encoding_subtable_common.language "
- "= %hu\n", __FILE__, __LINE__,
- encoding_subtable_common.language);
+ fprintf(stderr, "%s:%d: encoding_subtable_common.format "
+ "= %hu\n", __FILE__, __LINE__,
+ encoding_subtable_common.format);
+ fprintf(stderr, "%s:%d: encoding_subtable_common.length "
+ "= %hu\n", __FILE__, __LINE__,
+ encoding_subtable_common.length);
+ fprintf(stderr, "%s:%d: encoding_subtable_common.language "
+ "= %hu\n", __FILE__, __LINE__,
+ encoding_subtable_common.language);
#endif
-
- int priority;
-
- switch(encoding_subtable_common.format) {
- /////////////////////////////////////////////////////
- // 8 and 16 bit mappings
- // Priority range 1, 3..5 (2 reserved for format 13)
- case 0:
- priority = 1;
- // Byte encoding table
- break;
- case 2:
- // High-byte mapping through table
- priority = 3;
- break;
- case 4:
- // Segment mapping to delta values
- priority = 5;
+
+ int priority;
+
+ switch(encoding_subtable_common.format) {
+ /////////////////////////////////////////////////////
+ // 8 and 16 bit mappings
+ // Priority range 1, 3..5 (2 reserved for format 13)
+ case 0:
+ priority = 1;
+ // Byte encoding table
+ break;
+ case 2:
+ // High-byte mapping through table
+ priority = 3;
+ break;
+ case 4:
+ // Segment mapping to delta values
+ priority = 5;
#if 0
- fprintf(stderr, "%s:%d: priority = %d, priority_max "
- "= %d\n", __FILE__, __LINE__, priority,
- priority_max);
+ fprintf(stderr, "%s:%d: priority = %d, priority_max "
+ "= %d\n", __FILE__, __LINE__, priority,
+ priority_max);
#endif
- if (priority_max <= priority) {
- parse_ttf_encoding_subtable_format4(
- cid_map, font_data, offset_current,
- encoding_subtable_common.length);
- priority_max = priority;
- }
- break;
- case 6:
- // Trimmed table mapping
- priority = 5;
- break;
- /////////////////////////////////////////////////////
- // 32-bit mappings
- // Priority range 6..9 (2 reserved for format 13)
- case 8:
- // Mixed 16-bit and 32-bit coverage
- priority = 6;
- break;
- case 10:
- // Trimmed array
- priority = 6;
- break;
- case 12:
- // Segmented coverage
- priority = 6;
- break;
- case 13:
- // Last resort font
- priority = 2;
- break;
- case 14:
- // Unicode variation sequences
- priority = 9;
- break;
- default:
- delete [] subtable_offset;
- return false;
- }
- }
-
- delete [] subtable_offset;
-
- // Regenerate cid_map from the Adobe glyph list
-
- if (char_strings.empty() && !cid_map.empty()) {
- char_strings.resize(cid_map.size());
- for (std::map<wchar_t, uint16_t>::const_iterator iterator =
- cid_map.begin();
- iterator != cid_map.end(); iterator++) {
- if (iterator->second < char_strings.size()) {
+ if (priority_max <= priority) {
+ parse_ttf_encoding_subtable_format4(
+ cid_map, font_data, offset_current,
+ encoding_subtable_common.length);
+ priority_max = priority;
+ }
+ break;
+ case 6:
+ // Trimmed table mapping
+ priority = 5;
+ break;
+ /////////////////////////////////////////////////////
+ // 32-bit mappings
+ // Priority range 6..9 (2 reserved for format 13)
+ case 8:
+ // Mixed 16-bit and 32-bit coverage
+ priority = 6;
+ break;
+ case 10:
+ // Trimmed array
+ priority = 6;
+ break;
+ case 12:
+ // Segmented coverage
+ priority = 6;
+ break;
+ case 13:
+ // Last resort font
+ priority = 2;
+ break;
+ case 14:
+ // Unicode variation sequences
+ priority = 9;
+ break;
+ default:
+ delete [] subtable_offset;
+ return false;
+ }
+ }
+
+ delete [] subtable_offset;
+
+ // Regenerate cid_map from the Adobe glyph list
+
+ if (char_strings.empty() && !cid_map.empty()) {
+ char_strings.resize(cid_map.size());
+ for (std::map<wchar_t, uint16_t>::const_iterator iterator =
+ cid_map.begin();
+ iterator != cid_map.end(); iterator++) {
+ if (iterator->second < char_strings.size()) {
#include "table/adobeglyphlist.h"
-
- const wchar_t *lower =
- std::lower_bound(
- adobe_glyph_ucs,
- adobe_glyph_ucs + nadobe_glyph,
- iterator->first);
- // The longest Adobe glyph name is 20 characters
- // long (0x03b0 = upsilondieresistonos)
- char buf[21];
-
- if (iterator->first == L'\uffff') {
- strncpy(buf, ".notdef", 8);
- }
- else if (lower < adobe_glyph_ucs + nadobe_glyph &&
- *lower == iterator->first) {
- const size_t index =
- lower - adobe_glyph_ucs;
-
- snprintf(buf, 21, "%s", adobe_glyph_name[index]);
- }
- else {
- snprintf(buf, 21, "uni%04X", iterator->first);
- }
- char_strings[iterator->second] = buf;
- }
- }
- }
-
- return true;
- }
-
+
+ const wchar_t *lower =
+ std::lower_bound(
+ adobe_glyph_ucs,
+ adobe_glyph_ucs + nadobe_glyph,
+ iterator->first);
+ // The longest Adobe glyph name is 20 characters
+ // long (0x03b0 = upsilondieresistonos)
+ char buf[21];
+
+ if (iterator->first == L'\uffff') {
+ strncpy(buf, ".notdef", 8);
+ }
+ else if (lower < adobe_glyph_ucs + nadobe_glyph &&
+ *lower == iterator->first) {
+ const size_t index =
+ lower - adobe_glyph_ucs;
+
+ snprintf(buf, 21, "%s", adobe_glyph_name[index]);
+ }
+ else {
+ snprintf(buf, 21, "uni%04X", iterator->first);
+ }
+ char_strings[iterator->second] = buf;
+ }
+ }
+ }
+
+ return true;
+ }
+
#if 0
- std::vector<uint8_t> font_embed_t::subset_otf(
- const std::vector<uint8_t> &font_data,
- const std::map<wchar_t, bool> &glyph_usage)
- {
- std::vector<uint8_t> retval;
- struct otf_offset_table_s {
- char sfnt_version[4];
- uint16_t num_tables;
- uint16_t search_range;
- uint16_t entry_selector;
- uint16_t range_shift;
- } offset_table;
-
- memcpy(&offset_table, &font_data[0],
- sizeof(struct otf_offset_table_s));
- if (strncmp(offset_table.sfnt_version, "OTTO", 4) != 0 ||
- strncmp(offset_table.sfnt_version, "\0\1\0\0", 4) != 0) {
- // Neither a OpenType, nor TrueType font
+ std::vector<uint8_t> font_embed_t::subset_otf(
+ const std::vector<uint8_t> &font_data,
+ const std::map<wchar_t, bool> &glyph_usage)
+ {
+ std::vector<uint8_t> retval;
+ struct otf_offset_table_s {
+ char sfnt_version[4];
+ uint16_t num_tables;
+ uint16_t search_range;
+ uint16_t entry_selector;
+ uint16_t range_shift;
+ } offset_table;
+
+ memcpy(&offset_table, &font_data[0],
+ sizeof(struct otf_offset_table_s));
+ if (strncmp(offset_table.sfnt_version, "OTTO", 4) != 0 ||
+ strncmp(offset_table.sfnt_version, "\0\1\0\0", 4) != 0) {
+ // Neither a OpenType, nor TrueType font
#if 0
- fprintf(stderr, "%s:%d: error: unknown sfnt_version = "
- "0x%02x%02x%02x%02x\n", __FILE__, __LINE__,
- offset_table.sfnt_version[0],
- offset_table.sfnt_version[1],
- offset_table.sfnt_version[2],
- offset_table.sfnt_version[3]);
+ fprintf(stderr, "%s:%d: error: unknown sfnt_version = "
+ "0x%02x%02x%02x%02x\n", __FILE__, __LINE__,
+ offset_table.sfnt_version[0],
+ offset_table.sfnt_version[1],
+ offset_table.sfnt_version[2],
+ offset_table.sfnt_version[3]);
#endif
- return retval;
- }
+ return retval;
+ }
#ifdef LITTLE_ENDIAN
- offset_table.num_tables = bswap_16(offset_table.num_tables);
+ offset_table.num_tables = bswap_16(offset_table.num_tables);
#endif // LITTLE_ENDIAN
-
- struct otf_table_directory_s {
- char tag[4];
- uint32_t check_sum;
- uint32_t offset;
- uint32_t length;
- };
- struct table_data_s *table_data =
- new struct table_data_s[offset_table.num_tables];
-
- for (uint16_t i = 0; i < offset_table.num_tables; i++) {
- struct otf_table_directory_s table_directory;
-
- memcpy(&table_directory,
- &font_data[sizeof(struct otf_offset_table_s) + i *
- sizeof(struct otf_table_directory_s)],
- sizeof(struct otf_table_directory_s));
+
+ struct otf_table_directory_s {
+ char tag[4];
+ uint32_t check_sum;
+ uint32_t offset;
+ uint32_t length;
+ };
+ struct table_data_s *table_data =
+ new struct table_data_s[offset_table.num_tables];
+
+ for (uint16_t i = 0; i < offset_table.num_tables; i++) {
+ struct otf_table_directory_s table_directory;
+
+ memcpy(&table_directory,
+ &font_data[sizeof(struct otf_offset_table_s) + i *
+ sizeof(struct otf_table_directory_s)],
+ sizeof(struct otf_table_directory_s));
#ifdef LITTLE_ENDIAN
- table_directory.offset =
- bswap_32(table_directory.offset);
- table_directory.length =
- bswap_32(table_directory.length);
+ table_directory.offset =
+ bswap_32(table_directory.offset);
+ table_directory.length =
+ bswap_32(table_directory.length);
#endif // LITTLE_ENDIAN
#if 0
- fprintf(stderr, "%s:%d: tag = %c%c%c%c, offset = %u, "
- "length = %u\n", __FILE__, __LINE__,
- table_directory.tag[0], table_directory.tag[1],
- table_directory.tag[2], table_directory.tag[3],
- table_directory.offset, table_directory.length);
+ fprintf(stderr, "%s:%d: tag = %c%c%c%c, offset = %u, "
+ "length = %u\n", __FILE__, __LINE__,
+ table_directory.tag[0], table_directory.tag[1],
+ table_directory.tag[2], table_directory.tag[3],
+ table_directory.offset, table_directory.length);
#endif
- memcpy(table_data[i].tag, table_directory.tag,
- 4 * sizeof(char));
- table_data[i].data.resize(table_directory.length);
- memcpy(&(table_data[i].data[0]),
- &font_data[table_directory.offset],
- table_directory.length);
- }
-
- size_t size_count;
-
- size_count = sizeof(struct otf_offset_table_s) +
- offset_table.num_tables *
- sizeof(struct otf_table_directory_s);
- for (size_t i = 0; i < offset_table.num_tables; i++) {
- size_count += table_data[i].data.size();
- }
-
- size_t offset_current = sizeof(struct otf_offset_table_s);
- size_t offset_check_sum_adjustment = 0;
- bool head_table_exists = false;
-
- retval.resize(size_count);
- memcpy(&retval[0], &font_data[0],
- sizeof(struct otf_offset_table_s));
- for (size_t i = 0; i < offset_table.num_tables; i++) {
- struct otf_table_directory_s table_directory;
- const bool head_table =
- strncmp(table_directory.tag, "head", 4) == 0;
-
- memcpy(table_directory.tag, table_data[i].tag,
- 4 * sizeof(char));
- if (head_table) {
- // Reset checkSumAdjustment in order to calculate the
- // check sum of the head table
- offset_check_sum_adjustment = 2 * sizeof(fixed_t);
- *reinterpret_cast<uint32_t *>(&(table_data[i].data[
- offset_check_sum_adjustment])) = 0U;
- // Change the offset for checkSumAdjustment to the
- // global indexing
- offset_check_sum_adjustment += offset_current;
- head_table_exists = true;
- }
- table_directory.check_sum =
- otf_check_sum(table_data[i].data);
- table_directory.offset = size_count;
- table_directory.length = table_data[i].data.size();
-
- memcpy(&retval[offset_current], &table_directory,
- sizeof(struct otf_table_directory_s));
- size_count += table_data[i].data.size();
- offset_current += sizeof(struct otf_table_directory_s);
- }
-
- for (size_t i = 0; i < offset_table.num_tables; i++) {
- memcpy(&retval[offset_current], &(table_data[i].data[0]),
- table_data[i].data.size());
- offset_current += table_data[i].data.size();
-
- const size_t padding_size =
- (4U - table_data[i].data.size()) & 3U;
-
- memset(&retval[offset_current], '\0', padding_size);
- offset_current += padding_size;
- }
-
- if (head_table_exists) {
- // Set checkSumAdjustment in the head table
- *reinterpret_cast<uint32_t *>(&(retval[
- offset_check_sum_adjustment])) =
- 0xb1b0afbaU - otf_check_sum(retval);
- }
-
- return retval;
- }
+ memcpy(table_data[i].tag, table_directory.tag,
+ 4 * sizeof(char));
+ table_data[i].data.resize(table_directory.length);
+ memcpy(&(table_data[i].data[0]),
+ &font_data[table_directory.offset],
+ table_directory.length);
+ }
+
+ size_t size_count;
+
+ size_count = sizeof(struct otf_offset_table_s) +
+ offset_table.num_tables *
+ sizeof(struct otf_table_directory_s);
+ for (size_t i = 0; i < offset_table.num_tables; i++) {
+ size_count += table_data[i].data.size();
+ }
+
+ size_t offset_current = sizeof(struct otf_offset_table_s);
+ size_t offset_check_sum_adjustment = 0;
+ bool head_table_exists = false;
+
+ retval.resize(size_count);
+ memcpy(&retval[0], &font_data[0],
+ sizeof(struct otf_offset_table_s));
+ for (size_t i = 0; i < offset_table.num_tables; i++) {
+ struct otf_table_directory_s table_directory;
+ const bool head_table =
+ strncmp(table_directory.tag, "head", 4) == 0;
+
+ memcpy(table_directory.tag, table_data[i].tag,
+ 4 * sizeof(char));
+ if (head_table) {
+ // Reset checkSumAdjustment in order to calculate the
+ // check sum of the head table
+ offset_check_sum_adjustment = 2 * sizeof(fixed_t);
+ *reinterpret_cast<uint32_t *>(&(table_data[i].data[
+ offset_check_sum_adjustment])) = 0U;
+ // Change the offset for checkSumAdjustment to the
+ // global indexing
+ offset_check_sum_adjustment += offset_current;
+ head_table_exists = true;
+ }
+ table_directory.check_sum =
+ otf_check_sum(table_data[i].data);
+ table_directory.offset = size_count;
+ table_directory.length = table_data[i].data.size();
+
+ memcpy(&retval[offset_current], &table_directory,
+ sizeof(struct otf_table_directory_s));
+ size_count += table_data[i].data.size();
+ offset_current += sizeof(struct otf_table_directory_s);
+ }
+
+ for (size_t i = 0; i < offset_table.num_tables; i++) {
+ memcpy(&retval[offset_current], &(table_data[i].data[0]),
+ table_data[i].data.size());
+ offset_current += table_data[i].data.size();
+
+ const size_t padding_size =
+ (4U - table_data[i].data.size()) & 3U;
+
+ memset(&retval[offset_current], '\0', padding_size);
+ offset_current += padding_size;
+ }
+
+ if (head_table_exists) {
+ // Set checkSumAdjustment in the head table
+ *reinterpret_cast<uint32_t *>(&(retval[
+ offset_check_sum_adjustment])) =
+ 0xb1b0afbaU - otf_check_sum(retval);
+ }
+
+ return retval;
+ }
#endif
-
-}
+
+ }
diff --git a/graf2d/mathtext/src/fontembedps.cxx b/graf2d/mathtext/src/fontembedps.cxx
index 1b726195ad2..c2c43525256 100644
--- a/graf2d/mathtext/src/fontembedps.cxx
+++ b/graf2d/mathtext/src/fontembedps.cxx
@@ -30,8 +30,8 @@
#define LITTLE_ENDIAN 1
#endif // LITTLE_ENDIAN
#include "Byteswap.h"
-#define bswap_16(x) Rbswap_16((x))
-#define bswap_32(x) Rbswap_32((x))
+#define bswap_16(x) Rbswap_16((x))
+#define bswap_32(x) Rbswap_32((x))
#else // R__BYTESWAP
#ifdef LITTLE_ENDIAN
#undef LITTLE_ENDIAN
@@ -59,119 +59,119 @@
namespace mathtext {
- void font_embed_postscript_t::append_asciihex(
- std::string &ascii, const unsigned char *buffer,
- const size_t length)
- {
- const int width = 64;
- int column = 0;
-
- for(size_t i = 0; i < length; i++) {
- char str[3];
-
- snprintf(str, 3, "%02hhX", buffer[i]);
- ascii.append(str, 2);
- column += 2;
- if(column >= width) {
- ascii.append(1, '\n');
- column = 0;
- }
- }
- }
-
- unsigned int font_embed_postscript_t::ascii85_line_count(
- const uint8_t *buffer, const size_t length)
- {
- const unsigned int width = 64;
- unsigned int column = 0;
- unsigned int line = 0;
-
- if (length >= 4) {
- for (size_t i = 0; i < length - 3; i += 4) {
- unsigned int b = reinterpret_cast<
- const unsigned int *>(buffer)[i >> 2];
-
- if (b == 0) {
- column++;
- if (column == width - 1) {
- line++;
- column = 0;
- }
- }
- else {
- if (column + 5 >= width) {
- column += 5 - width;
- line++;
- }
- else {
- column += 5;
- }
- }
- }
- }
- if (column + (length & 3) + 3 >= width) {
- line++;
- }
-
- return line;
- }
-
- void font_embed_postscript_t::append_ascii85(
- std::string &ascii, const uint8_t *buffer,
- const size_t length)
- {
- const int width = 64;
- int column = 0;
-
- if (length >= 4) {
- for (size_t i = 0; i < length - 3; i += 4) {
- unsigned int dword = reinterpret_cast<
- const unsigned int *>(buffer)[i >> 2];
-
- if (dword == 0) {
- ascii.append(1, 'z');
- column++;
- if (column == width - 1) {
- ascii.append(1, '\n');
- column = 0;
- }
- }
- else {
+ void font_embed_postscript_t::append_asciihex(
+ std::string &ascii, const unsigned char *buffer,
+ const size_t length)
+ {
+ const int width = 64;
+ int column = 0;
+
+ for(size_t i = 0; i < length; i++) {
+ char str[3];
+
+ snprintf(str, 3, "%02hhX", buffer[i]);
+ ascii.append(str, 2);
+ column += 2;
+ if(column >= width) {
+ ascii.append(1, '\n');
+ column = 0;
+ }
+ }
+ }
+
+ unsigned int font_embed_postscript_t::ascii85_line_count(
+ const uint8_t *buffer, const size_t length)
+ {
+ const unsigned int width = 64;
+ unsigned int column = 0;
+ unsigned int line = 0;
+
+ if (length >= 4) {
+ for (size_t i = 0; i < length - 3; i += 4) {
+ unsigned int b = reinterpret_cast<
+ const unsigned int *>(buffer)[i >> 2];
+
+ if (b == 0) {
+ column++;
+ if (column == width - 1) {
+ line++;
+ column = 0;
+ }
+ }
+ else {
+ if (column + 5 >= width) {
+ column += 5 - width;
+ line++;
+ }
+ else {
+ column += 5;
+ }
+ }
+ }
+ }
+ if (column + (length & 3) + 3 >= width) {
+ line++;
+ }
+
+ return line;
+ }
+
+ void font_embed_postscript_t::append_ascii85(
+ std::string &ascii, const uint8_t *buffer,
+ const size_t length)
+ {
+ const int width = 64;
+ int column = 0;
+
+ if (length >= 4) {
+ for (size_t i = 0; i < length - 3; i += 4) {
+ unsigned int dword = reinterpret_cast<
+ const unsigned int *>(buffer)[i >> 2];
+
+ if (dword == 0) {
+ ascii.append(1, 'z');
+ column++;
+ if (column == width - 1) {
+ ascii.append(1, '\n');
+ column = 0;
+ }
+ }
+ else {
#ifdef LITTLE_ENDIAN
- dword = bswap_32(dword);
+ dword = bswap_32(dword);
#endif // LITTLE_ENDIAN
- char str[5];
-
- str[4] = static_cast<char>(dword % 85 + '!');
- dword /= 85;
- str[3] = static_cast<char>(dword % 85 + '!');
- dword /= 85;
- str[2] = static_cast<char>(dword % 85 + '!');
- dword /= 85;
- str[1] = static_cast<char>(dword % 85 + '!');
- dword /= 85;
- str[0] = static_cast<char>(dword % 85 + '!');
- for (size_t j = 0; j < 5; j++) {
- ascii.append(1, str[j]);
- column++;
- if(column == width) {
- ascii.append(1, '\n');
- column = 0;
- }
- }
- }
- }
- }
-
- int k = length & 3;
-
- if(k > 0) {
- unsigned int dword = 0;
-
- memcpy(&dword, buffer + (length & ~3), k);
+ char str[5];
+
+ str[4] = static_cast<char>(dword % 85 + '!');
+ dword /= 85;
+ str[3] = static_cast<char>(dword % 85 + '!');
+ dword /= 85;
+ str[2] = static_cast<char>(dword % 85 + '!');
+ dword /= 85;
+ str[1] = static_cast<char>(dword % 85 + '!');
+ dword /= 85;
+ str[0] = static_cast<char>(dword % 85 + '!');
+ for (size_t j = 0; j < 5; j++) {
+ ascii.append(1, str[j]);
+ column++;
+ if(column == width) {
+ ascii.append(1, '\n');
+ column = 0;
+ }
+ }
+ }
+ }
+ }
+
+ int k = length & 3;
+
+ if(k > 0) {
+ unsigned int dword = 0;
+
+ memcpy(&dword, buffer + (length & ~3), k);
#ifdef LITTLE_ENDIAN
- dword = bswap_32(dword);
+ dword = bswap_32(dword);
#endif // LITTLE_ENDIAN
char str[5];
@@ -201,8 +201,8 @@ namespace mathtext {
}
std::string font_embed_postscript_t::font_embed_type_1(
- std::string &font_name,
- const std::vector<unsigned char> &font_data)
+ std::string &font_name,
+ const std::vector<unsigned char> &font_data)
{
// Embed font type 1
@@ -240,197 +240,197 @@ namespace mathtext {
segment_header.always_128 = font_data[offset];
segment_header.type = font_data[offset + 1];
memcpy(&segment_header.length, &font_data[offset + 2],
- sizeof(unsigned int));
+ sizeof(unsigned int));
offset += sizeof(unsigned int) + 2;
#ifdef LITTLE_ENDIAN
- segment_header.length =
- bswap_32(segment_header.length);
+ segment_header.length =
+ bswap_32(segment_header.length);
#endif // LITTLE_ENDIAN
- char *buffer = new char[segment_header.length];
-
- memcpy(buffer, &font_data[offset],
- segment_header.length);
- offset += segment_header.length;
-
- switch(segment_header.type) {
- case TYPE_ASCII:
- // Simple CR -> LF conversion
- for (int i = 0;
- i < (int)(segment_header.length) - 1; i++) {
- if(buffer[i] == '\r' &&
- buffer[i + 1] != '\n') {
- buffer[i] = '\n';
- }
- }
- if (buffer[segment_header.length - 1] == '\r') {
- buffer[segment_header.length - 1] = '\n';
- }
- ret.append(buffer, segment_header.length);
- break;
- case TYPE_BINARY:
- append_asciihex(
- ret, reinterpret_cast<uint8_t *>(buffer),
- segment_header.length);
- break;
- default:
- {}
- }
-
- delete [] buffer;
- }
-
- return ret;
- }
- else if(strncmp(magic_number, "%!", 2) == 0) {
- // Printer font ASCII
- fprintf(stderr, "%s:%d: Printer font ASCII is not "
- "implemented\n", __FILE__, __LINE__);
- return std::string();
- }
-
- return std::string();
- }
-
- std::string font_embed_postscript_t::font_embed_type_2(
- std::string &font_name,
- const std::vector<unsigned char> &font_data)
- {
- // Embed an OpenType CFF (Type 2) file in ASCII85 encoding
- // with the PostScript syntax
-
- unsigned short cid_encoding_id;
- unsigned int cff_offset;
- unsigned int cff_length;
-
- if (!parse_otf_cff_header(font_name, cid_encoding_id,
- cff_offset, cff_length,
- font_data)) {
- return std::string();
- }
-
- std::vector<unsigned char> cff;
-
- cff.resize(cff_length + 10);
- memcpy(&cff[0], "StartData\r", 10);
- memcpy(&cff[10], &font_data[cff_offset], cff_length);
-
- char linebuf[BUFSIZ];
- std::string ret;
-
- snprintf(linebuf, BUFSIZ, "%%%%BeginResource: FontSet (%s)\n",
- font_name.c_str());
- ret.append(linebuf);
- ret.append("%%VMusage: 0 0\n");
- ret.append("/FontSetInit /ProcSet findresource begin\n");
- snprintf(linebuf, BUFSIZ, "%%%%BeginData: %u ASCII Lines\n",
- ascii85_line_count(&cff[0], cff_length) + 2);
- ret.append(linebuf);
- snprintf(linebuf, BUFSIZ,
- "/%s %u currentfile /ASCII85Decode filter cvx exec\n",
- font_name.c_str(), cff_length);
- ret.append(linebuf);
- append_ascii85(ret, &cff[0], cff_length + 10);
- ret.append(1, '\n');
- ret.append("%%EndData\n");
- ret.append("%%EndResource\n");
-
- return ret;
- }
-
- std::string font_embed_postscript_t::font_embed_type_42(
- std::string &font_name,
- const std::vector<unsigned char> &font_data)
- {
- // Embed an TrueType as Type 42 with the PostScript syntax
-
- double font_bbox[4];
- std::map<wchar_t, uint16_t> cid_map;
- std::vector<std::string> char_strings;
-
- if (!parse_ttf_header(font_name, font_bbox, cid_map,
- char_strings, font_data)) {
- fprintf(stderr, "%s:%d:\n", __FILE__, __LINE__);
- return std::string();
- }
-
- char linebuf[BUFSIZ];
- std::string ret;
-
- snprintf(linebuf, BUFSIZ, "%%%%BeginResource: FontSet (%s)\n",
- font_name.c_str());
- ret.append(linebuf);
- ret.append("%%VMusage: 0 0\n");
- ret.append("11 dict begin\n");
- snprintf(linebuf, BUFSIZ, "/FontName /%s def\n",
- font_name.c_str());
- ret.append(linebuf);
- ret.append("/Encoding 256 array\n");
- snprintf(linebuf, BUFSIZ,
- "0 1 255 { 1 index exch /%s put } for\n",
- char_strings[0].c_str());
- ret.append(linebuf);
- for (unsigned int code_point = 0; code_point < 256;
- code_point++) {
- unsigned int glyph_index = cid_map[code_point];
-
- if (char_strings[glyph_index] != ".notdef" &&
- char_strings[glyph_index] != "") {
- snprintf(linebuf, BUFSIZ, "dup %u /%s put\n",
- code_point,
- char_strings[glyph_index].c_str());
- ret.append(linebuf);
- }
- }
- ret.append("readonly def\n");
- ret.append("/PaintType 0 def\n"); // 0 for filled, 2 for stroked
- ret.append("/FontMatrix [1 0 0 1 0 0] def\n");
- snprintf(linebuf, BUFSIZ, "/FontBBox [%f %f %f %f] def\n",
- font_bbox[0], font_bbox[1], font_bbox[2], font_bbox[3]);
- ret.append(linebuf);
- ret.append("/FontType 42 def\n");
- // FIXME: XUID generation using the font data's MD5
- ret.append("/sfnts [\n");
-
- const size_t block_size = 32262;
- size_t offset = 0;
-
- while (offset < font_data.size()) {
- const size_t output_length =
- std::min(block_size, font_data.size() - offset);
-
- ret.append("<\n");
- append_asciihex(ret, &font_data[offset], output_length);
- ret.append(">\n");
- offset += output_length;
- }
- ret.append("] def\n");
-
- unsigned int char_strings_count = 0;
-
- for (std::vector<std::string>::const_iterator iterator =
- char_strings.begin();
- iterator < char_strings.end(); iterator++) {
- if (!iterator->empty()) {
- char_strings_count++;
- }
- }
-
- snprintf(linebuf, BUFSIZ, "/CharStrings %u dict dup begin\n",
- char_strings_count);
- ret.append(linebuf);
- for (unsigned int glyph_index = 0;
- glyph_index < char_strings.size(); glyph_index++) {
- if (!char_strings[glyph_index].empty()) {
- snprintf(linebuf, BUFSIZ, "/%s %u def\n",
- char_strings[glyph_index].c_str(),
- glyph_index);
- ret.append(linebuf);
- }
- }
- ret.append("end readonly def\n");
- ret.append("FontName currentdict end definefont pop\n");
- ret.append("%%EndResource\n");
-
- return ret;
- }
+ char *buffer = new char[segment_header.length];
+
+ memcpy(buffer, &font_data[offset],
+ segment_header.length);
+ offset += segment_header.length;
+
+ switch(segment_header.type) {
+ case TYPE_ASCII:
+ // Simple CR -> LF conversion
+ for (int i = 0;
+ i < (int)(segment_header.length) - 1; i++) {
+ if(buffer[i] == '\r' &&
+ buffer[i + 1] != '\n') {
+ buffer[i] = '\n';
+ }
+ }
+ if (buffer[segment_header.length - 1] == '\r') {
+ buffer[segment_header.length - 1] = '\n';
+ }
+ ret.append(buffer, segment_header.length);
+ break;
+ case TYPE_BINARY:
+ append_asciihex(
+ ret, reinterpret_cast<uint8_t *>(buffer),
+ segment_header.length);
+ break;
+ default:
+ {}
+ }
+
+ delete [] buffer;
+ }
+
+ return ret;
+ }
+ else if(strncmp(magic_number, "%!", 2) == 0) {
+ // Printer font ASCII
+ fprintf(stderr, "%s:%d: Printer font ASCII is not "
+ "implemented\n", __FILE__, __LINE__);
+ return std::string();
+ }
+
+ return std::string();
+ }
+
+ std::string font_embed_postscript_t::font_embed_type_2(
+ std::string &font_name,
+ const std::vector<unsigned char> &font_data)
+ {
+ // Embed an OpenType CFF (Type 2) file in ASCII85 encoding
+ // with the PostScript syntax
+
+ unsigned short cid_encoding_id;
+ unsigned int cff_offset;
+ unsigned int cff_length;
+
+ if (!parse_otf_cff_header(font_name, cid_encoding_id,
+ cff_offset, cff_length,
+ font_data)) {
+ return std::string();
+ }
+
+ std::vector<unsigned char> cff;
+
+ cff.resize(cff_length + 10);
+ memcpy(&cff[0], "StartData\r", 10);
+ memcpy(&cff[10], &font_data[cff_offset], cff_length);
+
+ char linebuf[BUFSIZ];
+ std::string ret;
+
+ snprintf(linebuf, BUFSIZ, "%%%%BeginResource: FontSet (%s)\n",
+ font_name.c_str());
+ ret.append(linebuf);
+ ret.append("%%VMusage: 0 0\n");
+ ret.append("/FontSetInit /ProcSet findresource begin\n");
+ snprintf(linebuf, BUFSIZ, "%%%%BeginData: %u ASCII Lines\n",
+ ascii85_line_count(&cff[0], cff_length) + 2);
+ ret.append(linebuf);
+ snprintf(linebuf, BUFSIZ,
+ "/%s %u currentfile /ASCII85Decode filter cvx exec\n",
+ font_name.c_str(), cff_length);
+ ret.append(linebuf);
+ append_ascii85(ret, &cff[0], cff_length + 10);
+ ret.append(1, '\n');
+ ret.append("%%EndData\n");
+ ret.append("%%EndResource\n");
+
+ return ret;
+ }
+
+ std::string font_embed_postscript_t::font_embed_type_42(
+ std::string &font_name,
+ const std::vector<unsigned char> &font_data)
+ {
+ // Embed an TrueType as Type 42 with the PostScript syntax
+
+ double font_bbox[4];
+ std::map<wchar_t, uint16_t> cid_map;
+ std::vector<std::string> char_strings;
+
+ if (!parse_ttf_header(font_name, font_bbox, cid_map,
+ char_strings, font_data)) {
+ fprintf(stderr, "%s:%d:\n", __FILE__, __LINE__);
+ return std::string();
+ }
+
+ char linebuf[BUFSIZ];
+ std::string ret;
+
+ snprintf(linebuf, BUFSIZ, "%%%%BeginResource: FontSet (%s)\n",
+ font_name.c_str());
+ ret.append(linebuf);
+ ret.append("%%VMusage: 0 0\n");
+ ret.append("11 dict begin\n");
+ snprintf(linebuf, BUFSIZ, "/FontName /%s def\n",
+ font_name.c_str());
+ ret.append(linebuf);
+ ret.append("/Encoding 256 array\n");
+ snprintf(linebuf, BUFSIZ,
+ "0 1 255 { 1 index exch /%s put } for\n",
+ char_strings[0].c_str());
+ ret.append(linebuf);
+ for (unsigned int code_point = 0; code_point < 256;
+ code_point++) {
+ unsigned int glyph_index = cid_map[code_point];
+
+ if (char_strings[glyph_index] != ".notdef" &&
+ char_strings[glyph_index] != "") {
+ snprintf(linebuf, BUFSIZ, "dup %u /%s put\n",
+ code_point,
+ char_strings[glyph_index].c_str());
+ ret.append(linebuf);
+ }
+ }
+ ret.append("readonly def\n");
+ ret.append("/PaintType 0 def\n"); // 0 for filled, 2 for stroked
+ ret.append("/FontMatrix [1 0 0 1 0 0] def\n");
+ snprintf(linebuf, BUFSIZ, "/FontBBox [%f %f %f %f] def\n",
+ font_bbox[0], font_bbox[1], font_bbox[2], font_bbox[3]);
+ ret.append(linebuf);
+ ret.append("/FontType 42 def\n");
+ // FIXME: XUID generation using the font data's MD5
+ ret.append("/sfnts [\n");
+
+ const size_t block_size = 32262;
+ size_t offset = 0;
+
+ while (offset < font_data.size()) {
+ const size_t output_length =
+ std::min(block_size, font_data.size() - offset);
+
+ ret.append("<\n");
+ append_asciihex(ret, &font_data[offset], output_length);
+ ret.append(">\n");
+ offset += output_length;
+ }
+ ret.append("] def\n");
+
+ unsigned int char_strings_count = 0;
+
+ for (std::vector<std::string>::const_iterator iterator =
+ char_strings.begin();
+ iterator < char_strings.end(); iterator++) {
+ if (!iterator->empty()) {
+ char_strings_count++;
+ }
+ }
+
+ snprintf(linebuf, BUFSIZ, "/CharStrings %u dict dup begin\n",
+ char_strings_count);
+ ret.append(linebuf);
+ for (unsigned int glyph_index = 0;
+ glyph_index < char_strings.size(); glyph_index++) {
+ if (!char_strings[glyph_index].empty()) {
+ snprintf(linebuf, BUFSIZ, "/%s %u def\n",
+ char_strings[glyph_index].c_str(),
+ glyph_index);
+ ret.append(linebuf);
+ }
+ }
+ ret.append("end readonly def\n");
+ ret.append("FontName currentdict end definefont pop\n");
+ ret.append("%%EndResource\n");
+
+ return ret;
+ }
}
diff --git a/graf2d/mathtext/src/mathrender.cxx b/graf2d/mathtext/src/mathrender.cxx
index 51d4d181480..d72b9560e90 100644
--- a/graf2d/mathtext/src/mathrender.cxx
+++ b/graf2d/mathtext/src/mathrender.cxx
@@ -32,604 +32,604 @@
namespace mathtext {
- point_t::operator std::string(void) const
- {
- std::stringstream stream;
+ point_t::operator std::string(void) const
+ {
+ std::stringstream stream;
- stream << '(' << _x[0] << ", " << _x[1] << ')';
+ stream << '(' << _x[0] << ", " << _x[1] << ')';
- return stream.str();
- }
+ return stream.str();
+ }
- const affine_transform_t affine_transform_t::identity =
- affine_transform_t(1.0F, 0.0F, 0.0F, 1.0F, 0.0F, 0.0F);
- const affine_transform_t affine_transform_t::flip_y =
- affine_transform_t(1.0F, 0.0F, 0.0F, -1.0F, 0.0F, 0.0F);
+ const affine_transform_t affine_transform_t::identity =
+ affine_transform_t(1.0F, 0.0F, 0.0F, 1.0F, 0.0F, 0.0F);
+ const affine_transform_t affine_transform_t::flip_y =
+ affine_transform_t(1.0F, 0.0F, 0.0F, -1.0F, 0.0F, 0.0F);
- affine_transform_t affine_transform_t::
- translate(const float tx, const float ty)
- {
- return affine_transform_t(1.0F, 0.0F, 0.0F, 1.0F, tx, ty);
- }
+ affine_transform_t affine_transform_t::
+ translate(const float tx, const float ty)
+ {
+ return affine_transform_t(1.0F, 0.0F, 0.0F, 1.0F, tx, ty);
+ }
- affine_transform_t affine_transform_t::
- scale(const float sx, const float sy)
- {
- return affine_transform_t(sx, 0.0F, 0.0F, sy, 0.0F, 0.0F);
- }
+ affine_transform_t affine_transform_t::
+ scale(const float sx, const float sy)
+ {
+ return affine_transform_t(sx, 0.0F, 0.0F, sy, 0.0F, 0.0F);
+ }
- affine_transform_t affine_transform_t::rotate(const float angle)
- {
- float sin_angle;
- float cos_angle;
+ affine_transform_t affine_transform_t::rotate(const float angle)
+ {
+ float sin_angle;
+ float cos_angle;
- sin_angle = sin(angle);
- cos_angle = cos(angle);
+ sin_angle = sin(angle);
+ cos_angle = cos(angle);
- return affine_transform_t(cos_angle, sin_angle,
- -sin_angle, cos_angle, 0, 0);
- }
+ return affine_transform_t(cos_angle, sin_angle,
+ -sin_angle, cos_angle, 0, 0);
+ }
- affine_transform_t::operator std::string(void) const
- {
- std::stringstream stream;
+ affine_transform_t::operator std::string(void) const
+ {
+ std::stringstream stream;
- stream << '(' << _a[0] << ", " << _a[1] << ", 0)" << std::endl;
- stream << '(' << _a[2] << ", " << _a[3] << ", 0)" << std::endl;
- stream << '(' << _a[4] << ", " << _a[5] << ", 1)";
+ stream << '(' << _a[0] << ", " << _a[1] << ", 0)" << std::endl;
+ stream << '(' << _a[2] << ", " << _a[3] << ", 0)" << std::endl;
+ stream << '(' << _a[4] << ", " << _a[5] << ", 1)";
- return stream.str();
- }
+ return stream.str();
+ }
#ifdef __INTEL_COMPILER
#pragma warning(push)
#pragma warning(disable: 869)
#endif // __INTEL_COMPILER
- bool math_text_renderer_t::is_cyrillic(const wchar_t c)
- {
- return c >= L'\u0400' && c <= L'\u052f';
- }
-
- bool math_text_renderer_t::is_cjk(const wchar_t c)
- {
- return
- // Acceleration when most characters are below the CJK
- // Radicals Supplement
- c >= L'\u2e80' &&
- (// CJK Radicals Supplement ... Yi Radicals
- (/* c >= L'\u2e80' && */ c <= L'\ua4cf') ||
- // Modifier Tone Letters
- (c >= L'\ua700' && c <= L'\ua71f') ||
- // Hangul Syllables
- (c >= L'\uac00' && c <= L'\ud7af') ||
- // CJK Compatibility Ideographs
- (c >= L'\uf900' && c <= L'\ufaff') ||
- // Vertical Forms
- (c >= L'\ufe10' && c <= L'\ufe1f') ||
- // CJK Compatibility Forms
- (c >= L'\ufe30' && c <= L'\ufe4f') ||
- // Halfwidth and Fullwidth Forms
- (c >= L'\uff00' && c <= L'\uffef') ||
- // CJK Unified Ideographs, Extension B
- (c >= L'\U00020000' && c <= L'\U0002a6df') ||
- // CJK Unified Ideographs, Extension C
- (c >= L'\U0002a700' && c <= L'\U0002b73f') ||
- // CJK Compatibility Ideographs
- (c >= L'\U0002f800' && c <= L'\U0002fa1f'));
- }
+ bool math_text_renderer_t::is_cyrillic(const wchar_t c)
+ {
+ return c >= L'\u0400' && c <= L'\u052f';
+ }
+
+ bool math_text_renderer_t::is_cjk(const wchar_t c)
+ {
+ return
+ // Acceleration when most characters are below the CJK
+ // Radicals Supplement
+ c >= L'\u2e80' &&
+ (// CJK Radicals Supplement ... Yi Radicals
+ (/* c >= L'\u2e80' && */ c <= L'\ua4cf') ||
+ // Modifier Tone Letters
+ (c >= L'\ua700' && c <= L'\ua71f') ||
+ // Hangul Syllables
+ (c >= L'\uac00' && c <= L'\ud7af') ||
+ // CJK Compatibility Ideographs
+ (c >= L'\uf900' && c <= L'\ufaff') ||
+ // Vertical Forms
+ (c >= L'\ufe10' && c <= L'\ufe1f') ||
+ // CJK Compatibility Forms
+ (c >= L'\ufe30' && c <= L'\ufe4f') ||
+ // Halfwidth and Fullwidth Forms
+ (c >= L'\uff00' && c <= L'\uffef') ||
+ // CJK Unified Ideographs, Extension B
+ (c >= L'\U00020000' && c <= L'\U0002a6df') ||
+ // CJK Unified Ideographs, Extension C
+ (c >= L'\U0002a700' && c <= L'\U0002b73f') ||
+ // CJK Compatibility Ideographs
+ (c >= L'\U0002f800' && c <= L'\U0002fa1f'));
+ }
#if 0
- bool math_text_renderer_t::is_wgl_4(const wchar_t c)
- {
- return true;
- }
+ bool math_text_renderer_t::is_wgl_4(const wchar_t c)
+ {
+ return true;
+ }
#endif
- // @see http://www.w3.org/International/questions/qa-scripts
- // @see http://www.unicode.org/reports/tr9/tr9-21.html
- bool math_text_renderer_t::is_right_to_left(const wchar_t c)
- {
- return
- (// Hebrew ... N'Ko
- (c >= L'\u0590' && c <= L'\u07ff') ||
- // Tifinagh
- (c >= L'\u2d30' && c <= L'\u2d7f') ||
- // Hebrew Presentation Forms ... Arabic Presentation
- // Forms A
- (c >= L'\ufb1d' && c <= L'\ufdff') ||
- // Arabic Presentation Forms B
- (c >= L'\ufb1d' && c <= L'\ufb4f'));
- }
+ // @see http://www.w3.org/International/questions/qa-scripts
+ // @see http://www.unicode.org/reports/tr9/tr9-21.html
+ bool math_text_renderer_t::is_right_to_left(const wchar_t c)
+ {
+ return
+ (// Hebrew ... N'Ko
+ (c >= L'\u0590' && c <= L'\u07ff') ||
+ // Tifinagh
+ (c >= L'\u2d30' && c <= L'\u2d7f') ||
+ // Hebrew Presentation Forms ... Arabic Presentation
+ // Forms A
+ (c >= L'\ufb1d' && c <= L'\ufdff') ||
+ // Arabic Presentation Forms B
+ (c >= L'\ufb1d' && c <= L'\ufb4f'));
+ }
#if 0
- bool math_text_renderer_t::is_cjk_punctuation_open(const wchar_t c)
- {
- return false;
- }
-
- bool math_text_renderer_t::is_cjk_punctuation_closed(const wchar_t c)
- {
- return false;
- }
+ bool math_text_renderer_t::is_cjk_punctuation_open(const wchar_t c)
+ {
+ return false;
+ }
+
+ bool math_text_renderer_t::is_cjk_punctuation_closed(const wchar_t c)
+ {
+ return false;
+ }
#endif
- bounding_box_t math_text_renderer_t::
- math_bounding_box(const math_text_t::box_t &box,
- const unsigned int style)
- {
- set_font_size(style_size(style), FAMILY_REGULAR);
-
- const bounding_box_t box_bounding_box =
- bounding_box(box._string, FAMILY_REGULAR);
-
- reset_font_size(FAMILY_REGULAR);
-
- return box_bounding_box;
- }
-
- void math_text_renderer_t::
- math_text(const point_t origin,
- const math_text_t::box_t &box,
- const unsigned int style,
- const bool render_structure)
- {
- if (render_structure) {
- // Nothing
- }
- set_font_size(style_size(style), FAMILY_REGULAR);
- text_raw(origin[0], origin[1], box._string, FAMILY_REGULAR);
- reset_font_size(FAMILY_REGULAR);
- }
+ bounding_box_t math_text_renderer_t::
+ math_bounding_box(const math_text_t::box_t &box,
+ const unsigned int style)
+ {
+ set_font_size(style_size(style), FAMILY_REGULAR);
+
+ const bounding_box_t box_bounding_box =
+ bounding_box(box._string, FAMILY_REGULAR);
+
+ reset_font_size(FAMILY_REGULAR);
+
+ return box_bounding_box;
+ }
+
+ void math_text_renderer_t::
+ math_text(const point_t origin,
+ const math_text_t::box_t &box,
+ const unsigned int style,
+ const bool render_structure)
+ {
+ if (render_structure) {
+ // Nothing
+ }
+ set_font_size(style_size(style), FAMILY_REGULAR);
+ text_raw(origin[0], origin[1], box._string, FAMILY_REGULAR);
+ reset_font_size(FAMILY_REGULAR);
+ }
#ifdef __INTEL_COMPILER
#pragma warning(pop)
#endif // __INTEL_COMPILER
- bounding_box_t math_text_renderer_t::
- math_bounding_box(const wchar_t &glyph,
- const unsigned int family, const float size)
- {
- set_font_size(size, family);
-
- const std::wstring string = std::wstring(1, glyph);
- const bounding_box_t math_symbol_bounding_box =
- bounding_box(string, family);
-
- reset_font_size(family);
-
- return math_symbol_bounding_box;
- }
-
- void math_text_renderer_t::
- math_text(const point_t origin, const wchar_t &glyph,
- const unsigned int family, const float size,
- const bool render_structure)
- {
- set_font_size(size, family);
-
- const std::wstring string = std::wstring(1, glyph);
-
- if(render_structure) {
- text_with_bounding_box(origin[0], origin[1], string,
- family);
- }
- else {
- text_raw(origin[0], origin[1], string, family);
- }
- reset_font_size(family);
- }
-
- bounding_box_t math_text_renderer_t::
- math_bounding_box(const math_text_t::math_symbol_t &math_symbol,
- const unsigned int style)
- {
- const unsigned int family = math_family(math_symbol);
- const float size = style_size(style);
-
- return math_bounding_box(math_symbol._glyph, family, size);
- }
-
- void math_text_renderer_t::
- math_text(const point_t origin,
- const math_text_t::math_symbol_t &math_symbol,
- const unsigned int style,
- const bool render_structure)
- {
- const unsigned int family = math_family(math_symbol);
- const float size = style_size(style);
-
- math_text(origin, math_symbol._glyph, family, size,
- render_structure);
- }
-
- bounding_box_t math_text_renderer_t::
- math_bounding_box(const math_text_t::math_symbol_t &math_symbol,
- const unsigned int style, const float height)
- {
- std::vector<math_token_t> token =
- math_tokenize(math_symbol, style, height);
-
- if(token.empty())
- return bounding_box_t(0, 0, 0, 0, 0, 0);
-
- std::vector<math_token_t>::const_iterator iterator =
- token.begin();
- bounding_box_t ret = iterator->_offset +
- iterator->_bounding_box;
-
- for(; iterator != token.end(); iterator++)
- ret = ret.merge(iterator->_offset +
- iterator->_bounding_box);
-
- return ret;
- }
-
- void math_text_renderer_t::
- math_text(const point_t origin,
- const math_text_t::math_symbol_t &math_symbol,
- const unsigned int style, const float height,
- const bool render_structure)
- {
- std::vector<math_token_t> token =
- math_tokenize(math_symbol, style, height);
-
- for(std::vector<math_token_t>::const_iterator iterator =
- token.begin();
- iterator != token.end(); iterator++)
- math_text(origin +
- transform_pixel_to_logical().linear() *
- iterator->_offset,
- iterator->_extensible._glyph,
- iterator->_extensible._family,
- iterator->_extensible._size, render_structure);
- }
-
- /////////////////////////////////////////////////////////////////
-
- // A field can be a math symbol or a math list
- bounding_box_t math_text_renderer_t::
- math_bounding_box(const std::vector<math_text_t::item_t>::
- const_iterator &math_list_begin,
- const std::vector<math_text_t::item_t>::
- const_iterator &math_list_end,
- unsigned int style)
- {
- std::vector<math_token_t> token =
- math_tokenize(math_list_begin, math_list_end, style);
-
- if(token.empty())
- return bounding_box_t(0, 0, 0, 0, 0, 0);
-
- std::vector<math_token_t>::const_iterator iterator =
- token.begin();
- bounding_box_t ret = iterator->_offset +
- iterator->_bounding_box;
-
- for(; iterator != token.end(); iterator++)
- ret = ret.merge(iterator->_offset +
- iterator->_bounding_box);
-
- return ret;
- }
-
- void math_text_renderer_t::
- math_text(const point_t origin,
- const std::vector<math_text_t::item_t>::
- const_iterator &math_list_begin,
- const std::vector<math_text_t::item_t>::
- const_iterator &math_list_end,
- const unsigned int style,
- const bool render_structure)
- {
- if(render_structure) {
- point(origin[0], origin[1]);
- rectangle(origin +
- math_bounding_box(math_list_begin,
- math_list_end, style));
- }
-
- std::vector<math_text_t::item_t>::const_iterator
- math_list_begin_interior = math_list_begin;
- std::vector<math_text_t::item_t>::const_iterator
- math_list_end_interior = math_list_end;
- bool delimiter = false;
-
- if(math_list_begin->_type ==
- math_text_t::item_t::TYPE_BOUNDARY &&
- (math_list_end - 1)->_type ==
- math_text_t::item_t::TYPE_BOUNDARY) {
- math_list_begin_interior++;
- math_list_end_interior--;
- delimiter = true;
- }
-
- std::vector<math_token_t> token =
- math_tokenize(math_list_begin, math_list_end, style);
- std::vector<math_token_t>::const_iterator token_iterator =
- token.begin();
-
- if(delimiter) {
- math_text(origin +
- transform_pixel_to_logical().linear() *
- token_iterator->_offset,
- math_list_begin->_atom._nucleus._math_symbol,
- style, token_iterator->_delimiter_height,
- render_structure);
- token_iterator++;
- }
-
- static const math_text_t::item_t fraction_item =
- math_text_t::item_t::TYPE_GENERALIZED_FRACTION;
- const std::vector<math_text_t::item_t>::const_iterator
- fraction_iterator =
- std::find(math_list_begin_interior,
- math_list_end_interior, fraction_item);
-
- if(fraction_iterator != math_list_end_interior) {
- const float thickness = fraction_iterator->_length *
- default_rule_thickness * style_size(style);
-
- math_text(origin +
- transform_pixel_to_logical().linear() *
- token_iterator->_offset,
- fraction_iterator + 1, math_list_end_interior,
- token_iterator->_style,
- render_structure);
- token_iterator++;
- if(thickness > 0) {
- filled_rectangle(
- origin +
- transform_pixel_to_logical().linear() *
- (token_iterator->_offset +
- token_iterator->_bounding_box));
- token_iterator++;
- }
- math_text(origin +
- transform_pixel_to_logical().linear() *
- token_iterator->_offset,
- math_list_begin_interior, fraction_iterator,
- token_iterator->_style,
- render_structure);
- token_iterator++;
- }
- else
- // Incrementally process a math list
- for(std::vector<math_text_t::item_t>::const_iterator
- iterator = math_list_begin_interior;
- iterator != math_list_end_interior; iterator++) {
- switch(iterator->_type) {
- case math_text_t::item_t::TYPE_ATOM:
- if(render_structure)
- rectangle(origin +
- transform_pixel_to_logical().linear() *
- (token_iterator->_offset +
- token_iterator->_bounding_box));
- math_text(origin +
- transform_pixel_to_logical().linear() *
- token_iterator->_offset,
- iterator->_atom,
- token_iterator->_style,
- render_structure);
- token_iterator++;
- break;
- }
- // math_text_t::item_t::TYPE_KERN can be ignored
- }
-
- if(delimiter)
- math_text(origin +
- transform_pixel_to_logical().linear() *
- token_iterator->_offset,
- (math_list_end - 1)->
- _atom._nucleus._math_symbol,
- token_iterator->_style,
- token_iterator->_delimiter_height,
- render_structure);
- }
-
- bounding_box_t math_text_renderer_t::
- math_bounding_box(const math_text_t::field_t &field,
- const unsigned int style)
- {
- switch(field._type) {
- case math_text_t::field_t::TYPE_MATH_SYMBOL:
- return math_bounding_box(field._math_symbol, style);
- break;
- case math_text_t::field_t::TYPE_BOX:
- return math_bounding_box(field._box, style);
- break;
- case math_text_t::field_t::TYPE_MATH_LIST:
- return math_bounding_box(field._math_list.begin(),
- field._math_list.end(), style);
- break;
- default:
- return bounding_box_t(0, 0, 0, 0, 0, 0);
- }
- }
-
- void math_text_renderer_t::
- math_text(const point_t origin,
- const math_text_t::field_t &field,
- const unsigned int style, const bool render_structure)
- {
- switch(field._type) {
- case math_text_t::field_t::TYPE_MATH_SYMBOL:
- math_text(origin, field._math_symbol, style,
- render_structure);
- break;
- case math_text_t::field_t::TYPE_BOX:
- math_text(origin, field._box, style, render_structure);
- break;
- case math_text_t::field_t::TYPE_MATH_LIST:
- math_text(origin, field._math_list.begin(),
- field._math_list.end(), style,
- render_structure);
- break;
- }
- }
-
- // TeX algorithm for (three-way) atoms:
- //
- // See Knuth, The TeXbook (1986), pp. 445f.
- bounding_box_t math_text_renderer_t::
- math_bounding_box(const math_text_t::atom_t &atom,
- const unsigned int style)
- {
- std::vector<math_token_t> token =
- math_tokenize(atom, style);
-
- if(token.empty())
- return bounding_box_t(0, 0, 0, 0, 0, 0);
-
- std::vector<math_token_t>::const_iterator iterator =
- token.begin();
- bounding_box_t ret = iterator->_offset +
- iterator->_bounding_box;
-
- for(; iterator != token.end(); iterator++)
- ret = ret.merge(iterator->_offset +
- iterator->_bounding_box);
-
- return ret;
- }
-
- void math_text_renderer_t::
- math_text(const point_t origin,
- const math_text_t::atom_t &atom,
- const unsigned int style,
- const bool render_structure)
- {
- const float x = origin[0];
- const float y = origin[1];
-
- if(render_structure) {
- point(x, y);
- rectangle(point_t(x, y) +
- math_bounding_box(atom, style));
- }
-
- std::vector<math_token_t> token =
- math_tokenize(atom, style);
- std::vector<math_token_t>::const_iterator token_iterator =
- token.begin();
-
- bounding_box_t nucleus_bounding_box;
-
- // Rule 11
- if(atom._type == math_text_t::atom_t::TYPE_RAD) {
- if(!atom._index.empty()) {
- math_text(origin +
- transform_pixel_to_logical().linear() *
- token_iterator->_offset,
- atom._index, token_iterator->_style,
- render_structure);
- token_iterator++;
- }
-
- const math_text_t::math_symbol_t
- symbol_surd("\\surd", style);
-
- // Surd
- math_text(origin +
- transform_pixel_to_logical().linear() *
- token_iterator->_offset,
- symbol_surd, token_iterator->_style,
- token_iterator->_delimiter_height,
- render_structure);
- token_iterator++;
- // Rule with clearance
- filled_rectangle(
- origin + transform_pixel_to_logical().linear() *
- (token_iterator->_offset +
- token_iterator->_bounding_box));
- // Skip the clearance token, too
- token_iterator += 2;
- }
- if(atom._type == math_text_t::atom_t::TYPE_OP &&
- atom._nucleus._type ==
- math_text_t::field_t::TYPE_MATH_SYMBOL)
- math_text(origin +
- transform_pixel_to_logical().linear() *
- token_iterator->_offset,
- atom._nucleus._math_symbol._glyph,
- FAMILY_STIX_REGULAR,
- style_size(style) * if_else_display(style,
- large_operator_display_scale, 1.0F),
- render_structure);
- else
- math_text(origin +
- transform_pixel_to_logical().linear() *
- token_iterator->_offset,
- atom._nucleus, token_iterator->_style,
- render_structure);
-
- if(atom._superscript.empty() && atom._subscript.empty())
- return;
-
- token_iterator++;
-
- if(atom._superscript.empty()) {
- math_text(origin +
- transform_pixel_to_logical().linear() *
- token_iterator->_offset,
- atom._subscript, token_iterator->_style,
- render_structure);
- return;
- }
- if(atom._subscript.empty()) {
- math_text(origin +
- transform_pixel_to_logical().linear() *
- token_iterator->_offset,
- atom._superscript, token_iterator->_style,
- render_structure);
- return;
- }
- math_text(origin + transform_pixel_to_logical().linear() *
- token_iterator->_offset,
- atom._superscript, token_iterator->_style,
- render_structure);
- token_iterator++;
- math_text(origin + transform_pixel_to_logical().linear() *
- token_iterator->_offset,
- atom._subscript, token_iterator->_style,
- render_structure);
- }
-
- bounding_box_t math_text_renderer_t::
- bounding_box(const math_text_t &textbb, const bool display_style)
- {
- if(!textbb.well_formed())
- bounding_box(L"*** invalid: " + textbb.code());
-
- const unsigned int initial_style = display_style ?
- math_text_t::item_t::STYLE_DISPLAY :
- math_text_t::item_t::STYLE_TEXT;
-
- return math_bounding_box(textbb._math_list._math_list,
- initial_style);
- }
-
- void math_text_renderer_t::
- text(const float x, const float y, const math_text_t &texti,
- const bool display_style)
- {
- if(!texti.well_formed()) {
- text_raw(x, y, L"*** invalid: " + texti.code());
- }
-
- const unsigned int initial_style = display_style ?
- math_text_t::item_t::STYLE_DISPLAY :
- math_text_t::item_t::STYLE_TEXT;
-
- if(texti._render_structure) {
- point(x, y);
- rectangle(point_t(x, y) + math_bounding_box(
- texti._math_list._math_list, initial_style));
- }
- math_text(point_t(x, y), texti._math_list._math_list,
- initial_style, texti._render_structure);
- }
-
+ bounding_box_t math_text_renderer_t::
+ math_bounding_box(const wchar_t &glyph,
+ const unsigned int family, const float size)
+ {
+ set_font_size(size, family);
+
+ const std::wstring string = std::wstring(1, glyph);
+ const bounding_box_t math_symbol_bounding_box =
+ bounding_box(string, family);
+
+ reset_font_size(family);
+
+ return math_symbol_bounding_box;
+ }
+
+ void math_text_renderer_t::
+ math_text(const point_t origin, const wchar_t &glyph,
+ const unsigned int family, const float size,
+ const bool render_structure)
+ {
+ set_font_size(size, family);
+
+ const std::wstring string = std::wstring(1, glyph);
+
+ if(render_structure) {
+ text_with_bounding_box(origin[0], origin[1], string,
+ family);
+ }
+ else {
+ text_raw(origin[0], origin[1], string, family);
+ }
+ reset_font_size(family);
+ }
+
+ bounding_box_t math_text_renderer_t::
+ math_bounding_box(const math_text_t::math_symbol_t &math_symbol,
+ const unsigned int style)
+ {
+ const unsigned int family = math_family(math_symbol);
+ const float size = style_size(style);
+
+ return math_bounding_box(math_symbol._glyph, family, size);
+ }
+
+ void math_text_renderer_t::
+ math_text(const point_t origin,
+ const math_text_t::math_symbol_t &math_symbol,
+ const unsigned int style,
+ const bool render_structure)
+ {
+ const unsigned int family = math_family(math_symbol);
+ const float size = style_size(style);
+
+ math_text(origin, math_symbol._glyph, family, size,
+ render_structure);
+ }
+
+ bounding_box_t math_text_renderer_t::
+ math_bounding_box(const math_text_t::math_symbol_t &math_symbol,
+ const unsigned int style, const float height)
+ {
+ std::vector<math_token_t> token =
+ math_tokenize(math_symbol, style, height);
+
+ if(token.empty())
+ return bounding_box_t(0, 0, 0, 0, 0, 0);
+
+ std::vector<math_token_t>::const_iterator iterator =
+ token.begin();
+ bounding_box_t ret = iterator->_offset +
+ iterator->_bounding_box;
+
+ for(; iterator != token.end(); iterator++)
+ ret = ret.merge(iterator->_offset +
+ iterator->_bounding_box);
+
+ return ret;
+ }
+
+ void math_text_renderer_t::
+ math_text(const point_t origin,
+ const math_text_t::math_symbol_t &math_symbol,
+ const unsigned int style, const float height,
+ const bool render_structure)
+ {
+ std::vector<math_token_t> token =
+ math_tokenize(math_symbol, style, height);
+
+ for(std::vector<math_token_t>::const_iterator iterator =
+ token.begin();
+ iterator != token.end(); iterator++)
+ math_text(origin +
+ transform_pixel_to_logical().linear() *
+ iterator->_offset,
+ iterator->_extensible._glyph,
+ iterator->_extensible._family,
+ iterator->_extensible._size, render_structure);
+ }
+
+ /////////////////////////////////////////////////////////////////
+
+ // A field can be a math symbol or a math list
+ bounding_box_t math_text_renderer_t::
+ math_bounding_box(const std::vector<math_text_t::item_t>::
+ const_iterator &math_list_begin,
+ const std::vector<math_text_t::item_t>::
+ const_iterator &math_list_end,
+ unsigned int style)
+ {
+ std::vector<math_token_t> token =
+ math_tokenize(math_list_begin, math_list_end, style);
+
+ if(token.empty())
+ return bounding_box_t(0, 0, 0, 0, 0, 0);
+
+ std::vector<math_token_t>::const_iterator iterator =
+ token.begin();
+ bounding_box_t ret = iterator->_offset +
+ iterator->_bounding_box;
+
+ for(; iterator != token.end(); iterator++)
+ ret = ret.merge(iterator->_offset +
+ iterator->_bounding_box);
+
+ return ret;
+ }
+
+ void math_text_renderer_t::
+ math_text(const point_t origin,
+ const std::vector<math_text_t::item_t>::
+ const_iterator &math_list_begin,
+ const std::vector<math_text_t::item_t>::
+ const_iterator &math_list_end,
+ const unsigned int style,
+ const bool render_structure)
+ {
+ if(render_structure) {
+ point(origin[0], origin[1]);
+ rectangle(origin +
+ math_bounding_box(math_list_begin,
+ math_list_end, style));
+ }
+
+ std::vector<math_text_t::item_t>::const_iterator
+ math_list_begin_interior = math_list_begin;
+ std::vector<math_text_t::item_t>::const_iterator
+ math_list_end_interior = math_list_end;
+ bool delimiter = false;
+
+ if(math_list_begin->_type ==
+ math_text_t::item_t::TYPE_BOUNDARY &&
+ (math_list_end - 1)->_type ==
+ math_text_t::item_t::TYPE_BOUNDARY) {
+ math_list_begin_interior++;
+ math_list_end_interior--;
+ delimiter = true;
+ }
+
+ std::vector<math_token_t> token =
+ math_tokenize(math_list_begin, math_list_end, style);
+ std::vector<math_token_t>::const_iterator token_iterator =
+ token.begin();
+
+ if(delimiter) {
+ math_text(origin +
+ transform_pixel_to_logical().linear() *
+ token_iterator->_offset,
+ math_list_begin->_atom._nucleus._math_symbol,
+ style, token_iterator->_delimiter_height,
+ render_structure);
+ token_iterator++;
+ }
+
+ static const math_text_t::item_t fraction_item =
+ math_text_t::item_t::TYPE_GENERALIZED_FRACTION;
+ const std::vector<math_text_t::item_t>::const_iterator
+ fraction_iterator =
+ std::find(math_list_begin_interior,
+ math_list_end_interior, fraction_item);
+
+ if(fraction_iterator != math_list_end_interior) {
+ const float thickness = fraction_iterator->_length *
+ default_rule_thickness * style_size(style);
+
+ math_text(origin +
+ transform_pixel_to_logical().linear() *
+ token_iterator->_offset,
+ fraction_iterator + 1, math_list_end_interior,
+ token_iterator->_style,
+ render_structure);
+ token_iterator++;
+ if(thickness > 0) {
+ filled_rectangle(
+ origin +
+ transform_pixel_to_logical().linear() *
+ (token_iterator->_offset +
+ token_iterator->_bounding_box));
+ token_iterator++;
+ }
+ math_text(origin +
+ transform_pixel_to_logical().linear() *
+ token_iterator->_offset,
+ math_list_begin_interior, fraction_iterator,
+ token_iterator->_style,
+ render_structure);
+ token_iterator++;
+ }
+ else
+ // Incrementally process a math list
+ for(std::vector<math_text_t::item_t>::const_iterator
+ iterator = math_list_begin_interior;
+ iterator != math_list_end_interior; iterator++) {
+ switch(iterator->_type) {
+ case math_text_t::item_t::TYPE_ATOM:
+ if(render_structure)
+ rectangle(origin +
+ transform_pixel_to_logical().linear() *
+ (token_iterator->_offset +
+ token_iterator->_bounding_box));
+ math_text(origin +
+ transform_pixel_to_logical().linear() *
+ token_iterator->_offset,
+ iterator->_atom,
+ token_iterator->_style,
+ render_structure);
+ token_iterator++;
+ break;
+ }
+ // math_text_t::item_t::TYPE_KERN can be ignored
+ }
+
+ if(delimiter)
+ math_text(origin +
+ transform_pixel_to_logical().linear() *
+ token_iterator->_offset,
+ (math_list_end - 1)->
+ _atom._nucleus._math_symbol,
+ token_iterator->_style,
+ token_iterator->_delimiter_height,
+ render_structure);
+ }
+
+ bounding_box_t math_text_renderer_t::
+ math_bounding_box(const math_text_t::field_t &field,
+ const unsigned int style)
+ {
+ switch(field._type) {
+ case math_text_t::field_t::TYPE_MATH_SYMBOL:
+ return math_bounding_box(field._math_symbol, style);
+ break;
+ case math_text_t::field_t::TYPE_BOX:
+ return math_bounding_box(field._box, style);
+ break;
+ case math_text_t::field_t::TYPE_MATH_LIST:
+ return math_bounding_box(field._math_list.begin(),
+ field._math_list.end(), style);
+ break;
+ default:
+ return bounding_box_t(0, 0, 0, 0, 0, 0);
+ }
+ }
+
+ void math_text_renderer_t::
+ math_text(const point_t origin,
+ const math_text_t::field_t &field,
+ const unsigned int style, const bool render_structure)
+ {
+ switch(field._type) {
+ case math_text_t::field_t::TYPE_MATH_SYMBOL:
+ math_text(origin, field._math_symbol, style,
+ render_structure);
+ break;
+ case math_text_t::field_t::TYPE_BOX:
+ math_text(origin, field._box, style, render_structure);
+ break;
+ case math_text_t::field_t::TYPE_MATH_LIST:
+ math_text(origin, field._math_list.begin(),
+ field._math_list.end(), style,
+ render_structure);
+ break;
+ }
+ }
+
+ // TeX algorithm for (three-way) atoms:
+ //
+ // See Knuth, The TeXbook (1986), pp. 445f.
+ bounding_box_t math_text_renderer_t::
+ math_bounding_box(const math_text_t::atom_t &atom,
+ const unsigned int style)
+ {
+ std::vector<math_token_t> token =
+ math_tokenize(atom, style);
+
+ if(token.empty())
+ return bounding_box_t(0, 0, 0, 0, 0, 0);
+
+ std::vector<math_token_t>::const_iterator iterator =
+ token.begin();
+ bounding_box_t ret = iterator->_offset +
+ iterator->_bounding_box;
+
+ for(; iterator != token.end(); iterator++)
+ ret = ret.merge(iterator->_offset +
+ iterator->_bounding_box);
+
+ return ret;
+ }
+
+ void math_text_renderer_t::
+ math_text(const point_t origin,
+ const math_text_t::atom_t &atom,
+ const unsigned int style,
+ const bool render_structure)
+ {
+ const float x = origin[0];
+ const float y = origin[1];
+
+ if(render_structure) {
+ point(x, y);
+ rectangle(point_t(x, y) +
+ math_bounding_box(atom, style));
+ }
+
+ std::vector<math_token_t> token =
+ math_tokenize(atom, style);
+ std::vector<math_token_t>::const_iterator token_iterator =
+ token.begin();
+
+ bounding_box_t nucleus_bounding_box;
+
+ // Rule 11
+ if(atom._type == math_text_t::atom_t::TYPE_RAD) {
+ if(!atom._index.empty()) {
+ math_text(origin +
+ transform_pixel_to_logical().linear() *
+ token_iterator->_offset,
+ atom._index, token_iterator->_style,
+ render_structure);
+ token_iterator++;
+ }
+
+ const math_text_t::math_symbol_t
+ symbol_surd("\\surd", style);
+
+ // Surd
+ math_text(origin +
+ transform_pixel_to_logical().linear() *
+ token_iterator->_offset,
+ symbol_surd, token_iterator->_style,
+ token_iterator->_delimiter_height,
+ render_structure);
+ token_iterator++;
+ // Rule with clearance
+ filled_rectangle(
+ origin + transform_pixel_to_logical().linear() *
+ (token_iterator->_offset +
+ token_iterator->_bounding_box));
+ // Skip the clearance token, too
+ token_iterator += 2;
+ }
+ if(atom._type == math_text_t::atom_t::TYPE_OP &&
+ atom._nucleus._type ==
+ math_text_t::field_t::TYPE_MATH_SYMBOL)
+ math_text(origin +
+ transform_pixel_to_logical().linear() *
+ token_iterator->_offset,
+ atom._nucleus._math_symbol._glyph,
+ FAMILY_STIX_REGULAR,
+ style_size(style) * if_else_display(style,
+ large_operator_display_scale, 1.0F),
+ render_structure);
+ else
+ math_text(origin +
+ transform_pixel_to_logical().linear() *
+ token_iterator->_offset,
+ atom._nucleus, token_iterator->_style,
+ render_structure);
+
+ if(atom._superscript.empty() && atom._subscript.empty())
+ return;
+
+ token_iterator++;
+
+ if(atom._superscript.empty()) {
+ math_text(origin +
+ transform_pixel_to_logical().linear() *
+ token_iterator->_offset,
+ atom._subscript, token_iterator->_style,
+ render_structure);
+ return;
+ }
+ if(atom._subscript.empty()) {
+ math_text(origin +
+ transform_pixel_to_logical().linear() *
+ token_iterator->_offset,
+ atom._superscript, token_iterator->_style,
+ render_structure);
+ return;
+ }
+ math_text(origin + transform_pixel_to_logical().linear() *
+ token_iterator->_offset,
+ atom._superscript, token_iterator->_style,
+ render_structure);
+ token_iterator++;
+ math_text(origin + transform_pixel_to_logical().linear() *
+ token_iterator->_offset,
+ atom._subscript, token_iterator->_style,
+ render_structure);
+ }
+
+ bounding_box_t math_text_renderer_t::
+ bounding_box(const math_text_t &textbb, const bool display_style)
+ {
+ if(!textbb.well_formed())
+ bounding_box(L"*** invalid: " + textbb.code());
+
+ const unsigned int initial_style = display_style ?
+ math_text_t::item_t::STYLE_DISPLAY :
+ math_text_t::item_t::STYLE_TEXT;
+
+ return math_bounding_box(textbb._math_list._math_list,
+ initial_style);
+ }
+
+ void math_text_renderer_t::
+ text(const float x, const float y, const math_text_t &texti,
+ const bool display_style)
+ {
+ if(!texti.well_formed()) {
+ text_raw(x, y, L"*** invalid: " + texti.code());
+ }
+
+ const unsigned int initial_style = display_style ?
+ math_text_t::item_t::STYLE_DISPLAY :
+ math_text_t::item_t::STYLE_TEXT;
+
+ if(texti._render_structure) {
+ point(x, y);
+ rectangle(point_t(x, y) + math_bounding_box(
+ texti._math_list._math_list, initial_style));
+ }
+ math_text(point_t(x, y), texti._math_list._math_list,
+ initial_style, texti._render_structure);
+ }
+
}
#ifdef WIN32
#pragma warning( pop )
diff --git a/graf2d/mathtext/src/mathrenderstyle.cxx b/graf2d/mathtext/src/mathrenderstyle.cxx
index eef893e9030..f0356b09897 100644
--- a/graf2d/mathtext/src/mathrenderstyle.cxx
+++ b/graf2d/mathtext/src/mathrenderstyle.cxx
@@ -24,452 +24,452 @@
namespace mathtext {
- /////////////////////////////////////////////////////////////////
-
- float math_text_renderer_t::
- style_size(const unsigned int style) const
- {
- // Intel C++ Compiler 10.1 chokes on this if declared static
- // const and using -O1:
- const float size[math_text_t::item_t::NSTYLE - 1] = {
- script_script_ratio, script_script_ratio,
- script_ratio, script_ratio, 1.0F, 1.0F, 1.0F, 1.0F
- };
-
- if(style == math_text_t::item_t::STYLE_UNKNOWN ||
- style >= math_text_t::item_t::NSTYLE)
- return font_size();
-
- return size[style - 1] * font_size();
- }
-
- bool math_text_renderer_t::
- is_display_style(const unsigned int style) const
- {
- switch(style) {
- case math_text_t::item_t::STYLE_DISPLAY:
- case math_text_t::item_t::STYLE_DISPLAY_PRIME:
- return true;
- default:
- return false;
- }
- }
-
- bool math_text_renderer_t::
- is_script_style(const unsigned int style) const
- {
- switch(style) {
- case math_text_t::item_t::STYLE_SCRIPT:
- case math_text_t::item_t::STYLE_SCRIPT_PRIME:
- case math_text_t::item_t::STYLE_SCRIPT_SCRIPT:
- case math_text_t::item_t::STYLE_SCRIPT_SCRIPT_PRIME:
- return true;
- default:
- return false;
- }
- }
-
- unsigned int math_text_renderer_t::
- prime_style(const unsigned int style) const
- {
- switch(style) {
- case math_text_t::item_t::STYLE_DISPLAY:
- return math_text_t::item_t::STYLE_DISPLAY_PRIME;
- case math_text_t::item_t::STYLE_TEXT:
- return math_text_t::item_t::STYLE_TEXT_PRIME;
- case math_text_t::item_t::STYLE_SCRIPT:
- return math_text_t::item_t::STYLE_SCRIPT_PRIME;
- case math_text_t::item_t::STYLE_SCRIPT_SCRIPT:
- return math_text_t::item_t::STYLE_SCRIPT_SCRIPT_PRIME;
- default:
- return style;
- }
- }
-
- bool math_text_renderer_t::
- is_prime_style(const unsigned int style) const
- {
- switch(style) {
- case math_text_t::item_t::STYLE_DISPLAY_PRIME:
- case math_text_t::item_t::STYLE_TEXT_PRIME:
- case math_text_t::item_t::STYLE_SCRIPT_PRIME:
- case math_text_t::item_t::STYLE_SCRIPT_SCRIPT_PRIME:
- return true;
- default:
- return false;
- }
- }
-
- // Knuth, The TeXbook (1986), p. 441
-
- unsigned int math_text_renderer_t::
- next_superscript_style(const unsigned int style) const
- {
- switch(style) {
- case math_text_t::item_t::STYLE_DISPLAY:
- case math_text_t::item_t::STYLE_TEXT:
- return math_text_t::item_t::STYLE_SCRIPT;
- case math_text_t::item_t::STYLE_DISPLAY_PRIME:
- case math_text_t::item_t::STYLE_TEXT_PRIME:
- return math_text_t::item_t::STYLE_SCRIPT_PRIME;
- case math_text_t::item_t::STYLE_SCRIPT:
- case math_text_t::item_t::STYLE_SCRIPT_SCRIPT:
- return math_text_t::item_t::STYLE_SCRIPT_SCRIPT;
- case math_text_t::item_t::STYLE_SCRIPT_PRIME:
- case math_text_t::item_t::STYLE_SCRIPT_SCRIPT_PRIME:
- return math_text_t::item_t::STYLE_SCRIPT_SCRIPT_PRIME;
- default:
- return style;
- }
- }
-
- unsigned int math_text_renderer_t::
- next_subscript_style(const unsigned int style) const
- {
- return prime_style(next_superscript_style(style));
- }
-
- unsigned int math_text_renderer_t::
- next_numerator_style(const unsigned int style) const
- {
- switch(style) {
- case math_text_t::item_t::STYLE_DISPLAY:
- return math_text_t::item_t::STYLE_TEXT;
- case math_text_t::item_t::STYLE_DISPLAY_PRIME:
- return math_text_t::item_t::STYLE_TEXT_PRIME;
- default:
- return next_superscript_style(style);
- }
- }
-
- unsigned int math_text_renderer_t::
- next_denominator_style(const unsigned int style) const
- {
- return if_else_display(
- style,
- static_cast<unsigned int>(
- math_text_t::item_t::STYLE_TEXT_PRIME),
- next_subscript_style(style));
- }
-
- // The most elementary building block is the math symbol
- float math_text_renderer_t::x_height(const unsigned int style)
- {
- const unsigned int family = FAMILY_ITALIC;
- const float size = style_size(style);
-
- set_font_size(size, family);
-
- bounding_box_t math_symbol_bounding_box =
- bounding_box(L"x", family);
-
- reset_font_size(family);
-
- return math_symbol_bounding_box.ascent();
- }
-
- float math_text_renderer_t::quad(const unsigned int style)
- const
- {
- const float size = style_size(style);
-
- return size;
- }
-
- void math_text_renderer_t::
- post_process_atom_type_initial(unsigned int &atom_type) const
- {
- // Rule 5, initial atom
- if(atom_type == math_text_t::atom_t::TYPE_BIN)
- atom_type = math_text_t::atom_t::TYPE_ORD;
- }
-
- void math_text_renderer_t::
- post_process_atom_type_interior(unsigned int &
- previous_atom_type,
- unsigned int &atom_type) const
- {
- // Rule 5, interior/final atom
- if(atom_type == math_text_t::atom_t::TYPE_BIN)
- switch(previous_atom_type) {
- case math_text_t::atom_t::TYPE_BIN:
- case math_text_t::atom_t::TYPE_OP:
- case math_text_t::atom_t::TYPE_REL:
- case math_text_t::atom_t::TYPE_OPEN:
- case math_text_t::atom_t::TYPE_PUNCT:
- atom_type = math_text_t::atom_t::TYPE_ORD;
- break;
- }
- // Rule 6
- else if(previous_atom_type == math_text_t::atom_t::TYPE_BIN)
- switch(atom_type) {
- case math_text_t::atom_t::TYPE_REL:
- case math_text_t::atom_t::TYPE_CLOSE:
- case math_text_t::atom_t::TYPE_PUNCT:
- previous_atom_type = math_text_t::atom_t::TYPE_ORD;
- break;
- }
- }
-
- bool math_text_renderer_t::
- valid_accent(bool &vertical_alignment,
- const std::vector<math_text_t::item_t>::
- const_iterator &iterator,
- const std::vector<math_text_t::item_t>::
- const_iterator &math_list_end)
- const
- {
- if(iterator->_atom._type == math_text_t::atom_t::TYPE_ACC) {
- std::vector<math_text_t::item_t>::const_iterator
- iterator_next = iterator + 1;
-
- vertical_alignment = true;
- return iterator_next != math_list_end &&
- iterator_next->_type ==
- math_text_t::item_t::TYPE_ATOM;
- }
- else if(iterator->_atom.is_combining_diacritical()) {
- std::vector<math_text_t::item_t>::const_iterator
- iterator_next = iterator + 1;
-
- vertical_alignment = false;
- return iterator_next != math_list_end &&
- iterator_next->_type ==
- math_text_t::item_t::TYPE_ATOM;
- }
- else
- return false;
- }
-
- float math_text_renderer_t::kerning_mu(const float amount) const
- {
- // Rule 2
- return amount / 18.0F * font_size();
- }
-
- float math_text_renderer_t::
- math_spacing(unsigned int left_type, unsigned int right_type,
- unsigned int style) const
- {
- const unsigned int left_type_modified =
- left_type <= (unsigned int) math_text_t::atom_t::TYPE_INNER ?
- left_type : (unsigned int) math_text_t::atom_t::TYPE_ORD;
- const unsigned int right_type_modified =
- right_type <= (unsigned int) math_text_t::atom_t::TYPE_INNER ?
- right_type : (unsigned int) math_text_t::atom_t::TYPE_ORD;
- const unsigned int space = math_text_t::atom_t::
- spacing(left_type_modified, right_type_modified,
- is_script_style(style));
- float mu_skip;
-
- switch(space) {
- case 1: mu_skip = thin_mu_skip; break;
- case 2: mu_skip = med_mu_skip; break;
- case 3: mu_skip = thick_mu_skip; break;
- default: mu_skip = 0.0F;
- }
-
- return kerning_mu(mu_skip);
- }
-
- unsigned int math_text_renderer_t::
- math_family(const math_text_t::math_symbol_t &math_symbol) const
- {
- // Use the text font for Latin, Greek, Cyrillic and the minus
- // sign, and STIX for everything else.
- if(math_symbol._glyph <= L'\u017e' ||
- (math_symbol._glyph >= L'\u0384' &&
- math_symbol._glyph <= L'\u03ce') ||
- (math_symbol._glyph >= L'\u0400' &&
- math_symbol._glyph <= L'\u052f') ||
- math_symbol._glyph == L'\u2212') {
- return math_symbol._family;
- }
- else {
- switch(math_symbol._family) {
- case FAMILY_REGULAR:
- return FAMILY_STIX_REGULAR;
- case FAMILY_ITALIC:
- return FAMILY_STIX_ITALIC;
- case FAMILY_BOLD:
- return FAMILY_STIX_BOLD;
- case FAMILY_BOLD_ITALIC:
- return FAMILY_STIX_BOLD_ITALIC;
- case FAMILY_STIX_REGULAR:
- case FAMILY_STIX_ITALIC:
- case FAMILY_STIX_BOLD:
- case FAMILY_STIX_BOLD_ITALIC:
- case FAMILY_STIX_SIZE_1_REGULAR:
- case FAMILY_STIX_SIZE_1_BOLD:
- case FAMILY_STIX_SIZE_2_REGULAR:
- case FAMILY_STIX_SIZE_2_BOLD:
- case FAMILY_STIX_SIZE_3_REGULAR:
- case FAMILY_STIX_SIZE_3_BOLD:
- case FAMILY_STIX_SIZE_4_REGULAR:
- case FAMILY_STIX_SIZE_4_BOLD:
- case FAMILY_STIX_SIZE_5_REGULAR:
- return math_symbol._family;
- default:
- return FAMILY_STIX_REGULAR;
- }
- }
- }
-
- void math_text_renderer_t::
- large_family(unsigned long &nfamily, const unsigned int *&family,
- const math_text_t::math_symbol_t &math_symbol) const
- {
- static const unsigned long nlarge_family = 5;
- static const unsigned int
- large_family_regular[nlarge_family] = {
- FAMILY_STIX_REGULAR,
- FAMILY_STIX_SIZE_1_REGULAR,
- FAMILY_STIX_SIZE_2_REGULAR,
- FAMILY_STIX_SIZE_3_REGULAR,
- FAMILY_STIX_SIZE_4_REGULAR,
- };
- static const unsigned int
- large_family_bold[nlarge_family] = {
- FAMILY_STIX_BOLD,
- FAMILY_STIX_SIZE_1_BOLD,
- FAMILY_STIX_SIZE_2_BOLD,
- FAMILY_STIX_SIZE_3_BOLD,
- FAMILY_STIX_SIZE_4_BOLD,
- };
-
- nfamily = nlarge_family;
- family = math_symbol.bold() ?
- large_family_bold : large_family_regular;
- }
-
- void math_text_renderer_t::
- extensible_glyph(wchar_t glyph[4], unsigned long &nrepeat,
- const math_text_t::math_symbol_t &math_symbol,
- const unsigned int style, const float height)
- {
- // See Knuth, The METAFONTbook (1986), p. 318
- enum {
- GLYPH_TOP = 0,
- GLYPH_MIDDLE,
- GLYPH_BOTTOM,
- GLYPH_REPEATABLE,
- NGLYPH
- };
-
- switch(math_symbol._glyph) {
- case L'(':
- glyph[GLYPH_TOP] = L'\u239b';
- glyph[GLYPH_MIDDLE] = L'\0';
- glyph[GLYPH_BOTTOM] = L'\u239d';
- glyph[GLYPH_REPEATABLE] = L'\u239c';
- break;
- case L')':
- glyph[GLYPH_TOP] = L'\u239e';
- glyph[GLYPH_MIDDLE] = L'\0';
- glyph[GLYPH_BOTTOM] = L'\u23a0';
- glyph[GLYPH_REPEATABLE] = L'\u239f';
- break;
- case L'[':
- glyph[GLYPH_TOP] = L'\u23a1';
- glyph[GLYPH_MIDDLE] = L'\0';
- glyph[GLYPH_BOTTOM] = L'\u23a3';
- glyph[GLYPH_REPEATABLE] = L'\u23a2';
- break;
- case L']':
- glyph[GLYPH_TOP] = L'\u23a4';
- glyph[GLYPH_MIDDLE] = L'\0';
- glyph[GLYPH_BOTTOM] = L'\u23a6';
- glyph[GLYPH_REPEATABLE] = L'\u23a5';
- break;
- case L'{':
- glyph[GLYPH_TOP] = L'\u23a7';
- glyph[GLYPH_MIDDLE] = L'\u23a8';
- glyph[GLYPH_BOTTOM] = L'\u23a9';
- glyph[GLYPH_REPEATABLE] = L'\u23aa';
- break;
- case L'|':
- glyph[GLYPH_TOP] = math_symbol._glyph;
- glyph[GLYPH_MIDDLE] = L'\0';
- glyph[GLYPH_BOTTOM] = math_symbol._glyph;
- glyph[GLYPH_REPEATABLE] = math_symbol._glyph;
- break;
- case L'}':
- glyph[GLYPH_TOP] = L'\u23ab';
- glyph[GLYPH_MIDDLE] = L'\u23ac';
- glyph[GLYPH_BOTTOM] = L'\u23ad';
- glyph[GLYPH_REPEATABLE] = L'\u23aa';
- break;
+ /////////////////////////////////////////////////////////////////
+
+ float math_text_renderer_t::
+ style_size(const unsigned int style) const
+ {
+ // Intel C++ Compiler 10.1 chokes on this if declared static
+ // const and using -O1:
+ const float size[math_text_t::item_t::NSTYLE - 1] = {
+ script_script_ratio, script_script_ratio,
+ script_ratio, script_ratio, 1.0F, 1.0F, 1.0F, 1.0F
+ };
+
+ if(style == math_text_t::item_t::STYLE_UNKNOWN ||
+ style >= math_text_t::item_t::NSTYLE)
+ return font_size();
+
+ return size[style - 1] * font_size();
+ }
+
+ bool math_text_renderer_t::
+ is_display_style(const unsigned int style) const
+ {
+ switch(style) {
+ case math_text_t::item_t::STYLE_DISPLAY:
+ case math_text_t::item_t::STYLE_DISPLAY_PRIME:
+ return true;
+ default:
+ return false;
+ }
+ }
+
+ bool math_text_renderer_t::
+ is_script_style(const unsigned int style) const
+ {
+ switch(style) {
+ case math_text_t::item_t::STYLE_SCRIPT:
+ case math_text_t::item_t::STYLE_SCRIPT_PRIME:
+ case math_text_t::item_t::STYLE_SCRIPT_SCRIPT:
+ case math_text_t::item_t::STYLE_SCRIPT_SCRIPT_PRIME:
+ return true;
+ default:
+ return false;
+ }
+ }
+
+ unsigned int math_text_renderer_t::
+ prime_style(const unsigned int style) const
+ {
+ switch(style) {
+ case math_text_t::item_t::STYLE_DISPLAY:
+ return math_text_t::item_t::STYLE_DISPLAY_PRIME;
+ case math_text_t::item_t::STYLE_TEXT:
+ return math_text_t::item_t::STYLE_TEXT_PRIME;
+ case math_text_t::item_t::STYLE_SCRIPT:
+ return math_text_t::item_t::STYLE_SCRIPT_PRIME;
+ case math_text_t::item_t::STYLE_SCRIPT_SCRIPT:
+ return math_text_t::item_t::STYLE_SCRIPT_SCRIPT_PRIME;
+ default:
+ return style;
+ }
+ }
+
+ bool math_text_renderer_t::
+ is_prime_style(const unsigned int style) const
+ {
+ switch(style) {
+ case math_text_t::item_t::STYLE_DISPLAY_PRIME:
+ case math_text_t::item_t::STYLE_TEXT_PRIME:
+ case math_text_t::item_t::STYLE_SCRIPT_PRIME:
+ case math_text_t::item_t::STYLE_SCRIPT_SCRIPT_PRIME:
+ return true;
+ default:
+ return false;
+ }
+ }
+
+ // Knuth, The TeXbook (1986), p. 441
+
+ unsigned int math_text_renderer_t::
+ next_superscript_style(const unsigned int style) const
+ {
+ switch(style) {
+ case math_text_t::item_t::STYLE_DISPLAY:
+ case math_text_t::item_t::STYLE_TEXT:
+ return math_text_t::item_t::STYLE_SCRIPT;
+ case math_text_t::item_t::STYLE_DISPLAY_PRIME:
+ case math_text_t::item_t::STYLE_TEXT_PRIME:
+ return math_text_t::item_t::STYLE_SCRIPT_PRIME;
+ case math_text_t::item_t::STYLE_SCRIPT:
+ case math_text_t::item_t::STYLE_SCRIPT_SCRIPT:
+ return math_text_t::item_t::STYLE_SCRIPT_SCRIPT;
+ case math_text_t::item_t::STYLE_SCRIPT_PRIME:
+ case math_text_t::item_t::STYLE_SCRIPT_SCRIPT_PRIME:
+ return math_text_t::item_t::STYLE_SCRIPT_SCRIPT_PRIME;
+ default:
+ return style;
+ }
+ }
+
+ unsigned int math_text_renderer_t::
+ next_subscript_style(const unsigned int style) const
+ {
+ return prime_style(next_superscript_style(style));
+ }
+
+ unsigned int math_text_renderer_t::
+ next_numerator_style(const unsigned int style) const
+ {
+ switch(style) {
+ case math_text_t::item_t::STYLE_DISPLAY:
+ return math_text_t::item_t::STYLE_TEXT;
+ case math_text_t::item_t::STYLE_DISPLAY_PRIME:
+ return math_text_t::item_t::STYLE_TEXT_PRIME;
+ default:
+ return next_superscript_style(style);
+ }
+ }
+
+ unsigned int math_text_renderer_t::
+ next_denominator_style(const unsigned int style) const
+ {
+ return if_else_display(
+ style,
+ static_cast<unsigned int>(
+ math_text_t::item_t::STYLE_TEXT_PRIME),
+ next_subscript_style(style));
+ }
+
+ // The most elementary building block is the math symbol
+ float math_text_renderer_t::x_height(const unsigned int style)
+ {
+ const unsigned int family = FAMILY_ITALIC;
+ const float size = style_size(style);
+
+ set_font_size(size, family);
+
+ bounding_box_t math_symbol_bounding_box =
+ bounding_box(L"x", family);
+
+ reset_font_size(family);
+
+ return math_symbol_bounding_box.ascent();
+ }
+
+ float math_text_renderer_t::quad(const unsigned int style)
+ const
+ {
+ const float size = style_size(style);
+
+ return size;
+ }
+
+ void math_text_renderer_t::
+ post_process_atom_type_initial(unsigned int &atom_type) const
+ {
+ // Rule 5, initial atom
+ if(atom_type == math_text_t::atom_t::TYPE_BIN)
+ atom_type = math_text_t::atom_t::TYPE_ORD;
+ }
+
+ void math_text_renderer_t::
+ post_process_atom_type_interior(unsigned int &
+ previous_atom_type,
+ unsigned int &atom_type) const
+ {
+ // Rule 5, interior/final atom
+ if(atom_type == math_text_t::atom_t::TYPE_BIN)
+ switch(previous_atom_type) {
+ case math_text_t::atom_t::TYPE_BIN:
+ case math_text_t::atom_t::TYPE_OP:
+ case math_text_t::atom_t::TYPE_REL:
+ case math_text_t::atom_t::TYPE_OPEN:
+ case math_text_t::atom_t::TYPE_PUNCT:
+ atom_type = math_text_t::atom_t::TYPE_ORD;
+ break;
+ }
+ // Rule 6
+ else if(previous_atom_type == math_text_t::atom_t::TYPE_BIN)
+ switch(atom_type) {
+ case math_text_t::atom_t::TYPE_REL:
+ case math_text_t::atom_t::TYPE_CLOSE:
+ case math_text_t::atom_t::TYPE_PUNCT:
+ previous_atom_type = math_text_t::atom_t::TYPE_ORD;
+ break;
+ }
+ }
+
+ bool math_text_renderer_t::
+ valid_accent(bool &vertical_alignment,
+ const std::vector<math_text_t::item_t>::
+ const_iterator &iterator,
+ const std::vector<math_text_t::item_t>::
+ const_iterator &math_list_end)
+ const
+ {
+ if(iterator->_atom._type == math_text_t::atom_t::TYPE_ACC) {
+ std::vector<math_text_t::item_t>::const_iterator
+ iterator_next = iterator + 1;
+
+ vertical_alignment = true;
+ return iterator_next != math_list_end &&
+ iterator_next->_type ==
+ math_text_t::item_t::TYPE_ATOM;
+ }
+ else if(iterator->_atom.is_combining_diacritical()) {
+ std::vector<math_text_t::item_t>::const_iterator
+ iterator_next = iterator + 1;
+
+ vertical_alignment = false;
+ return iterator_next != math_list_end &&
+ iterator_next->_type ==
+ math_text_t::item_t::TYPE_ATOM;
+ }
+ else
+ return false;
+ }
+
+ float math_text_renderer_t::kerning_mu(const float amount) const
+ {
+ // Rule 2
+ return amount / 18.0F * font_size();
+ }
+
+ float math_text_renderer_t::
+ math_spacing(unsigned int left_type, unsigned int right_type,
+ unsigned int style) const
+ {
+ const unsigned int left_type_modified =
+ left_type <= (unsigned int) math_text_t::atom_t::TYPE_INNER ?
+ left_type : (unsigned int) math_text_t::atom_t::TYPE_ORD;
+ const unsigned int right_type_modified =
+ right_type <= (unsigned int) math_text_t::atom_t::TYPE_INNER ?
+ right_type : (unsigned int) math_text_t::atom_t::TYPE_ORD;
+ const unsigned int space = math_text_t::atom_t::
+ spacing(left_type_modified, right_type_modified,
+ is_script_style(style));
+ float mu_skip;
+
+ switch(space) {
+ case 1: mu_skip = thin_mu_skip; break;
+ case 2: mu_skip = med_mu_skip; break;
+ case 3: mu_skip = thick_mu_skip; break;
+ default: mu_skip = 0.0F;
+ }
+
+ return kerning_mu(mu_skip);
+ }
+
+ unsigned int math_text_renderer_t::
+ math_family(const math_text_t::math_symbol_t &math_symbol) const
+ {
+ // Use the text font for Latin, Greek, Cyrillic and the minus
+ // sign, and STIX for everything else.
+ if(math_symbol._glyph <= L'\u017e' ||
+ (math_symbol._glyph >= L'\u0384' &&
+ math_symbol._glyph <= L'\u03ce') ||
+ (math_symbol._glyph >= L'\u0400' &&
+ math_symbol._glyph <= L'\u052f') ||
+ math_symbol._glyph == L'\u2212') {
+ return math_symbol._family;
+ }
+ else {
+ switch(math_symbol._family) {
+ case FAMILY_REGULAR:
+ return FAMILY_STIX_REGULAR;
+ case FAMILY_ITALIC:
+ return FAMILY_STIX_ITALIC;
+ case FAMILY_BOLD:
+ return FAMILY_STIX_BOLD;
+ case FAMILY_BOLD_ITALIC:
+ return FAMILY_STIX_BOLD_ITALIC;
+ case FAMILY_STIX_REGULAR:
+ case FAMILY_STIX_ITALIC:
+ case FAMILY_STIX_BOLD:
+ case FAMILY_STIX_BOLD_ITALIC:
+ case FAMILY_STIX_SIZE_1_REGULAR:
+ case FAMILY_STIX_SIZE_1_BOLD:
+ case FAMILY_STIX_SIZE_2_REGULAR:
+ case FAMILY_STIX_SIZE_2_BOLD:
+ case FAMILY_STIX_SIZE_3_REGULAR:
+ case FAMILY_STIX_SIZE_3_BOLD:
+ case FAMILY_STIX_SIZE_4_REGULAR:
+ case FAMILY_STIX_SIZE_4_BOLD:
+ case FAMILY_STIX_SIZE_5_REGULAR:
+ return math_symbol._family;
+ default:
+ return FAMILY_STIX_REGULAR;
+ }
+ }
+ }
+
+ void math_text_renderer_t::
+ large_family(unsigned long &nfamily, const unsigned int *&family,
+ const math_text_t::math_symbol_t &math_symbol) const
+ {
+ static const unsigned long nlarge_family = 5;
+ static const unsigned int
+ large_family_regular[nlarge_family] = {
+ FAMILY_STIX_REGULAR,
+ FAMILY_STIX_SIZE_1_REGULAR,
+ FAMILY_STIX_SIZE_2_REGULAR,
+ FAMILY_STIX_SIZE_3_REGULAR,
+ FAMILY_STIX_SIZE_4_REGULAR,
+ };
+ static const unsigned int
+ large_family_bold[nlarge_family] = {
+ FAMILY_STIX_BOLD,
+ FAMILY_STIX_SIZE_1_BOLD,
+ FAMILY_STIX_SIZE_2_BOLD,
+ FAMILY_STIX_SIZE_3_BOLD,
+ FAMILY_STIX_SIZE_4_BOLD,
+ };
+
+ nfamily = nlarge_family;
+ family = math_symbol.bold() ?
+ large_family_bold : large_family_regular;
+ }
+
+ void math_text_renderer_t::
+ extensible_glyph(wchar_t glyph[4], unsigned long &nrepeat,
+ const math_text_t::math_symbol_t &math_symbol,
+ const unsigned int style, const float height)
+ {
+ // See Knuth, The METAFONTbook (1986), p. 318
+ enum {
+ GLYPH_TOP = 0,
+ GLYPH_MIDDLE,
+ GLYPH_BOTTOM,
+ GLYPH_REPEATABLE,
+ NGLYPH
+ };
+
+ switch(math_symbol._glyph) {
+ case L'(':
+ glyph[GLYPH_TOP] = L'\u239b';
+ glyph[GLYPH_MIDDLE] = L'\0';
+ glyph[GLYPH_BOTTOM] = L'\u239d';
+ glyph[GLYPH_REPEATABLE] = L'\u239c';
+ break;
+ case L')':
+ glyph[GLYPH_TOP] = L'\u239e';
+ glyph[GLYPH_MIDDLE] = L'\0';
+ glyph[GLYPH_BOTTOM] = L'\u23a0';
+ glyph[GLYPH_REPEATABLE] = L'\u239f';
+ break;
+ case L'[':
+ glyph[GLYPH_TOP] = L'\u23a1';
+ glyph[GLYPH_MIDDLE] = L'\0';
+ glyph[GLYPH_BOTTOM] = L'\u23a3';
+ glyph[GLYPH_REPEATABLE] = L'\u23a2';
+ break;
+ case L']':
+ glyph[GLYPH_TOP] = L'\u23a4';
+ glyph[GLYPH_MIDDLE] = L'\0';
+ glyph[GLYPH_BOTTOM] = L'\u23a6';
+ glyph[GLYPH_REPEATABLE] = L'\u23a5';
+ break;
+ case L'{':
+ glyph[GLYPH_TOP] = L'\u23a7';
+ glyph[GLYPH_MIDDLE] = L'\u23a8';
+ glyph[GLYPH_BOTTOM] = L'\u23a9';
+ glyph[GLYPH_REPEATABLE] = L'\u23aa';
+ break;
+ case L'|':
+ glyph[GLYPH_TOP] = math_symbol._glyph;
+ glyph[GLYPH_MIDDLE] = L'\0';
+ glyph[GLYPH_BOTTOM] = math_symbol._glyph;
+ glyph[GLYPH_REPEATABLE] = math_symbol._glyph;
+ break;
+ case L'}':
+ glyph[GLYPH_TOP] = L'\u23ab';
+ glyph[GLYPH_MIDDLE] = L'\u23ac';
+ glyph[GLYPH_BOTTOM] = L'\u23ad';
+ glyph[GLYPH_REPEATABLE] = L'\u23aa';
+ break;
#if 0
- // FIXME: \lmoustache, \rmoustache, \radical require
- // horizontal offsets
- case L'\u211a': // \lmoustache
- glyph[GLYPH_TOP] = L'\0';
- glyph[GLYPH_MIDDLE] = L'\0';
- glyph[GLYPH_BOTTOM] = L'\u23b7';
- glyph[GLYPH_REPEATABLE] = L'\u23b9';
- break;
- case L'\u23b0': // \rmoustache
- glyph[GLYPH_TOP] = L'\u239b';
- glyph[GLYPH_MIDDLE] = L'\0';
- glyph[GLYPH_BOTTOM] = L'\u23a0';
- glyph[GLYPH_REPEATABLE] = L'\u239c';
- break;
- case L'\u23b1': // \radical
- glyph[GLYPH_TOP] = L'\u239e';
- glyph[GLYPH_MIDDLE] = L'\0';
- glyph[GLYPH_BOTTOM] = L'\u239d';
- glyph[GLYPH_REPEATABLE] = L'\u239f';
- break;
+ // FIXME: \lmoustache, \rmoustache, \radical require
+ // horizontal offsets
+ case L'\u211a': // \lmoustache
+ glyph[GLYPH_TOP] = L'\0';
+ glyph[GLYPH_MIDDLE] = L'\0';
+ glyph[GLYPH_BOTTOM] = L'\u23b7';
+ glyph[GLYPH_REPEATABLE] = L'\u23b9';
+ break;
+ case L'\u23b0': // \rmoustache
+ glyph[GLYPH_TOP] = L'\u239b';
+ glyph[GLYPH_MIDDLE] = L'\0';
+ glyph[GLYPH_BOTTOM] = L'\u23a0';
+ glyph[GLYPH_REPEATABLE] = L'\u239c';
+ break;
+ case L'\u23b1': // \radical
+ glyph[GLYPH_TOP] = L'\u239e';
+ glyph[GLYPH_MIDDLE] = L'\0';
+ glyph[GLYPH_BOTTOM] = L'\u239d';
+ glyph[GLYPH_REPEATABLE] = L'\u239f';
+ break;
#endif
- default:
- glyph[GLYPH_TOP] = L'\0';
- glyph[GLYPH_MIDDLE] = L'\0';
- glyph[GLYPH_BOTTOM] = L'\0';
- glyph[GLYPH_REPEATABLE] = L'\0';
- }
-
- const unsigned int family = math_symbol._glyph == L'|' ?
- FAMILY_STIX_REGULAR : FAMILY_STIX_SIZE_1_REGULAR;
- const float size = style_size(style);
-
- if(glyph[GLYPH_REPEATABLE] != L'\0') {
- bounding_box_t bounding_box_sum(0, 0, 0, 0, 0, 0);
- float current_y = 0;
-
- for(unsigned long i = GLYPH_TOP; i <= GLYPH_BOTTOM;
- i++) {
- if(glyph[i] != L'\0') {
- bounding_box_t glyph_bounding_box =
- math_bounding_box(glyph[i], family, size);
-
- current_y += glyph_bounding_box.descent();
- bounding_box_sum = bounding_box_sum.
- merge(point_t(0, current_y) +
- glyph_bounding_box);
- current_y += glyph_bounding_box.ascent();
- }
- }
-
- const bounding_box_t bounding_box_repeatable =
- math_bounding_box(glyph[GLYPH_REPEATABLE], family,
- size);
- const float remaining_height =
- height - bounding_box_sum.height();
+ default:
+ glyph[GLYPH_TOP] = L'\0';
+ glyph[GLYPH_MIDDLE] = L'\0';
+ glyph[GLYPH_BOTTOM] = L'\0';
+ glyph[GLYPH_REPEATABLE] = L'\0';
+ }
+
+ const unsigned int family = math_symbol._glyph == L'|' ?
+ FAMILY_STIX_REGULAR : FAMILY_STIX_SIZE_1_REGULAR;
+ const float size = style_size(style);
+
+ if(glyph[GLYPH_REPEATABLE] != L'\0') {
+ bounding_box_t bounding_box_sum(0, 0, 0, 0, 0, 0);
+ float current_y = 0;
+
+ for(unsigned long i = GLYPH_TOP; i <= GLYPH_BOTTOM;
+ i++) {
+ if(glyph[i] != L'\0') {
+ bounding_box_t glyph_bounding_box =
+ math_bounding_box(glyph[i], family, size);
+
+ current_y += glyph_bounding_box.descent();
+ bounding_box_sum = bounding_box_sum.
+ merge(point_t(0, current_y) +
+ glyph_bounding_box);
+ current_y += glyph_bounding_box.ascent();
+ }
+ }
+
+ const bounding_box_t bounding_box_repeatable =
+ math_bounding_box(glyph[GLYPH_REPEATABLE], family,
+ size);
+ const float remaining_height =
+ height - bounding_box_sum.height();
unsigned long repeat_ratio = 0;
if (bounding_box_repeatable.height() !=0) {
- repeat_ratio =
- (unsigned long)ceil(
- remaining_height /
- bounding_box_repeatable.height());
+ repeat_ratio =
+ (unsigned long)ceil(
+ remaining_height /
+ bounding_box_repeatable.height());
}
- nrepeat = glyph[GLYPH_MIDDLE] == L'\0' ?
- repeat_ratio : ((repeat_ratio + 1UL) >> 1);
- }
- else
- nrepeat = 0;
- }
-
- // Font parameters
+ nrepeat = glyph[GLYPH_MIDDLE] == L'\0' ?
+ repeat_ratio : ((repeat_ratio + 1UL) >> 1);
+ }
+ else
+ nrepeat = 0;
+ }
+
+ // Font parameters
#include "table/mathfontparam.h"
-
+
}
diff --git a/graf2d/mathtext/src/mathrendertoken.cxx b/graf2d/mathtext/src/mathrendertoken.cxx
index 553d09e9925..166377c6add 100644
--- a/graf2d/mathtext/src/mathrendertoken.cxx
+++ b/graf2d/mathtext/src/mathrendertoken.cxx
@@ -24,876 +24,876 @@
namespace mathtext {
- /////////////////////////////////////////////////////////////////
- // Math List Tokenization
-
- std::vector<math_text_renderer_t::math_token_t>
- math_text_renderer_t::
- math_tokenize(const math_text_t::math_symbol_t &math_symbol,
- const unsigned int style, const float height)
- {
- if(math_symbol._glyph == L'.')
- return std::vector<math_text_renderer_t::math_token_t>();
-
- enum {
- GLYPH_TOP = 0,
- GLYPH_MIDDLE,
- GLYPH_BOTTOM,
- GLYPH_REPEATABLE,
- NGLYPH
- };
- const unsigned int family = math_family(math_symbol);
- const float size = style_size(style);
- const bounding_box_t normal_bounding_box =
- math_bounding_box(math_symbol._glyph, family, size);
-
- if(normal_bounding_box.height() >= height) {
- const math_token_t token(normal_bounding_box,
- math_symbol._glyph, family,
- size);
-
- return std::vector<math_token_t>(1, token);
- }
-
- unsigned long nmath_symbol_large_family;
- const unsigned int *math_symbol_large_family;
-
- large_family(nmath_symbol_large_family,
- math_symbol_large_family, math_symbol);
-
- for(unsigned int i = 0; i < nmath_symbol_large_family; i++) {
- const bounding_box_t large_bounding_box =
- math_bounding_box(math_symbol._glyph,
- math_symbol_large_family[i], size);
-
- if(large_bounding_box.height() >= height) {
- const math_token_t token(large_bounding_box,
- math_symbol._glyph,
- math_symbol_large_family[i],
- size);
-
- return std::vector<math_token_t>(1, token);
- }
- }
-
- // Extensible glyph after the TFM charlist mechanism, see
- // Knuth, The METAFONTbook (1986), p. 317f.
-
- wchar_t glyph[NGLYPH];
- unsigned long nrepeat;
-
- extensible_glyph(glyph, nrepeat, math_symbol, style, height);
-
- if(glyph[GLYPH_BOTTOM] != L'\0' &&
- glyph[GLYPH_REPEATABLE] != L'\0') {
- static const unsigned int extensible_family =
- math_symbol._glyph == L'|' ? FAMILY_STIX_REGULAR :
- FAMILY_STIX_SIZE_1_REGULAR;
- const bounding_box_t bounding_box_bottom =
- math_bounding_box(glyph[GLYPH_BOTTOM],
- extensible_family, size);
- std::vector<math_token_t> token_list;
-
- token_list.push_back(math_token_t(
- bounding_box_bottom, glyph[GLYPH_BOTTOM],
- extensible_family, size));
- float current_y = 0;
-
- current_y += bounding_box_bottom.ascent();
- for(unsigned long i = 0; i < nrepeat; i++) {
- const bounding_box_t bounding_box_repeatable =
- math_bounding_box(glyph[GLYPH_REPEATABLE],
- extensible_family, size);
-
- current_y += bounding_box_repeatable.descent();
- token_list.push_back(math_token_t(
- point_t(0, current_y), bounding_box_repeatable,
- glyph[GLYPH_REPEATABLE], extensible_family,
- size));
- current_y += bounding_box_repeatable.ascent();
- }
- if(glyph[GLYPH_MIDDLE] != L'\0') {
- const bounding_box_t bounding_box_middle =
- math_bounding_box(glyph[GLYPH_MIDDLE],
- extensible_family, size);
-
- current_y += bounding_box_middle.descent();
- token_list.push_back(math_token_t(
- point_t(0, current_y), bounding_box_middle,
- glyph[GLYPH_MIDDLE], extensible_family, size));
- current_y += bounding_box_middle.ascent();
- for(unsigned long i = 0; i < nrepeat; i++) {
- const bounding_box_t bounding_box_repeatable =
- math_bounding_box(glyph[GLYPH_REPEATABLE],
- extensible_family, size);
-
- current_y += bounding_box_repeatable.descent();
- token_list.push_back(math_token_t(
- point_t(0, current_y),
- bounding_box_repeatable,
- glyph[GLYPH_REPEATABLE], extensible_family,
- size));
- current_y += bounding_box_repeatable.ascent();
- }
- }
-
- const bounding_box_t bounding_box_top =
- math_bounding_box(glyph[GLYPH_TOP],
- extensible_family, size);
-
- current_y += bounding_box_top.descent();
- token_list.push_back(math_token_t(
- point_t(0, current_y), bounding_box_top,
- glyph[GLYPH_TOP], extensible_family, size));
-
- return token_list;
- }
-
- const math_token_t token(normal_bounding_box,
- math_symbol._glyph, family, size);
-
- return std::vector<math_token_t>(1, token);
- }
-
- std::vector<math_text_renderer_t::math_token_t>
- math_text_renderer_t::
- math_tokenize(const std::vector<math_text_t::item_t>::
- const_iterator &math_list_begin,
- const std::vector<math_text_t::item_t>::
- const_iterator &math_list_end,
- const unsigned int style)
- {
- const float size = style_size(style);
- const float style_axis_height = axis_height * size;
- unsigned int previous_atom_type =
- math_text_t::atom_t::TYPE_UNKNOWN;
- float current_x = 0;
- bool has_accent = false;
-
- // Rule 19
- std::vector<math_text_t::item_t>::const_iterator
- math_list_begin_interior = math_list_begin;
- std::vector<math_text_t::item_t>::const_iterator
- math_list_end_interior = math_list_end;
- static const math_text_t::item_t fraction_item =
- math_text_t::item_t::TYPE_GENERALIZED_FRACTION;
- const std::vector<math_text_t::item_t>::const_iterator
- fraction_iterator =
- std::find(math_list_begin_interior,
- math_list_end_interior, fraction_item);
- const bool generalized_fraction =
- fraction_iterator != math_list_end_interior;
- bool delimiter = false;
+ /////////////////////////////////////////////////////////////////
+ // Math List Tokenization
+
+ std::vector<math_text_renderer_t::math_token_t>
+ math_text_renderer_t::
+ math_tokenize(const math_text_t::math_symbol_t &math_symbol,
+ const unsigned int style, const float height)
+ {
+ if(math_symbol._glyph == L'.')
+ return std::vector<math_text_renderer_t::math_token_t>();
+
+ enum {
+ GLYPH_TOP = 0,
+ GLYPH_MIDDLE,
+ GLYPH_BOTTOM,
+ GLYPH_REPEATABLE,
+ NGLYPH
+ };
+ const unsigned int family = math_family(math_symbol);
+ const float size = style_size(style);
+ const bounding_box_t normal_bounding_box =
+ math_bounding_box(math_symbol._glyph, family, size);
+
+ if(normal_bounding_box.height() >= height) {
+ const math_token_t token(normal_bounding_box,
+ math_symbol._glyph, family,
+ size);
+
+ return std::vector<math_token_t>(1, token);
+ }
+
+ unsigned long nmath_symbol_large_family;
+ const unsigned int *math_symbol_large_family;
+
+ large_family(nmath_symbol_large_family,
+ math_symbol_large_family, math_symbol);
+
+ for(unsigned int i = 0; i < nmath_symbol_large_family; i++) {
+ const bounding_box_t large_bounding_box =
+ math_bounding_box(math_symbol._glyph,
+ math_symbol_large_family[i], size);
+
+ if(large_bounding_box.height() >= height) {
+ const math_token_t token(large_bounding_box,
+ math_symbol._glyph,
+ math_symbol_large_family[i],
+ size);
+
+ return std::vector<math_token_t>(1, token);
+ }
+ }
+
+ // Extensible glyph after the TFM charlist mechanism, see
+ // Knuth, The METAFONTbook (1986), p. 317f.
+
+ wchar_t glyph[NGLYPH];
+ unsigned long nrepeat;
+
+ extensible_glyph(glyph, nrepeat, math_symbol, style, height);
+
+ if(glyph[GLYPH_BOTTOM] != L'\0' &&
+ glyph[GLYPH_REPEATABLE] != L'\0') {
+ static const unsigned int extensible_family =
+ math_symbol._glyph == L'|' ? FAMILY_STIX_REGULAR :
+ FAMILY_STIX_SIZE_1_REGULAR;
+ const bounding_box_t bounding_box_bottom =
+ math_bounding_box(glyph[GLYPH_BOTTOM],
+ extensible_family, size);
+ std::vector<math_token_t> token_list;
+
+ token_list.push_back(math_token_t(
+ bounding_box_bottom, glyph[GLYPH_BOTTOM],
+ extensible_family, size));
+ float current_y = 0;
+
+ current_y += bounding_box_bottom.ascent();
+ for(unsigned long i = 0; i < nrepeat; i++) {
+ const bounding_box_t bounding_box_repeatable =
+ math_bounding_box(glyph[GLYPH_REPEATABLE],
+ extensible_family, size);
+
+ current_y += bounding_box_repeatable.descent();
+ token_list.push_back(math_token_t(
+ point_t(0, current_y), bounding_box_repeatable,
+ glyph[GLYPH_REPEATABLE], extensible_family,
+ size));
+ current_y += bounding_box_repeatable.ascent();
+ }
+ if(glyph[GLYPH_MIDDLE] != L'\0') {
+ const bounding_box_t bounding_box_middle =
+ math_bounding_box(glyph[GLYPH_MIDDLE],
+ extensible_family, size);
+
+ current_y += bounding_box_middle.descent();
+ token_list.push_back(math_token_t(
+ point_t(0, current_y), bounding_box_middle,
+ glyph[GLYPH_MIDDLE], extensible_family, size));
+ current_y += bounding_box_middle.ascent();
+ for(unsigned long i = 0; i < nrepeat; i++) {
+ const bounding_box_t bounding_box_repeatable =
+ math_bounding_box(glyph[GLYPH_REPEATABLE],
+ extensible_family, size);
+
+ current_y += bounding_box_repeatable.descent();
+ token_list.push_back(math_token_t(
+ point_t(0, current_y),
+ bounding_box_repeatable,
+ glyph[GLYPH_REPEATABLE], extensible_family,
+ size));
+ current_y += bounding_box_repeatable.ascent();
+ }
+ }
+
+ const bounding_box_t bounding_box_top =
+ math_bounding_box(glyph[GLYPH_TOP],
+ extensible_family, size);
+
+ current_y += bounding_box_top.descent();
+ token_list.push_back(math_token_t(
+ point_t(0, current_y), bounding_box_top,
+ glyph[GLYPH_TOP], extensible_family, size));
+
+ return token_list;
+ }
+
+ const math_token_t token(normal_bounding_box,
+ math_symbol._glyph, family, size);
+
+ return std::vector<math_token_t>(1, token);
+ }
+
+ std::vector<math_text_renderer_t::math_token_t>
+ math_text_renderer_t::
+ math_tokenize(const std::vector<math_text_t::item_t>::
+ const_iterator &math_list_begin,
+ const std::vector<math_text_t::item_t>::
+ const_iterator &math_list_end,
+ const unsigned int style)
+ {
+ const float size = style_size(style);
+ const float style_axis_height = axis_height * size;
+ unsigned int previous_atom_type =
+ math_text_t::atom_t::TYPE_UNKNOWN;
+ float current_x = 0;
+ bool has_accent = false;
+
+ // Rule 19
+ std::vector<math_text_t::item_t>::const_iterator
+ math_list_begin_interior = math_list_begin;
+ std::vector<math_text_t::item_t>::const_iterator
+ math_list_end_interior = math_list_end;
+ static const math_text_t::item_t fraction_item =
+ math_text_t::item_t::TYPE_GENERALIZED_FRACTION;
+ const std::vector<math_text_t::item_t>::const_iterator
+ fraction_iterator =
+ std::find(math_list_begin_interior,
+ math_list_end_interior, fraction_item);
+ const bool generalized_fraction =
+ fraction_iterator != math_list_end_interior;
+ bool delimiter = false;
float delimiter_height = 0.f;
- bounding_box_t bounding_box_delimiter_left(0, 0, 0, 0, 0, 0);
- bounding_box_t bounding_box_delimiter_right(0, 0, 0, 0, 0, 0);
-
- if(math_list_begin->_type ==
- math_text_t::item_t::TYPE_BOUNDARY &&
- (math_list_end - 1)->_type ==
- math_text_t::item_t::TYPE_BOUNDARY) {
- math_list_begin_interior++;
- math_list_end_interior--;
- delimiter = true;
-
- const bounding_box_t bounding_box_interior =
- math_bounding_box(math_list_begin_interior,
- math_list_end_interior, style);
- const float extension =
- std::max(bounding_box_interior.ascent() -
- style_axis_height,
- bounding_box_interior.descent() +
- style_axis_height);
-
- delimiter_height = extension * 0.002F * delimiter_factor;
- if(generalized_fraction)
- // Rule 15e
- delimiter_height = std::max(delimiter_height,
- if_else_display(style, delim_1, delim_2) * size);
-
- bounding_box_delimiter_left =
- math_bounding_box(math_list_begin->_atom.
- _nucleus._math_symbol,
- style, delimiter_height);
- bounding_box_delimiter_right =
- math_bounding_box((math_list_end - 1)->_atom.
- _nucleus._math_symbol,
- style, delimiter_height);
- }
-
- std::vector<math_token_t> token_list;
-
- if(delimiter) {
- // Standard advance mode
-
- // post_process_atom_type_initial(atom_type) is not
- // necessary, since the current item is guaranteed not to
- // be of type Bin.
-
- // FIXME: Must be in starting style.
-
- const float shift_delimiter_left = style_axis_height -
- bounding_box_delimiter_left.vertical_center();
-
- token_list.push_back(math_token_t(
- point_t(current_x, shift_delimiter_left),
- bounding_box_delimiter_left, style,
- delimiter_height));
-
- current_x += bounding_box_delimiter_left.advance();
- previous_atom_type = math_list_begin->_atom._type;
- }
-
- if(generalized_fraction) {
- // Rule 15a, 15b
- const float thickness = fraction_iterator->_length *
- default_rule_thickness * size;
- const bounding_box_t numerator_bounding_box =
- math_bounding_box(math_list_begin_interior,
- fraction_iterator,
- next_numerator_style(style));
- const bounding_box_t denominator_bounding_box =
- math_bounding_box(fraction_iterator + 1,
- math_list_end_interior,
- next_denominator_style(style));
- const float min_shift_up =
- if_else_display(style, num_1,
- thickness > 0 ? num_2 : num_3) *
- size;
- const float min_shift_down =
- if_else_display(style, denom_1, denom_2) * size;
- float shift_up;
- float shift_down;
-
- if(thickness <= 0) {
- // Rule 15c (\atop)
- const float min_clearance =
- if_else_display(style, 7.0F, 3.0F) *
- default_rule_thickness * size;
- const float actual_clearance =
- (min_shift_up -
- numerator_bounding_box.descent()) -
- (denominator_bounding_box.ascent() -
- min_shift_down);
-
- if(actual_clearance < min_clearance) {
- const float difference = 0.5F *
- (min_clearance - actual_clearance);
-
- shift_up = min_shift_up + difference;
- shift_down = min_shift_down + difference;
- }
- else {
- shift_up = min_shift_up;
- shift_down = min_shift_down;
- }
- }
- else {
- // Rule 15d (\over)
- const float min_bar_clearance =
- if_else_display(style, 3.0F, 1.0F) * thickness;
- const float actual_numerator_clearance =
- (min_shift_up -
- numerator_bounding_box.descent()) -
- (style_axis_height + 0.5F * thickness);
- const float actual_denominator_clearance =
- (style_axis_height - 0.5F * thickness) -
- (denominator_bounding_box.ascent() -
- min_shift_down);
-
- if(actual_numerator_clearance <
- min_bar_clearance) {
- const float difference =
- (min_bar_clearance -
- actual_numerator_clearance);
-
- shift_up = min_shift_up + difference;
- }
- else
- shift_up = min_shift_up;
- if(actual_denominator_clearance <
- min_bar_clearance) {
- const float difference =
- (min_bar_clearance -
- actual_denominator_clearance);
-
- shift_down = min_shift_down + difference;
- }
- else
- shift_down = min_shift_down;
- }
-
- const float horizontal_center_difference =
- numerator_bounding_box.horizontal_center() -
- denominator_bounding_box.horizontal_center();
- float horizontal_shift_numerator;
- float horizontal_shift_denominator;
-
- if(horizontal_center_difference > 0) {
- horizontal_shift_numerator = 0;
- horizontal_shift_denominator =
- horizontal_center_difference;
- }
- else {
- horizontal_shift_numerator =
- -horizontal_center_difference;
- horizontal_shift_denominator = 0;
- }
-
- token_list.push_back(math_token_t(
- point_t(current_x + horizontal_shift_denominator,
- -shift_down),
- denominator_bounding_box,
- next_denominator_style(style)));
- if(thickness > 0) {
+ bounding_box_t bounding_box_delimiter_left(0, 0, 0, 0, 0, 0);
+ bounding_box_t bounding_box_delimiter_right(0, 0, 0, 0, 0, 0);
+
+ if(math_list_begin->_type ==
+ math_text_t::item_t::TYPE_BOUNDARY &&
+ (math_list_end - 1)->_type ==
+ math_text_t::item_t::TYPE_BOUNDARY) {
+ math_list_begin_interior++;
+ math_list_end_interior--;
+ delimiter = true;
+
+ const bounding_box_t bounding_box_interior =
+ math_bounding_box(math_list_begin_interior,
+ math_list_end_interior, style);
+ const float extension =
+ std::max(bounding_box_interior.ascent() -
+ style_axis_height,
+ bounding_box_interior.descent() +
+ style_axis_height);
+
+ delimiter_height = extension * 0.002F * delimiter_factor;
+ if(generalized_fraction)
+ // Rule 15e
+ delimiter_height = std::max(delimiter_height,
+ if_else_display(style, delim_1, delim_2) * size);
+
+ bounding_box_delimiter_left =
+ math_bounding_box(math_list_begin->_atom.
+ _nucleus._math_symbol,
+ style, delimiter_height);
+ bounding_box_delimiter_right =
+ math_bounding_box((math_list_end - 1)->_atom.
+ _nucleus._math_symbol,
+ style, delimiter_height);
+ }
+
+ std::vector<math_token_t> token_list;
+
+ if(delimiter) {
+ // Standard advance mode
+
+ // post_process_atom_type_initial(atom_type) is not
+ // necessary, since the current item is guaranteed not to
+ // be of type Bin.
+
+ // FIXME: Must be in starting style.
+
+ const float shift_delimiter_left = style_axis_height -
+ bounding_box_delimiter_left.vertical_center();
+
+ token_list.push_back(math_token_t(
+ point_t(current_x, shift_delimiter_left),
+ bounding_box_delimiter_left, style,
+ delimiter_height));
+
+ current_x += bounding_box_delimiter_left.advance();
+ previous_atom_type = math_list_begin->_atom._type;
+ }
+
+ if(generalized_fraction) {
+ // Rule 15a, 15b
+ const float thickness = fraction_iterator->_length *
+ default_rule_thickness * size;
+ const bounding_box_t numerator_bounding_box =
+ math_bounding_box(math_list_begin_interior,
+ fraction_iterator,
+ next_numerator_style(style));
+ const bounding_box_t denominator_bounding_box =
+ math_bounding_box(fraction_iterator + 1,
+ math_list_end_interior,
+ next_denominator_style(style));
+ const float min_shift_up =
+ if_else_display(style, num_1,
+ thickness > 0 ? num_2 : num_3) *
+ size;
+ const float min_shift_down =
+ if_else_display(style, denom_1, denom_2) * size;
+ float shift_up;
+ float shift_down;
+
+ if(thickness <= 0) {
+ // Rule 15c (\atop)
+ const float min_clearance =
+ if_else_display(style, 7.0F, 3.0F) *
+ default_rule_thickness * size;
+ const float actual_clearance =
+ (min_shift_up -
+ numerator_bounding_box.descent()) -
+ (denominator_bounding_box.ascent() -
+ min_shift_down);
+
+ if(actual_clearance < min_clearance) {
+ const float difference = 0.5F *
+ (min_clearance - actual_clearance);
+
+ shift_up = min_shift_up + difference;
+ shift_down = min_shift_down + difference;
+ }
+ else {
+ shift_up = min_shift_up;
+ shift_down = min_shift_down;
+ }
+ }
+ else {
+ // Rule 15d (\over)
+ const float min_bar_clearance =
+ if_else_display(style, 3.0F, 1.0F) * thickness;
+ const float actual_numerator_clearance =
+ (min_shift_up -
+ numerator_bounding_box.descent()) -
+ (style_axis_height + 0.5F * thickness);
+ const float actual_denominator_clearance =
+ (style_axis_height - 0.5F * thickness) -
+ (denominator_bounding_box.ascent() -
+ min_shift_down);
+
+ if(actual_numerator_clearance <
+ min_bar_clearance) {
+ const float difference =
+ (min_bar_clearance -
+ actual_numerator_clearance);
+
+ shift_up = min_shift_up + difference;
+ }
+ else
+ shift_up = min_shift_up;
+ if(actual_denominator_clearance <
+ min_bar_clearance) {
+ const float difference =
+ (min_bar_clearance -
+ actual_denominator_clearance);
+
+ shift_down = min_shift_down + difference;
+ }
+ else
+ shift_down = min_shift_down;
+ }
+
+ const float horizontal_center_difference =
+ numerator_bounding_box.horizontal_center() -
+ denominator_bounding_box.horizontal_center();
+ float horizontal_shift_numerator;
+ float horizontal_shift_denominator;
+
+ if(horizontal_center_difference > 0) {
+ horizontal_shift_numerator = 0;
+ horizontal_shift_denominator =
+ horizontal_center_difference;
+ }
+ else {
+ horizontal_shift_numerator =
+ -horizontal_center_difference;
+ horizontal_shift_denominator = 0;
+ }
+
+ token_list.push_back(math_token_t(
+ point_t(current_x + horizontal_shift_denominator,
+ -shift_down),
+ denominator_bounding_box,
+ next_denominator_style(style)));
+ if(thickness > 0) {
#if 0
- const float constrained_thickness =
- std::max(1.0F, thickness);
+ const float constrained_thickness =
+ std::max(1.0F, thickness);
#endif
- const float left =
- std::min(numerator_bounding_box.left(),
- denominator_bounding_box.left());
- const float right =
- std::max(numerator_bounding_box.right(),
- denominator_bounding_box.right());
-
- token_list.push_back(math_token_t(
- point_t(current_x + left,
- style_axis_height - 0.5F * thickness),
- bounding_box_t(0, 0, right - left, thickness,
- 0, 0),
- style));
- }
- token_list.push_back(math_token_t(
- point_t(current_x + horizontal_shift_numerator,
- shift_up),
- numerator_bounding_box,
- next_numerator_style(style)));
-
- const float advance =
- std::max(horizontal_shift_numerator +
- numerator_bounding_box.left() +
- numerator_bounding_box.right(),
- horizontal_shift_denominator +
- denominator_bounding_box.left() +
- denominator_bounding_box.right());
-
- current_x += advance;
- }
- else
- // Incrementally process a math list
- for(std::vector<math_text_t::item_t>::const_iterator
- iterator = math_list_begin_interior;
- iterator != math_list_end_interior; iterator++) {
- unsigned int atom_type;
- bounding_box_t item_bounding_box;
- unsigned int current_style = has_accent ?
- prime_style(style) : style;
- bool accent;
- bool vertical_alignment;
-
- switch(iterator->_type) {
- case math_text_t::item_t::TYPE_ATOM:
- atom_type = iterator->_atom._type;
- item_bounding_box =
- math_bounding_box(iterator->_atom,
- current_style);
- accent = valid_accent(vertical_alignment,
- iterator, math_list_end);
- if(accent) {
- // Accent advance mode
- const std::vector<math_text_t::item_t>::
- const_iterator iterator_next =
- iterator + 1;
- const bounding_box_t next_item_bounding_box =
- math_bounding_box(iterator_next->_atom,
- style);
- const float horizontal_shift =
- (iterator == math_list_begin ? 0.0F :
- math_spacing(previous_atom_type,
- atom_type, style)) +
- next_item_bounding_box.
- horizontal_center() +
- 0.5F * next_item_bounding_box.
- italic_correction() -
- item_bounding_box.horizontal_center();
- const float vertical_shift =
- vertical_alignment ?
- std::max(0.0F,
- next_item_bounding_box.ascent() -
- x_height(style)) : 0.0F;
-
- token_list.push_back(math_token_t(
- point_t(current_x + horizontal_shift,
- vertical_shift),
- item_bounding_box, style));
- has_accent = true;
- }
- else {
- // Standard advance mode
- if(iterator == math_list_begin)
- post_process_atom_type_initial(atom_type);
- else {
- post_process_atom_type_interior(
- previous_atom_type, atom_type);
-
- const float horizontal_shift =
- math_spacing(previous_atom_type,
- atom_type,
- current_style);
-
- current_x +=
- horizontal_shift;
- }
-
- token_list.push_back(math_token_t(
- point_t(current_x, 0), item_bounding_box,
- current_style));
- current_x += item_bounding_box.advance();
- has_accent = false;
- previous_atom_type = atom_type;
- }
- break;
- case math_text_t::item_t::TYPE_KERN:
- // Rule 2
- current_x += kerning_mu(iterator->_length);
- break;
- }
- }
-
- // Rule 19 (again)
- if(delimiter) {
- unsigned int atom_type =
- (math_list_end - 1)->_atom._type;
- // Standard advance mode
-
- // FIXME: Must be in starting style.
-
- post_process_atom_type_interior(previous_atom_type,
- atom_type);
-
- const float horizontal_shift =
- math_spacing(previous_atom_type, atom_type, style);
-
- current_x += horizontal_shift;
-
- const float shift_delimiter_right = style_axis_height -
- bounding_box_delimiter_right.vertical_center();
-
- token_list.push_back(math_token_t(
- point_t(current_x, shift_delimiter_right),
- bounding_box_delimiter_right, style,
- delimiter_height));
- }
-
- return token_list;
- }
-
- std::vector<math_text_renderer_t::math_token_t>
- math_text_renderer_t::
- math_tokenize(const math_text_t::atom_t &atom,
- const unsigned int style)
- {
+ const float left =
+ std::min(numerator_bounding_box.left(),
+ denominator_bounding_box.left());
+ const float right =
+ std::max(numerator_bounding_box.right(),
+ denominator_bounding_box.right());
+
+ token_list.push_back(math_token_t(
+ point_t(current_x + left,
+ style_axis_height - 0.5F * thickness),
+ bounding_box_t(0, 0, right - left, thickness,
+ 0, 0),
+ style));
+ }
+ token_list.push_back(math_token_t(
+ point_t(current_x + horizontal_shift_numerator,
+ shift_up),
+ numerator_bounding_box,
+ next_numerator_style(style)));
+
+ const float advance =
+ std::max(horizontal_shift_numerator +
+ numerator_bounding_box.left() +
+ numerator_bounding_box.right(),
+ horizontal_shift_denominator +
+ denominator_bounding_box.left() +
+ denominator_bounding_box.right());
+
+ current_x += advance;
+ }
+ else
+ // Incrementally process a math list
+ for(std::vector<math_text_t::item_t>::const_iterator
+ iterator = math_list_begin_interior;
+ iterator != math_list_end_interior; iterator++) {
+ unsigned int atom_type;
+ bounding_box_t item_bounding_box;
+ unsigned int current_style = has_accent ?
+ prime_style(style) : style;
+ bool accent;
+ bool vertical_alignment;
+
+ switch(iterator->_type) {
+ case math_text_t::item_t::TYPE_ATOM:
+ atom_type = iterator->_atom._type;
+ item_bounding_box =
+ math_bounding_box(iterator->_atom,
+ current_style);
+ accent = valid_accent(vertical_alignment,
+ iterator, math_list_end);
+ if(accent) {
+ // Accent advance mode
+ const std::vector<math_text_t::item_t>::
+ const_iterator iterator_next =
+ iterator + 1;
+ const bounding_box_t next_item_bounding_box =
+ math_bounding_box(iterator_next->_atom,
+ style);
+ const float horizontal_shift =
+ (iterator == math_list_begin ? 0.0F :
+ math_spacing(previous_atom_type,
+ atom_type, style)) +
+ next_item_bounding_box.
+ horizontal_center() +
+ 0.5F * next_item_bounding_box.
+ italic_correction() -
+ item_bounding_box.horizontal_center();
+ const float vertical_shift =
+ vertical_alignment ?
+ std::max(0.0F,
+ next_item_bounding_box.ascent() -
+ x_height(style)) : 0.0F;
+
+ token_list.push_back(math_token_t(
+ point_t(current_x + horizontal_shift,
+ vertical_shift),
+ item_bounding_box, style));
+ has_accent = true;
+ }
+ else {
+ // Standard advance mode
+ if(iterator == math_list_begin)
+ post_process_atom_type_initial(atom_type);
+ else {
+ post_process_atom_type_interior(
+ previous_atom_type, atom_type);
+
+ const float horizontal_shift =
+ math_spacing(previous_atom_type,
+ atom_type,
+ current_style);
+
+ current_x +=
+ horizontal_shift;
+ }
+
+ token_list.push_back(math_token_t(
+ point_t(current_x, 0), item_bounding_box,
+ current_style));
+ current_x += item_bounding_box.advance();
+ has_accent = false;
+ previous_atom_type = atom_type;
+ }
+ break;
+ case math_text_t::item_t::TYPE_KERN:
+ // Rule 2
+ current_x += kerning_mu(iterator->_length);
+ break;
+ }
+ }
+
+ // Rule 19 (again)
+ if(delimiter) {
+ unsigned int atom_type =
+ (math_list_end - 1)->_atom._type;
+ // Standard advance mode
+
+ // FIXME: Must be in starting style.
+
+ post_process_atom_type_interior(previous_atom_type,
+ atom_type);
+
+ const float horizontal_shift =
+ math_spacing(previous_atom_type, atom_type, style);
+
+ current_x += horizontal_shift;
+
+ const float shift_delimiter_right = style_axis_height -
+ bounding_box_delimiter_right.vertical_center();
+
+ token_list.push_back(math_token_t(
+ point_t(current_x, shift_delimiter_right),
+ bounding_box_delimiter_right, style,
+ delimiter_height));
+ }
+
+ return token_list;
+ }
+
+ std::vector<math_text_renderer_t::math_token_t>
+ math_text_renderer_t::
+ math_tokenize(const math_text_t::atom_t &atom,
+ const unsigned int style)
+ {
const float size = style_size(style);
- std::vector<math_text_renderer_t::math_token_t> token_list;
+ std::vector<math_text_renderer_t::math_token_t> token_list;
bounding_box_t nucleus_bounding_box;
- float current_x = 0;
- float nucleus_shift_up = 0;
-
- // Rule 11
- if(atom._type == math_text_t::atom_t::TYPE_RAD) {
- float style_radical_rule_thickness =
- default_rule_thickness * size;
- const float min_clearance =
- style_radical_rule_thickness + 0.25F *
- if_else_display(style, x_height(style),
- style_radical_rule_thickness);
- const bounding_box_t bounding_box_radicand =
- math_bounding_box(atom._nucleus,
- prime_style(style));
- const float min_delimiter_height =
- bounding_box_radicand.height() + min_clearance +
- style_radical_rule_thickness;
- const math_text_t::math_symbol_t
- symbol_surd("\\surd", style);
- const bounding_box_t bounding_box_surd =
- math_bounding_box(symbol_surd, style,
- min_delimiter_height);
- const float surd_intrinsic_shift_down =
- bounding_box_surd.ascent() -
- style_radical_rule_thickness;
- const float modified_descent =
- bounding_box_surd.descent() +
- surd_intrinsic_shift_down;
- const float clearance = modified_descent >
- bounding_box_radicand.height() + min_clearance ?
- 0.5F * (min_clearance + modified_descent -
- bounding_box_radicand.height()) :
- min_clearance;
-
- if(!atom._index.empty()) {
- // The positive space of 5 mu to the index is hard
- // wired in plain.tex
- current_x += (5.0F / 18.0F) * size;
-
- const bounding_box_t bounding_box_index =
- math_bounding_box(atom._index,
- math_text_t::item_t::STYLE_SCRIPT_SCRIPT);
- const float radical_height =
- (std::max(math_bounding_box(
- atom._index, prime_style(style)).ascent(),
- bounding_box_radicand.ascent() +
- clearance +
- 2.0F * style_radical_rule_thickness) -
- std::max(math_bounding_box(
- atom._index, prime_style(style)).descent(),
- bounding_box_radicand.descent()));
-
- nucleus_bounding_box =
- point_t(current_x, 0.6F * radical_height) +
- math_bounding_box(
- atom._index,
- math_text_t::item_t::STYLE_SCRIPT_SCRIPT);
- token_list.push_back(math_token_t(
- point_t(current_x, 0.6F * radical_height),
- bounding_box_index,
- math_text_t::item_t::STYLE_SCRIPT_SCRIPT));
- // The negative space of 10 mu to the surd is hard
- // wired in plain.tex
- current_x += bounding_box_index.advance() -
- (10.0F / 18.0F) * size;
- }
-
- const float radicand_ascent_clearance =
- bounding_box_radicand.ascent() + clearance;
-
- nucleus_bounding_box = nucleus_bounding_box.merge(
- point_t(current_x,
- radicand_ascent_clearance -
- surd_intrinsic_shift_down) +
- bounding_box_surd);
- token_list.push_back(math_token_t(
- point_t(current_x,
- radicand_ascent_clearance -
- surd_intrinsic_shift_down),
- bounding_box_surd, style, min_delimiter_height));
- current_x += bounding_box_surd.advance();
-
- const float constrained_thickness =
+ float current_x = 0;
+ float nucleus_shift_up = 0;
+
+ // Rule 11
+ if(atom._type == math_text_t::atom_t::TYPE_RAD) {
+ float style_radical_rule_thickness =
+ default_rule_thickness * size;
+ const float min_clearance =
+ style_radical_rule_thickness + 0.25F *
+ if_else_display(style, x_height(style),
+ style_radical_rule_thickness);
+ const bounding_box_t bounding_box_radicand =
+ math_bounding_box(atom._nucleus,
+ prime_style(style));
+ const float min_delimiter_height =
+ bounding_box_radicand.height() + min_clearance +
+ style_radical_rule_thickness;
+ const math_text_t::math_symbol_t
+ symbol_surd("\\surd", style);
+ const bounding_box_t bounding_box_surd =
+ math_bounding_box(symbol_surd, style,
+ min_delimiter_height);
+ const float surd_intrinsic_shift_down =
+ bounding_box_surd.ascent() -
+ style_radical_rule_thickness;
+ const float modified_descent =
+ bounding_box_surd.descent() +
+ surd_intrinsic_shift_down;
+ const float clearance = modified_descent >
+ bounding_box_radicand.height() + min_clearance ?
+ 0.5F * (min_clearance + modified_descent -
+ bounding_box_radicand.height()) :
+ min_clearance;
+
+ if(!atom._index.empty()) {
+ // The positive space of 5 mu to the index is hard
+ // wired in plain.tex
+ current_x += (5.0F / 18.0F) * size;
+
+ const bounding_box_t bounding_box_index =
+ math_bounding_box(atom._index,
+ math_text_t::item_t::STYLE_SCRIPT_SCRIPT);
+ const float radical_height =
+ (std::max(math_bounding_box(
+ atom._index, prime_style(style)).ascent(),
+ bounding_box_radicand.ascent() +
+ clearance +
+ 2.0F * style_radical_rule_thickness) -
+ std::max(math_bounding_box(
+ atom._index, prime_style(style)).descent(),
+ bounding_box_radicand.descent()));
+
+ nucleus_bounding_box =
+ point_t(current_x, 0.6F * radical_height) +
+ math_bounding_box(
+ atom._index,
+ math_text_t::item_t::STYLE_SCRIPT_SCRIPT);
+ token_list.push_back(math_token_t(
+ point_t(current_x, 0.6F * radical_height),
+ bounding_box_index,
+ math_text_t::item_t::STYLE_SCRIPT_SCRIPT));
+ // The negative space of 10 mu to the surd is hard
+ // wired in plain.tex
+ current_x += bounding_box_index.advance() -
+ (10.0F / 18.0F) * size;
+ }
+
+ const float radicand_ascent_clearance =
+ bounding_box_radicand.ascent() + clearance;
+
+ nucleus_bounding_box = nucleus_bounding_box.merge(
+ point_t(current_x,
+ radicand_ascent_clearance -
+ surd_intrinsic_shift_down) +
+ bounding_box_surd);
+ token_list.push_back(math_token_t(
+ point_t(current_x,
+ radicand_ascent_clearance -
+ surd_intrinsic_shift_down),
+ bounding_box_surd, style, min_delimiter_height));
+ current_x += bounding_box_surd.advance();
+
+ const float constrained_thickness =
#if 0
- // Pixel height constraint
- std::max(1.0F, style_radical_rule_thickness)
+ // Pixel height constraint
+ std::max(1.0F, style_radical_rule_thickness)
#else
- style_radical_rule_thickness
+ style_radical_rule_thickness
#endif
- ;
- static const float surd_rule_correction_x = -1.5F;
- static const float surd_rule_correction_y = -0.5F;
-
- const point_t origin_rule =
- point_t(current_x, radicand_ascent_clearance);
- const bounding_box_t bounding_box_rule =
- bounding_box_t(surd_rule_correction_x *
- constrained_thickness,
- surd_rule_correction_y *
- constrained_thickness,
- bounding_box_radicand.advance(),
- (surd_rule_correction_y + 1.0F) *
- constrained_thickness,
- 0, 0);
-
- nucleus_bounding_box = nucleus_bounding_box.merge(
- origin_rule + bounding_box_rule);
- token_list.push_back(math_token_t(
- origin_rule, bounding_box_rule, style));
-
- const bounding_box_t bounding_box_clearance =
- bounding_box_t(0, -2.0F * constrained_thickness,
- bounding_box_radicand.advance(),
- constrained_thickness,
- 0, 0);
-
- nucleus_bounding_box = nucleus_bounding_box.merge(
- origin_rule + bounding_box_clearance);
- token_list.push_back(math_token_t(
- origin_rule, bounding_box_clearance, style));
-
- const point_t origin_radicand = point_t(current_x, 0);
-
- nucleus_bounding_box = nucleus_bounding_box.merge(
- origin_radicand + bounding_box_radicand);
- token_list.push_back(math_token_t(
- origin_radicand, bounding_box_radicand,
- prime_style(style)));
- current_x += bounding_box_radicand.advance();
- }
- else if(atom._type == math_text_t::atom_t::TYPE_OP) {
- const bool limits =
- atom._limits == math_text_t::atom_t::LIMITS_LIMITS ||
- (atom._limits ==
- math_text_t::atom_t::LIMITS_DISPLAYLIMITS &&
- is_display_style(style));
-
- if(atom._nucleus._type ==
- math_text_t::field_t::TYPE_MATH_SYMBOL) {
- // Rule 13
- nucleus_bounding_box = math_bounding_box(
- atom._nucleus._math_symbol._glyph,
- FAMILY_STIX_REGULAR,
- size * if_else_display(style,
- large_operator_display_scale, 1.0F));
- nucleus_shift_up =
- axis_height * size -
- nucleus_bounding_box.vertical_center();
- if(limits && atom._subscript.empty())
- nucleus_bounding_box.advance() +=
- nucleus_bounding_box.italic_correction();
- }
- else
- nucleus_bounding_box =
- math_bounding_box(atom._nucleus, style);
-
- if(limits && !(atom._superscript.empty() &&
- atom._subscript.empty())) {
- // Rule 13a
- const unsigned int superscript_style =
- next_superscript_style(style);
- const unsigned int subscript_style =
- next_subscript_style(style);
-
- if(atom._superscript.empty()) {
- const bounding_box_t subscript_bounding_box =
- math_bounding_box(atom._subscript,
- subscript_style);
- const float shift_right =
- nucleus_bounding_box.horizontal_center() -
- subscript_bounding_box.horizontal_center() -
- 0.5F *
- nucleus_bounding_box.italic_correction();
- const float clearance =
- std::max(big_op_spacing_2 * size,
- big_op_spacing_4 * size -
- subscript_bounding_box.ascent());
- const float shift_down =
- nucleus_bounding_box.descent() + clearance +
- subscript_bounding_box.ascent() -
- nucleus_shift_up;
-
- if(shift_right >= 0) {
- token_list.push_back(math_token_t(
- point_t(0, nucleus_shift_up),
- nucleus_bounding_box, style));
- token_list.push_back(math_token_t(
- point_t(shift_right, -shift_down),
- subscript_bounding_box,
- subscript_style));
- }
- else {
- token_list.push_back(math_token_t(
- point_t(-shift_right,
- nucleus_shift_up),
- nucleus_bounding_box, style));
- token_list.push_back(math_token_t(
- point_t(0, -shift_down),
- subscript_bounding_box,
- subscript_style));
- }
- return token_list;
- }
- if(atom._subscript.empty()) {
- const bounding_box_t superscript_bounding_box =
- math_bounding_box(atom._superscript,
- superscript_style);
- const float shift_right =
- nucleus_bounding_box.horizontal_center() -
- superscript_bounding_box.
- horizontal_center() + 0.5F *
- nucleus_bounding_box.italic_correction();
- const float clearance =
- std::max(big_op_spacing_1 * size,
- big_op_spacing_3 * size -
- superscript_bounding_box.descent());
- const float shift_up =
- nucleus_bounding_box.ascent() + clearance +
- superscript_bounding_box.descent() +
- nucleus_shift_up;
-
- if(shift_right >= 0) {
- token_list.push_back(math_token_t(
- point_t(0, nucleus_shift_up),
- nucleus_bounding_box, style));
- token_list.push_back(math_token_t(
- point_t(shift_right, shift_up),
- superscript_bounding_box,
- superscript_style));
- }
- else {
- token_list.push_back(math_token_t(
- point_t(-shift_right,
- nucleus_shift_up),
- nucleus_bounding_box, style));
- token_list.push_back(math_token_t(
- point_t(0, shift_up),
- superscript_bounding_box,
- superscript_style));
- }
- return token_list;
- }
- const bounding_box_t superscript_bounding_box =
- math_bounding_box(atom._superscript,
- superscript_style);
- const bounding_box_t subscript_bounding_box =
- math_bounding_box(atom._subscript,
- subscript_style);
- const float shift_right_superscript =
- nucleus_bounding_box.horizontal_center() -
- superscript_bounding_box.horizontal_center() +
- 0.5F * nucleus_bounding_box.italic_correction();
- const float shift_right_subscript =
- nucleus_bounding_box.horizontal_center() -
- subscript_bounding_box.horizontal_center() -
- 0.5F * nucleus_bounding_box.italic_correction();
- const float clearance_superscript =
- std::max(big_op_spacing_1 * size,
- big_op_spacing_3 * size -
- superscript_bounding_box.descent());
- const float clearance_subscript =
- std::max(big_op_spacing_2 * size,
- big_op_spacing_4 * size -
- subscript_bounding_box.ascent());
- const float shift_up =
- nucleus_bounding_box.ascent() +
- clearance_superscript +
- superscript_bounding_box.descent() +
- nucleus_shift_up;
- const float shift_down =
- nucleus_bounding_box.descent() +
- clearance_subscript +
- subscript_bounding_box.ascent() -
- nucleus_shift_up;
- const float min_shift_right =
- std::min(0.0F, std::min(shift_right_superscript,
- shift_right_subscript));
-
- token_list.push_back(math_token_t(
- point_t(-min_shift_right,
- nucleus_shift_up),
- nucleus_bounding_box, style));
- token_list.push_back(math_token_t(
- point_t(shift_right_superscript -
- min_shift_right,
- shift_up),
- superscript_bounding_box,
- superscript_style));
- token_list.push_back(math_token_t(
- point_t(shift_right_subscript -
- min_shift_right,
- -shift_down),
- subscript_bounding_box,
- subscript_style));
- return token_list;
- }
-
- // \nolimits or nucleus only
- token_list.push_back(math_token_t(
- point_t(0, nucleus_shift_up),
- nucleus_bounding_box, style));
- current_x += nucleus_bounding_box.advance();
- }
- else { // Neither Rad nor Op
- nucleus_bounding_box =
- math_bounding_box(atom._nucleus, style);
- token_list.push_back(math_token_t(
- nucleus_bounding_box, style));
- current_x += nucleus_bounding_box.advance();
- }
-
- if(atom._superscript.empty() && atom._subscript.empty())
- return token_list;
-
- const float current_x_italic_corrected = current_x +
- nucleus_bounding_box.italic_correction();
- const float nucleus_size = size;
- const unsigned int superscript_style =
- next_superscript_style(style);
- const unsigned int subscript_style =
- next_subscript_style(style);
- const float superscript_size = style_size(superscript_style);
- const float subscript_size = style_size(subscript_style);
- // Rule 18a
- const float min_shift_up = nucleus_bounding_box.ascent() -
- superscript_size * sup_drop;
- const float min_shift_down = nucleus_bounding_box.descent() +
- subscript_size * sub_drop;
-
- // Rule 18b
- if(atom._superscript.empty()) {
- const bounding_box_t subscript_bounding_box =
- math_bounding_box(atom._subscript, subscript_style);
- const float shift_down =
- std::max(std::max(min_shift_down,
- nucleus_size * sub_1),
- subscript_bounding_box.ascent() -
- 0.8F * x_height(subscript_style));
- token_list.push_back(math_token_t(
- point_t(current_x, nucleus_shift_up - shift_down),
- subscript_bounding_box, subscript_style));
- return token_list;
- }
- // Rule 18c
- const bounding_box_t superscript_bounding_box =
- math_bounding_box(atom._superscript, superscript_style);
- const float min_shift_up_2 = nucleus_size *
- (style == math_text_t::item_t::STYLE_DISPLAY ?
- sup_1 : is_prime_style(style) ? sup_3 : sup_2);
- float shift_up =
- std::max(std::max(min_shift_up, min_shift_up_2),
- superscript_bounding_box.descent() +
- 0.2F * x_height(superscript_style));
- // Rule 18d
- if(atom._subscript.empty()) {
- token_list.push_back(math_token_t(
- point_t(current_x_italic_corrected,
- nucleus_shift_up + shift_up),
- superscript_bounding_box, superscript_style));
- return token_list;
- }
-
- // Still rule 18d
- float shift_down =
- std::max(min_shift_down, nucleus_size * sub_2);
- // Rule 18e
- const bounding_box_t subscript_bounding_box =
- math_bounding_box(atom._subscript, subscript_style);
-
- if((shift_up - superscript_bounding_box.descent()) -
- (subscript_bounding_box.ascent() - shift_down) <
- 4.0F * default_rule_thickness *
- nucleus_size) {
- shift_down = 4.0F * default_rule_thickness *
- nucleus_size + subscript_bounding_box.ascent() +
- superscript_bounding_box.descent() - shift_up;
-
- const float superscript_adjustment =
- 0.8F * x_height(superscript_style) -
- (shift_up - superscript_bounding_box.descent());
-
- if(superscript_adjustment > 0) {
- shift_up += superscript_adjustment;
- shift_down -= superscript_adjustment;
- }
- }
- // Rule 18f
- token_list.push_back(math_token_t(
- point_t(current_x_italic_corrected,
- nucleus_shift_up + shift_up),
- superscript_bounding_box, superscript_style));
- token_list.push_back(math_token_t(
- point_t(current_x,
- nucleus_shift_up - shift_down),
- subscript_bounding_box, subscript_style));
-
- return token_list;
- }
-
+ ;
+ static const float surd_rule_correction_x = -1.5F;
+ static const float surd_rule_correction_y = -0.5F;
+
+ const point_t origin_rule =
+ point_t(current_x, radicand_ascent_clearance);
+ const bounding_box_t bounding_box_rule =
+ bounding_box_t(surd_rule_correction_x *
+ constrained_thickness,
+ surd_rule_correction_y *
+ constrained_thickness,
+ bounding_box_radicand.advance(),
+ (surd_rule_correction_y + 1.0F) *
+ constrained_thickness,
+ 0, 0);
+
+ nucleus_bounding_box = nucleus_bounding_box.merge(
+ origin_rule + bounding_box_rule);
+ token_list.push_back(math_token_t(
+ origin_rule, bounding_box_rule, style));
+
+ const bounding_box_t bounding_box_clearance =
+ bounding_box_t(0, -2.0F * constrained_thickness,
+ bounding_box_radicand.advance(),
+ constrained_thickness,
+ 0, 0);
+
+ nucleus_bounding_box = nucleus_bounding_box.merge(
+ origin_rule + bounding_box_clearance);
+ token_list.push_back(math_token_t(
+ origin_rule, bounding_box_clearance, style));
+
+ const point_t origin_radicand = point_t(current_x, 0);
+
+ nucleus_bounding_box = nucleus_bounding_box.merge(
+ origin_radicand + bounding_box_radicand);
+ token_list.push_back(math_token_t(
+ origin_radicand, bounding_box_radicand,
+ prime_style(style)));
+ current_x += bounding_box_radicand.advance();
+ }
+ else if(atom._type == math_text_t::atom_t::TYPE_OP) {
+ const bool limits =
+ atom._limits == math_text_t::atom_t::LIMITS_LIMITS ||
+ (atom._limits ==
+ math_text_t::atom_t::LIMITS_DISPLAYLIMITS &&
+ is_display_style(style));
+
+ if(atom._nucleus._type ==
+ math_text_t::field_t::TYPE_MATH_SYMBOL) {
+ // Rule 13
+ nucleus_bounding_box = math_bounding_box(
+ atom._nucleus._math_symbol._glyph,
+ FAMILY_STIX_REGULAR,
+ size * if_else_display(style,
+ large_operator_display_scale, 1.0F));
+ nucleus_shift_up =
+ axis_height * size -
+ nucleus_bounding_box.vertical_center();
+ if(limits && atom._subscript.empty())
+ nucleus_bounding_box.advance() +=
+ nucleus_bounding_box.italic_correction();
+ }
+ else
+ nucleus_bounding_box =
+ math_bounding_box(atom._nucleus, style);
+
+ if(limits && !(atom._superscript.empty() &&
+ atom._subscript.empty())) {
+ // Rule 13a
+ const unsigned int superscript_style =
+ next_superscript_style(style);
+ const unsigned int subscript_style =
+ next_subscript_style(style);
+
+ if(atom._superscript.empty()) {
+ const bounding_box_t subscript_bounding_box =
+ math_bounding_box(atom._subscript,
+ subscript_style);
+ const float shift_right =
+ nucleus_bounding_box.horizontal_center() -
+ subscript_bounding_box.horizontal_center() -
+ 0.5F *
+ nucleus_bounding_box.italic_correction();
+ const float clearance =
+ std::max(big_op_spacing_2 * size,
+ big_op_spacing_4 * size -
+ subscript_bounding_box.ascent());
+ const float shift_down =
+ nucleus_bounding_box.descent() + clearance +
+ subscript_bounding_box.ascent() -
+ nucleus_shift_up;
+
+ if(shift_right >= 0) {
+ token_list.push_back(math_token_t(
+ point_t(0, nucleus_shift_up),
+ nucleus_bounding_box, style));
+ token_list.push_back(math_token_t(
+ point_t(shift_right, -shift_down),
+ subscript_bounding_box,
+ subscript_style));
+ }
+ else {
+ token_list.push_back(math_token_t(
+ point_t(-shift_right,
+ nucleus_shift_up),
+ nucleus_bounding_box, style));
+ token_list.push_back(math_token_t(
+ point_t(0, -shift_down),
+ subscript_bounding_box,
+ subscript_style));
+ }
+ return token_list;
+ }
+ if(atom._subscript.empty()) {
+ const bounding_box_t superscript_bounding_box =
+ math_bounding_box(atom._superscript,
+ superscript_style);
+ const float shift_right =
+ nucleus_bounding_box.horizontal_center() -
+ superscript_bounding_box.
+ horizontal_center() + 0.5F *
+ nucleus_bounding_box.italic_correction();
+ const float clearance =
+ std::max(big_op_spacing_1 * size,
+ big_op_spacing_3 * size -
+ superscript_bounding_box.descent());
+ const float shift_up =
+ nucleus_bounding_box.ascent() + clearance +
+ superscript_bounding_box.descent() +
+ nucleus_shift_up;
+
+ if(shift_right >= 0) {
+ token_list.push_back(math_token_t(
+ point_t(0, nucleus_shift_up),
+ nucleus_bounding_box, style));
+ token_list.push_back(math_token_t(
+ point_t(shift_right, shift_up),
+ superscript_bounding_box,
+ superscript_style));
+ }
+ else {
+ token_list.push_back(math_token_t(
+ point_t(-shift_right,
+ nucleus_shift_up),
+ nucleus_bounding_box, style));
+ token_list.push_back(math_token_t(
+ point_t(0, shift_up),
+ superscript_bounding_box,
+ superscript_style));
+ }
+ return token_list;
+ }
+ const bounding_box_t superscript_bounding_box =
+ math_bounding_box(atom._superscript,
+ superscript_style);
+ const bounding_box_t subscript_bounding_box =
+ math_bounding_box(atom._subscript,
+ subscript_style);
+ const float shift_right_superscript =
+ nucleus_bounding_box.horizontal_center() -
+ superscript_bounding_box.horizontal_center() +
+ 0.5F * nucleus_bounding_box.italic_correction();
+ const float shift_right_subscript =
+ nucleus_bounding_box.horizontal_center() -
+ subscript_bounding_box.horizontal_center() -
+ 0.5F * nucleus_bounding_box.italic_correction();
+ const float clearance_superscript =
+ std::max(big_op_spacing_1 * size,
+ big_op_spacing_3 * size -
+ superscript_bounding_box.descent());
+ const float clearance_subscript =
+ std::max(big_op_spacing_2 * size,
+ big_op_spacing_4 * size -
+ subscript_bounding_box.ascent());
+ const float shift_up =
+ nucleus_bounding_box.ascent() +
+ clearance_superscript +
+ superscript_bounding_box.descent() +
+ nucleus_shift_up;
+ const float shift_down =
+ nucleus_bounding_box.descent() +
+ clearance_subscript +
+ subscript_bounding_box.ascent() -
+ nucleus_shift_up;
+ const float min_shift_right =
+ std::min(0.0F, std::min(shift_right_superscript,
+ shift_right_subscript));
+
+ token_list.push_back(math_token_t(
+ point_t(-min_shift_right,
+ nucleus_shift_up),
+ nucleus_bounding_box, style));
+ token_list.push_back(math_token_t(
+ point_t(shift_right_superscript -
+ min_shift_right,
+ shift_up),
+ superscript_bounding_box,
+ superscript_style));
+ token_list.push_back(math_token_t(
+ point_t(shift_right_subscript -
+ min_shift_right,
+ -shift_down),
+ subscript_bounding_box,
+ subscript_style));
+ return token_list;
+ }
+
+ // \nolimits or nucleus only
+ token_list.push_back(math_token_t(
+ point_t(0, nucleus_shift_up),
+ nucleus_bounding_box, style));
+ current_x += nucleus_bounding_box.advance();
+ }
+ else { // Neither Rad nor Op
+ nucleus_bounding_box =
+ math_bounding_box(atom._nucleus, style);
+ token_list.push_back(math_token_t(
+ nucleus_bounding_box, style));
+ current_x += nucleus_bounding_box.advance();
+ }
+
+ if(atom._superscript.empty() && atom._subscript.empty())
+ return token_list;
+
+ const float current_x_italic_corrected = current_x +
+ nucleus_bounding_box.italic_correction();
+ const float nucleus_size = size;
+ const unsigned int superscript_style =
+ next_superscript_style(style);
+ const unsigned int subscript_style =
+ next_subscript_style(style);
+ const float superscript_size = style_size(superscript_style);
+ const float subscript_size = style_size(subscript_style);
+ // Rule 18a
+ const float min_shift_up = nucleus_bounding_box.ascent() -
+ superscript_size * sup_drop;
+ const float min_shift_down = nucleus_bounding_box.descent() +
+ subscript_size * sub_drop;
+
+ // Rule 18b
+ if(atom._superscript.empty()) {
+ const bounding_box_t subscript_bounding_box =
+ math_bounding_box(atom._subscript, subscript_style);
+ const float shift_down =
+ std::max(std::max(min_shift_down,
+ nucleus_size * sub_1),
+ subscript_bounding_box.ascent() -
+ 0.8F * x_height(subscript_style));
+ token_list.push_back(math_token_t(
+ point_t(current_x, nucleus_shift_up - shift_down),
+ subscript_bounding_box, subscript_style));
+ return token_list;
+ }
+ // Rule 18c
+ const bounding_box_t superscript_bounding_box =
+ math_bounding_box(atom._superscript, superscript_style);
+ const float min_shift_up_2 = nucleus_size *
+ (style == math_text_t::item_t::STYLE_DISPLAY ?
+ sup_1 : is_prime_style(style) ? sup_3 : sup_2);
+ float shift_up =
+ std::max(std::max(min_shift_up, min_shift_up_2),
+ superscript_bounding_box.descent() +
+ 0.2F * x_height(superscript_style));
+ // Rule 18d
+ if(atom._subscript.empty()) {
+ token_list.push_back(math_token_t(
+ point_t(current_x_italic_corrected,
+ nucleus_shift_up + shift_up),
+ superscript_bounding_box, superscript_style));
+ return token_list;
+ }
+
+ // Still rule 18d
+ float shift_down =
+ std::max(min_shift_down, nucleus_size * sub_2);
+ // Rule 18e
+ const bounding_box_t subscript_bounding_box =
+ math_bounding_box(atom._subscript, subscript_style);
+
+ if((shift_up - superscript_bounding_box.descent()) -
+ (subscript_bounding_box.ascent() - shift_down) <
+ 4.0F * default_rule_thickness *
+ nucleus_size) {
+ shift_down = 4.0F * default_rule_thickness *
+ nucleus_size + subscript_bounding_box.ascent() +
+ superscript_bounding_box.descent() - shift_up;
+
+ const float superscript_adjustment =
+ 0.8F * x_height(superscript_style) -
+ (shift_up - superscript_bounding_box.descent());
+
+ if(superscript_adjustment > 0) {
+ shift_up += superscript_adjustment;
+ shift_down -= superscript_adjustment;
+ }
+ }
+ // Rule 18f
+ token_list.push_back(math_token_t(
+ point_t(current_x_italic_corrected,
+ nucleus_shift_up + shift_up),
+ superscript_bounding_box, superscript_style));
+ token_list.push_back(math_token_t(
+ point_t(current_x,
+ nucleus_shift_up - shift_down),
+ subscript_bounding_box, subscript_style));
+
+ return token_list;
+ }
+
}
diff --git a/graf2d/mathtext/src/mathtext.cxx b/graf2d/mathtext/src/mathtext.cxx
index ae27f80a308..43303cc409b 100644
--- a/graf2d/mathtext/src/mathtext.cxx
+++ b/graf2d/mathtext/src/mathtext.cxx
@@ -25,328 +25,328 @@
namespace mathtext {
- /////////////////////////////////////////////////////////////////
-
- void math_text_t::field_t::transform_script(void)
- {
- const unsigned long size = _math_list.size();
-
- if(size < 2)
- return;
-
- std::vector<item_t>::reverse_iterator last =
- _math_list.rbegin();
- std::vector<item_t>::reverse_iterator second_last =
- last + 1;
-
- if(last->_type == item_t::TYPE_ATOM &&
- second_last->_type == item_t::TYPE_ATOM &&
- second_last->_atom._type == atom_t::TYPE_ACC &&
- !(last->_atom._superscript.empty() &&
- last->_atom._subscript.empty())) {
- // Rule 12
- atom_t atom = field_t();
-
- atom._nucleus._math_list.push_back(*second_last);
- atom._nucleus._math_list.push_back(*last);
- atom._superscript =
- atom._nucleus._math_list.back()._atom._superscript;
- atom._subscript =
- atom._nucleus._math_list.back()._atom._subscript;
- atom._nucleus._math_list.back()._atom._superscript =
- field_t();
- atom._nucleus._math_list.back()._atom._subscript =
- field_t();
- _math_list.pop_back();
- _math_list.pop_back();
- _math_list.push_back(item_t(atom));
- }
- }
-
- void math_text_t::field_t::append(const item_t &item)
- {
- _math_list.push_back(item);
- }
-
- // FIXME: Check for malformed "..._a^b_c" (instead of just
- // overwriting)
- void math_text_t::field_t::
- append(const field_t &field, const bool superscript,
- const bool subscript)
- {
- if((superscript || subscript) && _math_list.empty())
- _math_list.push_back(item_t(field_t()));
-
- if(superscript) {
- _math_list.back()._atom._superscript = field;
- transform_script();
- }
- else if(subscript) {
- _math_list.back()._atom._subscript = field;
- transform_script();
- }
- else
- append(item_t(item_t::TYPE_ATOM, atom_t(field)));
- }
-
- void math_text_t::field_t::
- prepend(const unsigned int type,
- const math_symbol_t &math_symbol)
- {
- _math_list.insert(_math_list.begin(),
- item_t(type,
- atom_t(field_t(math_symbol))));
- }
-
- void math_text_t::field_t::
- append(const unsigned int type, const math_symbol_t &math_symbol,
- const bool superscript, const bool subscript)
- {
- if((superscript || subscript) && _math_list.empty())
- _math_list.push_back(item_t(field_t()));
-
- if(superscript) {
- _math_list.back()._atom._superscript =
- field_t(math_symbol);
- transform_script();
- }
- else if(subscript) {
- _math_list.back()._atom._subscript =
- field_t(math_symbol);
- transform_script();
- }
- else
- append(item_t(type, atom_t(field_t(math_symbol))));
- }
-
- math_text_t::field_t::
- field_t(const std::vector<std::string> &str_split,
- const unsigned int default_family)
- : _type(TYPE_MATH_LIST)
- {
- parse_math_list(str_split, default_family);
- }
-
- math_text_t::field_t::
- field_t(const std::string &str_delimiter_left,
- const std::vector<std::string> &str_split,
- const std::string &str_delimiter_right,
- const unsigned int default_family)
- : _type(TYPE_MATH_LIST)
- {
- parse_math_list(str_split, default_family);
-
- const math_symbol_t
- symbol_left(str_delimiter_left, default_family);
-
- prepend(item_t::TYPE_BOUNDARY, symbol_left);
-
- const math_symbol_t
- symbol_right(str_delimiter_right, default_family);
-
- append(item_t::TYPE_BOUNDARY, symbol_right, false, false);
- }
-
- bool math_text_t::field_t::generalized_fraction(void) const
- {
- if(_type == TYPE_MATH_LIST)
- for(std::vector<item_t>::const_iterator iterator =
- _math_list.begin();
- iterator != _math_list.end(); iterator++)
- if(iterator->_type ==
- item_t::TYPE_GENERALIZED_FRACTION)
- return true;
- return false;
- }
-
- void math_text_t::atom_t::classify(void)
- {
- // Only nucleus affects the atom type (Knuth, The TeXbook,
- // 1986, p. 171)
- if(_nucleus._type == field_t::TYPE_MATH_SYMBOL)
- _type = _nucleus._math_symbol._type;
- else if(_nucleus.generalized_fraction())
- _type = atom_t::TYPE_INNER;
- else
- // FIXME: Does TeX flatten compound expressions before
- // classify them?
- _type = TYPE_ORD;
- }
-
- bool math_text_t::atom_t::is_combining_diacritical(void) const
- {
- return _nucleus._type == field_t::TYPE_MATH_SYMBOL &&
- _nucleus._math_symbol.is_combining_diacritical();
- }
-
- unsigned int math_text_t::atom_t::
- spacing(const unsigned int left_type,
- const unsigned int right_type, const bool script)
- {
+ /////////////////////////////////////////////////////////////////
+
+ void math_text_t::field_t::transform_script(void)
+ {
+ const unsigned long size = _math_list.size();
+
+ if(size < 2)
+ return;
+
+ std::vector<item_t>::reverse_iterator last =
+ _math_list.rbegin();
+ std::vector<item_t>::reverse_iterator second_last =
+ last + 1;
+
+ if(last->_type == item_t::TYPE_ATOM &&
+ second_last->_type == item_t::TYPE_ATOM &&
+ second_last->_atom._type == atom_t::TYPE_ACC &&
+ !(last->_atom._superscript.empty() &&
+ last->_atom._subscript.empty())) {
+ // Rule 12
+ atom_t atom = field_t();
+
+ atom._nucleus._math_list.push_back(*second_last);
+ atom._nucleus._math_list.push_back(*last);
+ atom._superscript =
+ atom._nucleus._math_list.back()._atom._superscript;
+ atom._subscript =
+ atom._nucleus._math_list.back()._atom._subscript;
+ atom._nucleus._math_list.back()._atom._superscript =
+ field_t();
+ atom._nucleus._math_list.back()._atom._subscript =
+ field_t();
+ _math_list.pop_back();
+ _math_list.pop_back();
+ _math_list.push_back(item_t(atom));
+ }
+ }
+
+ void math_text_t::field_t::append(const item_t &item)
+ {
+ _math_list.push_back(item);
+ }
+
+ // FIXME: Check for malformed "..._a^b_c" (instead of just
+ // overwriting)
+ void math_text_t::field_t::
+ append(const field_t &field, const bool superscript,
+ const bool subscript)
+ {
+ if((superscript || subscript) && _math_list.empty())
+ _math_list.push_back(item_t(field_t()));
+
+ if(superscript) {
+ _math_list.back()._atom._superscript = field;
+ transform_script();
+ }
+ else if(subscript) {
+ _math_list.back()._atom._subscript = field;
+ transform_script();
+ }
+ else
+ append(item_t(item_t::TYPE_ATOM, atom_t(field)));
+ }
+
+ void math_text_t::field_t::
+ prepend(const unsigned int type,
+ const math_symbol_t &math_symbol)
+ {
+ _math_list.insert(_math_list.begin(),
+ item_t(type,
+ atom_t(field_t(math_symbol))));
+ }
+
+ void math_text_t::field_t::
+ append(const unsigned int type, const math_symbol_t &math_symbol,
+ const bool superscript, const bool subscript)
+ {
+ if((superscript || subscript) && _math_list.empty())
+ _math_list.push_back(item_t(field_t()));
+
+ if(superscript) {
+ _math_list.back()._atom._superscript =
+ field_t(math_symbol);
+ transform_script();
+ }
+ else if(subscript) {
+ _math_list.back()._atom._subscript =
+ field_t(math_symbol);
+ transform_script();
+ }
+ else
+ append(item_t(type, atom_t(field_t(math_symbol))));
+ }
+
+ math_text_t::field_t::
+ field_t(const std::vector<std::string> &str_split,
+ const unsigned int default_family)
+ : _type(TYPE_MATH_LIST)
+ {
+ parse_math_list(str_split, default_family);
+ }
+
+ math_text_t::field_t::
+ field_t(const std::string &str_delimiter_left,
+ const std::vector<std::string> &str_split,
+ const std::string &str_delimiter_right,
+ const unsigned int default_family)
+ : _type(TYPE_MATH_LIST)
+ {
+ parse_math_list(str_split, default_family);
+
+ const math_symbol_t
+ symbol_left(str_delimiter_left, default_family);
+
+ prepend(item_t::TYPE_BOUNDARY, symbol_left);
+
+ const math_symbol_t
+ symbol_right(str_delimiter_right, default_family);
+
+ append(item_t::TYPE_BOUNDARY, symbol_right, false, false);
+ }
+
+ bool math_text_t::field_t::generalized_fraction(void) const
+ {
+ if(_type == TYPE_MATH_LIST)
+ for(std::vector<item_t>::const_iterator iterator =
+ _math_list.begin();
+ iterator != _math_list.end(); iterator++)
+ if(iterator->_type ==
+ item_t::TYPE_GENERALIZED_FRACTION)
+ return true;
+ return false;
+ }
+
+ void math_text_t::atom_t::classify(void)
+ {
+ // Only nucleus affects the atom type (Knuth, The TeXbook,
+ // 1986, p. 171)
+ if(_nucleus._type == field_t::TYPE_MATH_SYMBOL)
+ _type = _nucleus._math_symbol._type;
+ else if(_nucleus.generalized_fraction())
+ _type = atom_t::TYPE_INNER;
+ else
+ // FIXME: Does TeX flatten compound expressions before
+ // classify them?
+ _type = TYPE_ORD;
+ }
+
+ bool math_text_t::atom_t::is_combining_diacritical(void) const
+ {
+ return _nucleus._type == field_t::TYPE_MATH_SYMBOL &&
+ _nucleus._math_symbol.is_combining_diacritical();
+ }
+
+ unsigned int math_text_t::atom_t::
+ spacing(const unsigned int left_type,
+ const unsigned int right_type, const bool script)
+ {
#include "table/mathspacing.h"
- // Since we only handle atom types upto Inner, the upper bound
- // is type <= TYPE_INNER and not type < NTYPE.
- if(left_type == TYPE_UNKNOWN || left_type > TYPE_INNER ||
- right_type == TYPE_UNKNOWN || right_type > TYPE_INNER) {
- // Invalid
- return 0;
- }
-
- int index = ((left_type - TYPE_ORD) << 3) +
- (right_type - TYPE_ORD);
- int space = spacing_table[index];
-
- if(space == nvr) {
- // Invalid
- return 0;
- }
- // Interpret the \nonscript sign, which denotes spaces that
- // should be ignored within the script (and scriptscript)
- // style.
- if(space < 0)
- space = script ? 0 : -space;
-
- return space;
- }
-
- bool math_text_t::item_t::operator==(const item_t &item) const
- {
- switch(_type) {
- case TYPE_GENERALIZED_FRACTION:
- return item._type == TYPE_GENERALIZED_FRACTION;
- break;
- default:
- return false;
- }
- }
-
- std::wstring math_text_t::bad_cast(const std::string string)
- {
- std::wstring wstring;
-
- for(std::string::const_iterator iterator = string.begin();
- iterator != string.end(); iterator++) {
- wstring.push_back(*iterator);
- }
-
- return wstring;
- }
-
- std::wstring math_text_t::utf8_cast(const std::string string)
- {
- std::wstring wstring;
-
- for(std::string::const_iterator iterator = string.begin();
- iterator != string.end();) {
- wchar_t c;
-
- // Skip over byte ordering marks
- if((unsigned char)(*iterator) == 0xef) {
- iterator++;
- if((unsigned char)(*iterator) == 0xbb) {
- iterator++;
- if((unsigned char)(*iterator) == 0xbf) {
- iterator++;
- }
- }
- }
- if((*iterator & 0xf0) == 0xf0) {
- c = (*iterator & 0x7) << 18;
- iterator++;
- if((*iterator & 0xc0) != 0x80) {
- continue;
- }
- c |= (*iterator & 0x3f) << 12;
- iterator++;
- if((*iterator & 0xc0) != 0x80) {
- continue;
- }
- c |= (*iterator & 0x3f) << 6;
- iterator++;
- if((*iterator & 0xc0) != 0x80) {
- continue;
- }
- c |= (*iterator & 0x3f);
- iterator++;
- }
- else if((*iterator & 0xe0) == 0xe0) {
- c = (*iterator & 0xf) << 12;
- iterator++;
- if((*iterator & 0xc0) != 0x80) {
- continue;
- }
- c |= (*iterator & 0x3f) << 6;
- iterator++;
- if((*iterator & 0xc0) != 0x80) {
- continue;
- }
- c |= (*iterator & 0x3f);
- iterator++;
- }
- else if((*iterator & 0xc0) == 0xc0) {
- c = (*iterator & 0x1f) << 6;
- iterator++;
- if((*iterator & 0xc0) != 0x80) {
- continue;
- }
- c |= (*iterator & 0x3f);
- iterator++;
- }
- else if((*iterator & 0x80) == 0x0) {
- c = (*iterator & 0x7f);
- iterator++;
- }
- else {
- iterator++;
- continue;
- }
- wstring.push_back(c);
- }
-
- return wstring;
- }
+ // Since we only handle atom types upto Inner, the upper bound
+ // is type <= TYPE_INNER and not type < NTYPE.
+ if(left_type == TYPE_UNKNOWN || left_type > TYPE_INNER ||
+ right_type == TYPE_UNKNOWN || right_type > TYPE_INNER) {
+ // Invalid
+ return 0;
+ }
+
+ int index = ((left_type - TYPE_ORD) << 3) +
+ (right_type - TYPE_ORD);
+ int space = spacing_table[index];
+
+ if(space == nvr) {
+ // Invalid
+ return 0;
+ }
+ // Interpret the \nonscript sign, which denotes spaces that
+ // should be ignored within the script (and scriptscript)
+ // style.
+ if(space < 0)
+ space = script ? 0 : -space;
+
+ return space;
+ }
+
+ bool math_text_t::item_t::operator==(const item_t &item) const
+ {
+ switch(_type) {
+ case TYPE_GENERALIZED_FRACTION:
+ return item._type == TYPE_GENERALIZED_FRACTION;
+ break;
+ default:
+ return false;
+ }
+ }
+
+ std::wstring math_text_t::bad_cast(const std::string string)
+ {
+ std::wstring wstring;
+
+ for(std::string::const_iterator iterator = string.begin();
+ iterator != string.end(); iterator++) {
+ wstring.push_back(*iterator);
+ }
+
+ return wstring;
+ }
+
+ std::wstring math_text_t::utf8_cast(const std::string string)
+ {
+ std::wstring wstring;
+
+ for(std::string::const_iterator iterator = string.begin();
+ iterator != string.end();) {
+ wchar_t c;
+
+ // Skip over byte ordering marks
+ if((unsigned char)(*iterator) == 0xef) {
+ iterator++;
+ if((unsigned char)(*iterator) == 0xbb) {
+ iterator++;
+ if((unsigned char)(*iterator) == 0xbf) {
+ iterator++;
+ }
+ }
+ }
+ if((*iterator & 0xf0) == 0xf0) {
+ c = (*iterator & 0x7) << 18;
+ iterator++;
+ if((*iterator & 0xc0) != 0x80) {
+ continue;
+ }
+ c |= (*iterator & 0x3f) << 12;
+ iterator++;
+ if((*iterator & 0xc0) != 0x80) {
+ continue;
+ }
+ c |= (*iterator & 0x3f) << 6;
+ iterator++;
+ if((*iterator & 0xc0) != 0x80) {
+ continue;
+ }
+ c |= (*iterator & 0x3f);
+ iterator++;
+ }
+ else if((*iterator & 0xe0) == 0xe0) {
+ c = (*iterator & 0xf) << 12;
+ iterator++;
+ if((*iterator & 0xc0) != 0x80) {
+ continue;
+ }
+ c |= (*iterator & 0x3f) << 6;
+ iterator++;
+ if((*iterator & 0xc0) != 0x80) {
+ continue;
+ }
+ c |= (*iterator & 0x3f);
+ iterator++;
+ }
+ else if((*iterator & 0xc0) == 0xc0) {
+ c = (*iterator & 0x1f) << 6;
+ iterator++;
+ if((*iterator & 0xc0) != 0x80) {
+ continue;
+ }
+ c |= (*iterator & 0x3f);
+ iterator++;
+ }
+ else if((*iterator & 0x80) == 0x0) {
+ c = (*iterator & 0x7f);
+ iterator++;
+ }
+ else {
+ iterator++;
+ continue;
+ }
+ wstring.push_back(c);
+ }
+
+ return wstring;
+ }
#if 0
- std::wstring math_text_t::gb_18030_cast(
- const std::string string)
- {
- }
-
- std::wstring math_text_t::shift_jis_x_0213_cast(
- const std::string string)
- {
- }
-
- std::wstring math_text_t::euc_jis_x_0213_cast(
- const std::string string)
- {
- }
-
- std::wstring math_text_t::ks_x_2901_cast(
- const std::string string)
- {
- }
+ std::wstring math_text_t::gb_18030_cast(
+ const std::string string)
+ {
+ }
+
+ std::wstring math_text_t::shift_jis_x_0213_cast(
+ const std::string string)
+ {
+ }
+
+ std::wstring math_text_t::euc_jis_x_0213_cast(
+ const std::string string)
+ {
+ }
+
+ std::wstring math_text_t::ks_x_2901_cast(
+ const std::string string)
+ {
+ }
#endif
-
- // Apply JIS X 4051:2004
-
- bool math_text_t::well_formed(void) const
- {
- if(_math_list._type != field_t::TYPE_MATH_LIST)
- return false;
- return true;
- }
-
+
+ // Apply JIS X 4051:2004
+
+ bool math_text_t::well_formed(void) const
+ {
+ if(_math_list._type != field_t::TYPE_MATH_LIST)
+ return false;
+ return true;
+ }
+
#if 0
- std::string tex_form(const double x)
- {
- std::string retval;
-
- switch(std::fpclassify(x)) {
- default:
- return retval;
- }
- }
+ std::string tex_form(const double x)
+ {
+ std::string retval;
+
+ switch(std::fpclassify(x)) {
+ default:
+ return retval;
+ }
+ }
#endif
-
+
}
diff --git a/graf2d/mathtext/src/mathtextencode.cxx b/graf2d/mathtext/src/mathtextencode.cxx
index 03e24d99cb8..46295f05f1f 100644
--- a/graf2d/mathtext/src/mathtextencode.cxx
+++ b/graf2d/mathtext/src/mathtextencode.cxx
@@ -33,405 +33,405 @@
namespace mathtext {
- /////////////////////////////////////////////////////////////////
-
- // For the symbol classification, see Knuth, The TeXbook (1986),
- // pp. 434ff.
-
- void math_text_t::math_symbol_t::math_italic_is_upright(void)
- {
- if(_family == FAMILY_MATH_ITALIC) {
- _family = FAMILY_REGULAR;
- }
- else if(_family == FAMILY_MATH_BOLD_ITALIC) {
- _family = FAMILY_BOLD;
- }
- }
-
- void math_text_t::math_symbol_t::math_italic_is_italic(void)
- {
- if(_family == FAMILY_MATH_ITALIC) {
- _family = FAMILY_ITALIC;
- }
- else if(_family == FAMILY_MATH_BOLD_ITALIC) {
- _family = FAMILY_BOLD_ITALIC;
- }
- }
-
- void math_text_t::math_symbol_t::encode_character(void)
- {
- if(_code.size() != 1)
- return;
-
- // Character encoding for plain characters (not a TeX control
- // sequence)
- switch(_code[0]) {
- case '|':
- case '/':
- case '.':
- math_italic_is_upright();
- _glyph = _code[0];
- _type = atom_t::TYPE_ORD;
- break;
- case '+':
- math_italic_is_upright();
- _glyph = _code[0];
- _type = atom_t::TYPE_BIN;
- break;
- case '-':
- math_italic_is_upright();
- _glyph = L'\u2212';
- _type = atom_t::TYPE_BIN;
- break;
- case '*':
- math_italic_is_upright();
- _glyph = L'\u2217';
- _type = atom_t::TYPE_BIN;
- break;
- case '<':
- case '=':
- case '>':
- case ':':
- math_italic_is_upright();
- _glyph = _code[0];
- _type = atom_t::TYPE_REL;
- break;
- case '(':
- case '[':
- math_italic_is_upright();
- _glyph = _code[0];
- _type = atom_t::TYPE_OPEN;
- break;
- case '!':
- case '?':
- case ')':
- case ']':
- math_italic_is_upright();
- _glyph = _code[0];
- _type = atom_t::TYPE_CLOSE;
- break;
- case ',':
- case ';':
- math_italic_is_upright();
- _glyph = _code[0];
- _type = atom_t::TYPE_PUNCT;
- break;
- default:
- if((_code[0] >= 'A' && _code[0] <= 'Z') ||
- (_code[0] >= 'a' && _code[0] <= 'z')) {
- _glyph = _code[0];
- _type = atom_t::TYPE_ORD;
- }
- else if(_code[0] >= '0' && _code[0] <= '9') {
- math_italic_is_upright();
- _glyph = _code[0];
- _type = atom_t::TYPE_ORD;
- }
- }
- }
-
- void math_text_t::math_symbol_t::encode_control_sequence(void)
- {
- // Character encoding for TeX control sequences
+ /////////////////////////////////////////////////////////////////
+
+ // For the symbol classification, see Knuth, The TeXbook (1986),
+ // pp. 434ff.
+
+ void math_text_t::math_symbol_t::math_italic_is_upright(void)
+ {
+ if(_family == FAMILY_MATH_ITALIC) {
+ _family = FAMILY_REGULAR;
+ }
+ else if(_family == FAMILY_MATH_BOLD_ITALIC) {
+ _family = FAMILY_BOLD;
+ }
+ }
+
+ void math_text_t::math_symbol_t::math_italic_is_italic(void)
+ {
+ if(_family == FAMILY_MATH_ITALIC) {
+ _family = FAMILY_ITALIC;
+ }
+ else if(_family == FAMILY_MATH_BOLD_ITALIC) {
+ _family = FAMILY_BOLD_ITALIC;
+ }
+ }
+
+ void math_text_t::math_symbol_t::encode_character(void)
+ {
+ if(_code.size() != 1)
+ return;
+
+ // Character encoding for plain characters (not a TeX control
+ // sequence)
+ switch(_code[0]) {
+ case '|':
+ case '/':
+ case '.':
+ math_italic_is_upright();
+ _glyph = _code[0];
+ _type = atom_t::TYPE_ORD;
+ break;
+ case '+':
+ math_italic_is_upright();
+ _glyph = _code[0];
+ _type = atom_t::TYPE_BIN;
+ break;
+ case '-':
+ math_italic_is_upright();
+ _glyph = L'\u2212';
+ _type = atom_t::TYPE_BIN;
+ break;
+ case '*':
+ math_italic_is_upright();
+ _glyph = L'\u2217';
+ _type = atom_t::TYPE_BIN;
+ break;
+ case '<':
+ case '=':
+ case '>':
+ case ':':
+ math_italic_is_upright();
+ _glyph = _code[0];
+ _type = atom_t::TYPE_REL;
+ break;
+ case '(':
+ case '[':
+ math_italic_is_upright();
+ _glyph = _code[0];
+ _type = atom_t::TYPE_OPEN;
+ break;
+ case '!':
+ case '?':
+ case ')':
+ case ']':
+ math_italic_is_upright();
+ _glyph = _code[0];
+ _type = atom_t::TYPE_CLOSE;
+ break;
+ case ',':
+ case ';':
+ math_italic_is_upright();
+ _glyph = _code[0];
+ _type = atom_t::TYPE_PUNCT;
+ break;
+ default:
+ if((_code[0] >= 'A' && _code[0] <= 'Z') ||
+ (_code[0] >= 'a' && _code[0] <= 'z')) {
+ _glyph = _code[0];
+ _type = atom_t::TYPE_ORD;
+ }
+ else if(_code[0] >= '0' && _code[0] <= '9') {
+ math_italic_is_upright();
+ _glyph = _code[0];
+ _type = atom_t::TYPE_ORD;
+ }
+ }
+ }
+
+ void math_text_t::math_symbol_t::encode_control_sequence(void)
+ {
+ // Character encoding for TeX control sequences
#include "table/mathglyphstd.h"
- const char **lower =
- std::lower_bound(glyph_control_sequence,
- glyph_control_sequence + nglyph,
- _code);
+ const char **lower =
+ std::lower_bound(glyph_control_sequence,
+ glyph_control_sequence + nglyph,
+ _code);
- if(lower < glyph_control_sequence + nglyph &&
+ if(lower < glyph_control_sequence + nglyph &&
#ifdef WIN32
- strncmp(*lower, _code.c_str(), _code.size()) == 0
+ strncmp(*lower, _code.c_str(), _code.size()) == 0
#else // WIN32
- *lower == _code
+ *lower == _code
#endif // WIN32
- ) {
- const unsigned long index =
- lower - glyph_control_sequence;
-
- if(glyph_upright[index])
- math_italic_is_upright();
- _glyph = glyph_code_point[index];
- _type = glyph_type[index];
- }
- }
-
- void math_text_t::math_symbol_t::encode_math_blackboard_bold(void)
- {
- if(_code.size() != 1) {
- return;
- }
-
- if(_code[0] >= 'A' && _code[0] <= 'Z') {
- _family = FAMILY_STIX_REGULAR;
- switch(_code[0]) {
- case 'C': _glyph = L'\u2102'; break;
- case 'H': _glyph = L'\u210d'; break;
- case 'N': _glyph = L'\u2115'; break;
- case 'P': _glyph = L'\u2119'; break;
- case 'Q': _glyph = L'\u211a'; break;
- case 'R': _glyph = L'\u211d'; break;
- case 'Z': _glyph = L'\u2124'; break;
- default: _glyph = L'\U0001d538' + (_code[0] - 'A');
- }
- _type = atom_t::TYPE_ORD;
- }
- else if(_code[0] >= 'a' && _code[0] <= 'z') {
- _family = FAMILY_STIX_REGULAR;
- _glyph = L'\U0001d552' + (_code[0] - 'a');
- _type = atom_t::TYPE_ORD;
- }
- else if(_code[0] >= '0' && _code[0] <= '9') {
- _family = FAMILY_STIX_REGULAR;
- _glyph = L'\U0001d7d8' + (_code[0] - '0');
- _type = atom_t::TYPE_ORD;
- }
- }
-
- void math_text_t::math_symbol_t::encode_math_script_italic(void)
- {
- if(_code.size() != 1) {
- return;
- }
-
- if(_code[0] >= 'A' && _code[0] <= 'Z') {
- _family = FAMILY_STIX_ITALIC;
- switch(_code[0]) {
- case 'H': _glyph = L'\u210b'; break;
- case 'I': _glyph = L'\u2110'; break;
- case 'L': _glyph = L'\u2112'; break;
- case 'P': _glyph = L'\u2118'; break;
- case 'R': _glyph = L'\u211b'; break;
- case 'B': _glyph = L'\u212c'; break;
- case 'E': _glyph = L'\u2130'; break;
- case 'F': _glyph = L'\u2131'; break;
- case 'M': _glyph = L'\u2133'; break;
- default: _glyph = L'\U0001d49c' + (_code[0] - 'A');
- }
- _type = atom_t::TYPE_ORD;
- }
- else if(_code[0] >= 'a' && _code[0] <= 'z') {
- _family = FAMILY_STIX_ITALIC;
- switch(_code[0]) {
- case 'g': _glyph = L'\u210a'; break;
- case 'l': _glyph = L'\u2113'; break;
- case 'e': _glyph = L'\u212f'; break;
- case 'o': _glyph = L'\u2134'; break;
- default: _glyph = L'\U0001d4b6' + (_code[0] - 'a');
- }
- _type = atom_t::TYPE_ORD;
- }
- }
-
- void math_text_t::math_symbol_t::encode_math_script_bold_italic(void)
- {
- if(_code.size() != 1)
- return;
-
- if(_code[0] >= 'A' && _code[0] <= 'Z') {
- _family = FAMILY_STIX_BOLD_ITALIC;
- _glyph = L'\U0001d49c' + (_code[0] - 'A');
- _type = atom_t::TYPE_ORD;
- }
- else if(_code[0] >= 'a' && _code[0] <= 'z') {
- _family = FAMILY_STIX_BOLD_ITALIC;
- _glyph = L'\U0001d4b6' + (_code[0] - 'a');
- _type = atom_t::TYPE_ORD;
- }
- }
-
- void math_text_t::math_symbol_t::encode_math_fraktur_regular(void)
- {
- if(_code.size() != 1)
- return;
-
- if(_code[0] >= 'A' && _code[0] <= 'Z') {
- _family = FAMILY_STIX_REGULAR;
- switch(_code[0]) {
- case 'H': _glyph = L'\u210c'; break;
- case 'I': _glyph = L'\u2111'; break;
- case 'R': _glyph = L'\u211c'; break;
- case 'Z': _glyph = L'\u2128'; break;
- case 'C': _glyph = L'\u212d'; break;
- default: _glyph = L'\U0001d504' + (_code[0] - 'A');
- }
- _type = atom_t::TYPE_ORD;
- }
- else if(_code[0] >= 'a' && _code[0] <= 'z') {
- _family = FAMILY_STIX_REGULAR;
- _glyph = L'\U0001d51e' + (_code[0] - 'a');
- _type = atom_t::TYPE_ORD;
- }
- }
-
- void math_text_t::math_symbol_t::encode_math_fraktur_bold(void)
- {
- if(_code.size() != 1)
- return;
-
- if(_code[0] >= 'A' && _code[0] <= 'Z') {
- _family = FAMILY_STIX_BOLD;
- _glyph = L'\U0001d56c' + (_code[0] - 'A');
- _type = atom_t::TYPE_ORD;
- }
- else if(_code[0] >= 'a' && _code[0] <= 'z') {
- _family = FAMILY_STIX_BOLD;
- _glyph = L'\U0001d586' + (_code[0] - 'a');
- _type = atom_t::TYPE_ORD;
- }
- }
-
- void math_text_t::math_symbol_t::
- encode_math_sans_serif_regular(void)
- {
- if(_code.size() != 1)
- return;
-
- if(_code[0] >= 'A' && _code[0] <= 'Z') {
- _family = FAMILY_STIX_REGULAR;
- _glyph = L'\U0001d5a0' + (_code[0] - 'A');
- _type = atom_t::TYPE_ORD;
- }
- else if(_code[0] >= 'a' && _code[0] <= 'z') {
- _family = FAMILY_STIX_REGULAR;
- _glyph = L'\U0001d5ba' + (_code[0] - 'a');
- _type = atom_t::TYPE_ORD;
- }
- else if(_code[0] >= '0' && _code[0] <= '9') {
- _family = FAMILY_STIX_REGULAR;
- _glyph = L'\U0001d7e2' + (_code[0] - '0');
- _type = atom_t::TYPE_ORD;
- }
- }
-
- void math_text_t::math_symbol_t::
- encode_math_sans_serif_italic(void)
- {
- if(_code.size() != 1)
- return;
-
- if(_code[0] >= 'A' && _code[0] <= 'Z') {
- _family = FAMILY_STIX_ITALIC;
- _glyph = L'\U0001d608' + (_code[0] - 'A');
- _type = atom_t::TYPE_ORD;
- }
- else if(_code[0] >= 'a' && _code[0] <= 'z') {
- _family = FAMILY_STIX_ITALIC;
- _glyph = L'\U0001d622' + (_code[0] - 'a');
- _type = atom_t::TYPE_ORD;
- }
- }
-
- void math_text_t::math_symbol_t::
- encode_math_sans_serif_bold(void)
- {
- if(_code.size() != 1)
- return;
-
- if(_code[0] >= 'A' && _code[0] <= 'Z') {
- _family = FAMILY_STIX_BOLD;
- _glyph = L'\U0001d5d4' + (_code[0] - 'A');
- _type = atom_t::TYPE_ORD;
- }
- else if(_code[0] >= 'a' && _code[0] <= 'z') {
- _family = FAMILY_STIX_BOLD;
- _glyph = L'\U0001d5ee' + (_code[0] - 'a');
- _type = atom_t::TYPE_ORD;
- }
- else if(_code[0] >= '0' && _code[0] <= '9') {
- _family = FAMILY_STIX_BOLD;
- _glyph = L'\U0001d7ec' + (_code[0] - '0');
- _type = atom_t::TYPE_ORD;
- }
- }
-
- void math_text_t::math_symbol_t::
- encode_math_sans_serif_bold_italic(void)
- {
- if(_code.size() != 1)
- return;
-
- if(_code[0] >= 'A' && _code[0] <= 'Z') {
- _family = FAMILY_STIX_BOLD_ITALIC;
- _glyph = L'\U0001d63c' + (_code[0] - 'A');
- _type = atom_t::TYPE_ORD;
- }
- else if(_code[0] >= 'a' && _code[0] <= 'z') {
- _family = FAMILY_STIX_BOLD_ITALIC;
- _glyph = L'\U0001d656' + (_code[0] - 'a');
- _type = atom_t::TYPE_ORD;
- }
- }
-
- void math_text_t::math_symbol_t::encode_math_alpha(void)
- {
- switch(_family) {
- case FAMILY_MATH_BLACKBOARD_BOLD:
- encode_math_blackboard_bold();
- break;
- case FAMILY_MATH_SCRIPT_ITALIC:
- encode_math_script_italic();
- break;
- case FAMILY_MATH_SCRIPT_BOLD_ITALIC:
- encode_math_script_bold_italic();
- break;
- case FAMILY_MATH_FRAKTUR_REGULAR:
- encode_math_fraktur_regular();
- break;
- case FAMILY_MATH_FRAKTUR_BOLD:
- encode_math_fraktur_bold();
- break;
- case FAMILY_MATH_SANS_SERIF_REGULAR:
- encode_math_sans_serif_regular();
- break;
- case FAMILY_MATH_SANS_SERIF_ITALIC:
- encode_math_sans_serif_italic();
- break;
- case FAMILY_MATH_SANS_SERIF_BOLD:
- encode_math_sans_serif_bold();
- break;
- case FAMILY_MATH_SANS_SERIF_BOLD_ITALIC:
- encode_math_sans_serif_bold_italic();
- break;
- }
- }
-
- void math_text_t::math_symbol_t::encode(void)
- {
- encode_character();
- encode_control_sequence();
- encode_math_alpha();
- math_italic_is_italic();
- if(_family > FAMILY_STIX_SIZE_5_REGULAR) {
- std::cerr << __FILE__ << ':' << __LINE__
- << ": error: encoding results in a "
- "nonphysical font family" << std::endl;
- }
- }
-
- bool math_text_t::math_symbol_t::bold(void) const
- {
- switch(_family) {
- case FAMILY_BOLD:
- case FAMILY_BOLD_ITALIC:
- case FAMILY_STIX_BOLD:
- case FAMILY_STIX_BOLD_ITALIC:
- case FAMILY_STIX_SIZE_1_BOLD:
- case FAMILY_STIX_SIZE_2_BOLD:
- case FAMILY_STIX_SIZE_3_BOLD:
- case FAMILY_STIX_SIZE_4_BOLD:
- case FAMILY_MATH_BOLD_ITALIC:
- case FAMILY_MATH_SCRIPT_BOLD_ITALIC:
- case FAMILY_MATH_FRAKTUR_BOLD:
- case FAMILY_MATH_BLACKBOARD_BOLD:
- case FAMILY_MATH_SANS_SERIF_BOLD:
- case FAMILY_MATH_SANS_SERIF_BOLD_ITALIC:
- return true;
- default:
- return false;
- }
- }
-
+ ) {
+ const unsigned long index =
+ lower - glyph_control_sequence;
+
+ if(glyph_upright[index])
+ math_italic_is_upright();
+ _glyph = glyph_code_point[index];
+ _type = glyph_type[index];
+ }
+ }
+
+ void math_text_t::math_symbol_t::encode_math_blackboard_bold(void)
+ {
+ if(_code.size() != 1) {
+ return;
+ }
+
+ if(_code[0] >= 'A' && _code[0] <= 'Z') {
+ _family = FAMILY_STIX_REGULAR;
+ switch(_code[0]) {
+ case 'C': _glyph = L'\u2102'; break;
+ case 'H': _glyph = L'\u210d'; break;
+ case 'N': _glyph = L'\u2115'; break;
+ case 'P': _glyph = L'\u2119'; break;
+ case 'Q': _glyph = L'\u211a'; break;
+ case 'R': _glyph = L'\u211d'; break;
+ case 'Z': _glyph = L'\u2124'; break;
+ default: _glyph = L'\U0001d538' + (_code[0] - 'A');
+ }
+ _type = atom_t::TYPE_ORD;
+ }
+ else if(_code[0] >= 'a' && _code[0] <= 'z') {
+ _family = FAMILY_STIX_REGULAR;
+ _glyph = L'\U0001d552' + (_code[0] - 'a');
+ _type = atom_t::TYPE_ORD;
+ }
+ else if(_code[0] >= '0' && _code[0] <= '9') {
+ _family = FAMILY_STIX_REGULAR;
+ _glyph = L'\U0001d7d8' + (_code[0] - '0');
+ _type = atom_t::TYPE_ORD;
+ }
+ }
+
+ void math_text_t::math_symbol_t::encode_math_script_italic(void)
+ {
+ if(_code.size() != 1) {
+ return;
+ }
+
+ if(_code[0] >= 'A' && _code[0] <= 'Z') {
+ _family = FAMILY_STIX_ITALIC;
+ switch(_code[0]) {
+ case 'H': _glyph = L'\u210b'; break;
+ case 'I': _glyph = L'\u2110'; break;
+ case 'L': _glyph = L'\u2112'; break;
+ case 'P': _glyph = L'\u2118'; break;
+ case 'R': _glyph = L'\u211b'; break;
+ case 'B': _glyph = L'\u212c'; break;
+ case 'E': _glyph = L'\u2130'; break;
+ case 'F': _glyph = L'\u2131'; break;
+ case 'M': _glyph = L'\u2133'; break;
+ default: _glyph = L'\U0001d49c' + (_code[0] - 'A');
+ }
+ _type = atom_t::TYPE_ORD;
+ }
+ else if(_code[0] >= 'a' && _code[0] <= 'z') {
+ _family = FAMILY_STIX_ITALIC;
+ switch(_code[0]) {
+ case 'g': _glyph = L'\u210a'; break;
+ case 'l': _glyph = L'\u2113'; break;
+ case 'e': _glyph = L'\u212f'; break;
+ case 'o': _glyph = L'\u2134'; break;
+ default: _glyph = L'\U0001d4b6' + (_code[0] - 'a');
+ }
+ _type = atom_t::TYPE_ORD;
+ }
+ }
+
+ void math_text_t::math_symbol_t::encode_math_script_bold_italic(void)
+ {
+ if(_code.size() != 1)
+ return;
+
+ if(_code[0] >= 'A' && _code[0] <= 'Z') {
+ _family = FAMILY_STIX_BOLD_ITALIC;
+ _glyph = L'\U0001d49c' + (_code[0] - 'A');
+ _type = atom_t::TYPE_ORD;
+ }
+ else if(_code[0] >= 'a' && _code[0] <= 'z') {
+ _family = FAMILY_STIX_BOLD_ITALIC;
+ _glyph = L'\U0001d4b6' + (_code[0] - 'a');
+ _type = atom_t::TYPE_ORD;
+ }
+ }
+
+ void math_text_t::math_symbol_t::encode_math_fraktur_regular(void)
+ {
+ if(_code.size() != 1)
+ return;
+
+ if(_code[0] >= 'A' && _code[0] <= 'Z') {
+ _family = FAMILY_STIX_REGULAR;
+ switch(_code[0]) {
+ case 'H': _glyph = L'\u210c'; break;
+ case 'I': _glyph = L'\u2111'; break;
+ case 'R': _glyph = L'\u211c'; break;
+ case 'Z': _glyph = L'\u2128'; break;
+ case 'C': _glyph = L'\u212d'; break;
+ default: _glyph = L'\U0001d504' + (_code[0] - 'A');
+ }
+ _type = atom_t::TYPE_ORD;
+ }
+ else if(_code[0] >= 'a' && _code[0] <= 'z') {
+ _family = FAMILY_STIX_REGULAR;
+ _glyph = L'\U0001d51e' + (_code[0] - 'a');
+ _type = atom_t::TYPE_ORD;
+ }
+ }
+
+ void math_text_t::math_symbol_t::encode_math_fraktur_bold(void)
+ {
+ if(_code.size() != 1)
+ return;
+
+ if(_code[0] >= 'A' && _code[0] <= 'Z') {
+ _family = FAMILY_STIX_BOLD;
+ _glyph = L'\U0001d56c' + (_code[0] - 'A');
+ _type = atom_t::TYPE_ORD;
+ }
+ else if(_code[0] >= 'a' && _code[0] <= 'z') {
+ _family = FAMILY_STIX_BOLD;
+ _glyph = L'\U0001d586' + (_code[0] - 'a');
+ _type = atom_t::TYPE_ORD;
+ }
+ }
+
+ void math_text_t::math_symbol_t::
+ encode_math_sans_serif_regular(void)
+ {
+ if(_code.size() != 1)
+ return;
+
+ if(_code[0] >= 'A' && _code[0] <= 'Z') {
+ _family = FAMILY_STIX_REGULAR;
+ _glyph = L'\U0001d5a0' + (_code[0] - 'A');
+ _type = atom_t::TYPE_ORD;
+ }
+ else if(_code[0] >= 'a' && _code[0] <= 'z') {
+ _family = FAMILY_STIX_REGULAR;
+ _glyph = L'\U0001d5ba' + (_code[0] - 'a');
+ _type = atom_t::TYPE_ORD;
+ }
+ else if(_code[0] >= '0' && _code[0] <= '9') {
+ _family = FAMILY_STIX_REGULAR;
+ _glyph = L'\U0001d7e2' + (_code[0] - '0');
+ _type = atom_t::TYPE_ORD;
+ }
+ }
+
+ void math_text_t::math_symbol_t::
+ encode_math_sans_serif_italic(void)
+ {
+ if(_code.size() != 1)
+ return;
+
+ if(_code[0] >= 'A' && _code[0] <= 'Z') {
+ _family = FAMILY_STIX_ITALIC;
+ _glyph = L'\U0001d608' + (_code[0] - 'A');
+ _type = atom_t::TYPE_ORD;
+ }
+ else if(_code[0] >= 'a' && _code[0] <= 'z') {
+ _family = FAMILY_STIX_ITALIC;
+ _glyph = L'\U0001d622' + (_code[0] - 'a');
+ _type = atom_t::TYPE_ORD;
+ }
+ }
+
+ void math_text_t::math_symbol_t::
+ encode_math_sans_serif_bold(void)
+ {
+ if(_code.size() != 1)
+ return;
+
+ if(_code[0] >= 'A' && _code[0] <= 'Z') {
+ _family = FAMILY_STIX_BOLD;
+ _glyph = L'\U0001d5d4' + (_code[0] - 'A');
+ _type = atom_t::TYPE_ORD;
+ }
+ else if(_code[0] >= 'a' && _code[0] <= 'z') {
+ _family = FAMILY_STIX_BOLD;
+ _glyph = L'\U0001d5ee' + (_code[0] - 'a');
+ _type = atom_t::TYPE_ORD;
+ }
+ else if(_code[0] >= '0' && _code[0] <= '9') {
+ _family = FAMILY_STIX_BOLD;
+ _glyph = L'\U0001d7ec' + (_code[0] - '0');
+ _type = atom_t::TYPE_ORD;
+ }
+ }
+
+ void math_text_t::math_symbol_t::
+ encode_math_sans_serif_bold_italic(void)
+ {
+ if(_code.size() != 1)
+ return;
+
+ if(_code[0] >= 'A' && _code[0] <= 'Z') {
+ _family = FAMILY_STIX_BOLD_ITALIC;
+ _glyph = L'\U0001d63c' + (_code[0] - 'A');
+ _type = atom_t::TYPE_ORD;
+ }
+ else if(_code[0] >= 'a' && _code[0] <= 'z') {
+ _family = FAMILY_STIX_BOLD_ITALIC;
+ _glyph = L'\U0001d656' + (_code[0] - 'a');
+ _type = atom_t::TYPE_ORD;
+ }
+ }
+
+ void math_text_t::math_symbol_t::encode_math_alpha(void)
+ {
+ switch(_family) {
+ case FAMILY_MATH_BLACKBOARD_BOLD:
+ encode_math_blackboard_bold();
+ break;
+ case FAMILY_MATH_SCRIPT_ITALIC:
+ encode_math_script_italic();
+ break;
+ case FAMILY_MATH_SCRIPT_BOLD_ITALIC:
+ encode_math_script_bold_italic();
+ break;
+ case FAMILY_MATH_FRAKTUR_REGULAR:
+ encode_math_fraktur_regular();
+ break;
+ case FAMILY_MATH_FRAKTUR_BOLD:
+ encode_math_fraktur_bold();
+ break;
+ case FAMILY_MATH_SANS_SERIF_REGULAR:
+ encode_math_sans_serif_regular();
+ break;
+ case FAMILY_MATH_SANS_SERIF_ITALIC:
+ encode_math_sans_serif_italic();
+ break;
+ case FAMILY_MATH_SANS_SERIF_BOLD:
+ encode_math_sans_serif_bold();
+ break;
+ case FAMILY_MATH_SANS_SERIF_BOLD_ITALIC:
+ encode_math_sans_serif_bold_italic();
+ break;
+ }
+ }
+
+ void math_text_t::math_symbol_t::encode(void)
+ {
+ encode_character();
+ encode_control_sequence();
+ encode_math_alpha();
+ math_italic_is_italic();
+ if(_family > FAMILY_STIX_SIZE_5_REGULAR) {
+ std::cerr << __FILE__ << ':' << __LINE__
+ << ": error: encoding results in a "
+ "nonphysical font family" << std::endl;
+ }
+ }
+
+ bool math_text_t::math_symbol_t::bold(void) const
+ {
+ switch(_family) {
+ case FAMILY_BOLD:
+ case FAMILY_BOLD_ITALIC:
+ case FAMILY_STIX_BOLD:
+ case FAMILY_STIX_BOLD_ITALIC:
+ case FAMILY_STIX_SIZE_1_BOLD:
+ case FAMILY_STIX_SIZE_2_BOLD:
+ case FAMILY_STIX_SIZE_3_BOLD:
+ case FAMILY_STIX_SIZE_4_BOLD:
+ case FAMILY_MATH_BOLD_ITALIC:
+ case FAMILY_MATH_SCRIPT_BOLD_ITALIC:
+ case FAMILY_MATH_FRAKTUR_BOLD:
+ case FAMILY_MATH_BLACKBOARD_BOLD:
+ case FAMILY_MATH_SANS_SERIF_BOLD:
+ case FAMILY_MATH_SANS_SERIF_BOLD_ITALIC:
+ return true;
+ default:
+ return false;
+ }
+ }
+
}
#ifdef WIN32
#pragma warning( pop )
diff --git a/graf2d/mathtext/src/mathtextparse.cxx b/graf2d/mathtext/src/mathtextparse.cxx
index 58f8d638ebf..9220eb788e4 100644
--- a/graf2d/mathtext/src/mathtextparse.cxx
+++ b/graf2d/mathtext/src/mathtextparse.cxx
@@ -26,433 +26,433 @@
namespace mathtext {
- /////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////
- void math_text_t::field_t::
- parse_math_list(const std::vector<std::string> &str_split,
- const unsigned int default_family)
- {
+ void math_text_t::field_t::
+ parse_math_list(const std::vector<std::string> &str_split,
+ const unsigned int default_family)
+ {
#if 0
- std::cerr << "parsing [";
- for(std::vector<std::string>::const_iterator iterator =
- str_split.begin();
- iterator != str_split.end(); iterator++)
- std::cerr << '"' << *iterator << "\", ";
- std::cerr << ']' << std::endl;
+ std::cerr << "parsing [";
+ for(std::vector<std::string>::const_iterator iterator =
+ str_split.begin();
+ iterator != str_split.end(); iterator++)
+ std::cerr << '"' << *iterator << "\", ";
+ std::cerr << ']' << std::endl;
#endif
- // State of radical parsing
- enum {
- RADICAL_STATE_NONE = 0,
- RADICAL_STATE_RADICAND,
- RADICAL_STATE_OF,
- RADICAL_STATE_INDEX
- };
-
- unsigned int family = default_family;
- int level = 0;
- int delimiter_level = 0;
- std::vector<std::string> buffer;
+ // State of radical parsing
+ enum {
+ RADICAL_STATE_NONE = 0,
+ RADICAL_STATE_RADICAND,
+ RADICAL_STATE_OF,
+ RADICAL_STATE_INDEX
+ };
+
+ unsigned int family = default_family;
+ int level = 0;
+ int delimiter_level = 0;
+ std::vector<std::string> buffer;
#if 1
- bool superscript = false;
- bool subscript = false;
- bool delimiter_right = false;
- unsigned int radical_state = RADICAL_STATE_NONE;
- std::vector<std::string> radical_index;
- bool horizontal_box = false;
-
- for(std::vector<std::string>::const_iterator iterator =
- str_split.begin();
- iterator != str_split.end(); iterator++) {
- // ONLY LEVEL 0 superscript and subscript are interpreted,
- // and they are ignored afterwards.
- if(level == 0 && delimiter_level == 0) {
- if((*iterator)[0] == '^') {
- superscript = true;
- continue;
- }
- else if((*iterator)[0] == '_') {
- subscript = true;
- continue;
- }
- else if(*iterator == "\\sqrt") {
- radical_state = RADICAL_STATE_RADICAND;
- radical_index = std::vector<std::string>();
- continue;
- }
- else if(iterator->substr(0, 5) == "\\root") {
- radical_state = RADICAL_STATE_INDEX;
- continue;
- }
- else if(radical_state == RADICAL_STATE_INDEX &&
- *iterator == "\\of") {
- radical_index = buffer;
- buffer.clear();
- radical_state = RADICAL_STATE_RADICAND;
- continue;
- }
- else if(iterator->substr(0, 5) == "\\hbox" ||
- iterator->substr(0, 5) == "\\text") {
- horizontal_box = true;
- continue;
- }
-
- const char **lower;
+ bool superscript = false;
+ bool subscript = false;
+ bool delimiter_right = false;
+ unsigned int radical_state = RADICAL_STATE_NONE;
+ std::vector<std::string> radical_index;
+ bool horizontal_box = false;
+
+ for(std::vector<std::string>::const_iterator iterator =
+ str_split.begin();
+ iterator != str_split.end(); iterator++) {
+ // ONLY LEVEL 0 superscript and subscript are interpreted,
+ // and they are ignored afterwards.
+ if(level == 0 && delimiter_level == 0) {
+ if((*iterator)[0] == '^') {
+ superscript = true;
+ continue;
+ }
+ else if((*iterator)[0] == '_') {
+ subscript = true;
+ continue;
+ }
+ else if(*iterator == "\\sqrt") {
+ radical_state = RADICAL_STATE_RADICAND;
+ radical_index = std::vector<std::string>();
+ continue;
+ }
+ else if(iterator->substr(0, 5) == "\\root") {
+ radical_state = RADICAL_STATE_INDEX;
+ continue;
+ }
+ else if(radical_state == RADICAL_STATE_INDEX &&
+ *iterator == "\\of") {
+ radical_index = buffer;
+ buffer.clear();
+ radical_state = RADICAL_STATE_RADICAND;
+ continue;
+ }
+ else if(iterator->substr(0, 5) == "\\hbox" ||
+ iterator->substr(0, 5) == "\\text") {
+ horizontal_box = true;
+ continue;
+ }
+
+ const char **lower;
#include "table/mathfontch.h"
- lower = std::lower_bound(
- font_change_control_sequence,
- font_change_control_sequence + nfont_change,
- *iterator);
-
- if(lower <
- font_change_control_sequence + nfont_change &&
- *lower == *iterator) {
- const unsigned long index =
- lower - font_change_control_sequence;
-
- family = font_change_family[index];
- continue;
- }
+ lower = std::lower_bound(
+ font_change_control_sequence,
+ font_change_control_sequence + nfont_change,
+ *iterator);
+
+ if(lower <
+ font_change_control_sequence + nfont_change &&
+ *lower == *iterator) {
+ const unsigned long index =
+ lower - font_change_control_sequence;
+
+ family = font_change_family[index];
+ continue;
+ }
#include "table/mathopstd.h"
- lower = std::lower_bound(
- operator_control_sequence,
- operator_control_sequence + noperator,
- *iterator);
- if(lower <
- operator_control_sequence + noperator &&
- *lower == *iterator) {
- const unsigned long index =
- lower - operator_control_sequence;
-
- if(operator_code_point[index] == L'\0') {
- // Operator defined with \mathop
- const field_t operator_math_list(field_t(
- tex_split(operator_content[index]),
- math_symbol_t::FAMILY_REGULAR));
- atom_t atom(atom_t::TYPE_OP, field_t(
- operator_math_list));
-
- atom._limits = operator_nolimits[index] ?
- atom_t::LIMITS_NOLIMITS :
- atom_t::LIMITS_DISPLAYLIMITS;
- append(atom);
- }
- else {
- // Operator defined with \mathchardef
- const field_t operator_math_symbol(
- math_symbol_t(
- *iterator,
- operator_code_point[index],
- math_symbol_t::FAMILY_REGULAR));
- atom_t atom(atom_t::TYPE_OP, field_t(
- operator_math_symbol));
-
- atom._limits = operator_nolimits[index] ?
- atom_t::LIMITS_NOLIMITS :
- atom_t::LIMITS_DISPLAYLIMITS;
- append(atom);
- }
- continue;
- }
- }
-
- if((*iterator)[0] == '}') {
- level--;
- // When the level decreases to 0 here, the compound
- // expression is complete, create a subfield and
- // append it to the math list.
- if(level == 0 && delimiter_level == 0) {
- // Create subfields recursively
- const field_t subfield(buffer, family);
-
- if(radical_state == RADICAL_STATE_RADICAND) {
- atom_t atom(atom_t::TYPE_RAD, subfield);
-
- atom._index = field_t(radical_index, family);
- append(item_t(atom));
- radical_state = RADICAL_STATE_NONE;
- }
- else
- append(subfield, superscript, subscript);
- buffer.clear();
- }
- }
- else if(*iterator == "\\right") {
- delimiter_level--;
- // When the delimtier level decreases to 0 here, the
- // compound expression is complete, create a subfield
- // and append it with the appropriate delimiter atoms
- // to the math list.
- if(level == 0 && delimiter_level == 0) {
- delimiter_right = true;
- continue;
- }
- }
-
- /////////////////////////////////////////////////////////
+ lower = std::lower_bound(
+ operator_control_sequence,
+ operator_control_sequence + noperator,
+ *iterator);
+ if(lower <
+ operator_control_sequence + noperator &&
+ *lower == *iterator) {
+ const unsigned long index =
+ lower - operator_control_sequence;
+
+ if(operator_code_point[index] == L'\0') {
+ // Operator defined with \mathop
+ const field_t operator_math_list(field_t(
+ tex_split(operator_content[index]),
+ math_symbol_t::FAMILY_REGULAR));
+ atom_t atom(atom_t::TYPE_OP, field_t(
+ operator_math_list));
+
+ atom._limits = operator_nolimits[index] ?
+ atom_t::LIMITS_NOLIMITS :
+ atom_t::LIMITS_DISPLAYLIMITS;
+ append(atom);
+ }
+ else {
+ // Operator defined with \mathchardef
+ const field_t operator_math_symbol(
+ math_symbol_t(
+ *iterator,
+ operator_code_point[index],
+ math_symbol_t::FAMILY_REGULAR));
+ atom_t atom(atom_t::TYPE_OP, field_t(
+ operator_math_symbol));
+
+ atom._limits = operator_nolimits[index] ?
+ atom_t::LIMITS_NOLIMITS :
+ atom_t::LIMITS_DISPLAYLIMITS;
+ append(atom);
+ }
+ continue;
+ }
+ }
+
+ if((*iterator)[0] == '}') {
+ level--;
+ // When the level decreases to 0 here, the compound
+ // expression is complete, create a subfield and
+ // append it to the math list.
+ if(level == 0 && delimiter_level == 0) {
+ // Create subfields recursively
+ const field_t subfield(buffer, family);
+
+ if(radical_state == RADICAL_STATE_RADICAND) {
+ atom_t atom(atom_t::TYPE_RAD, subfield);
+
+ atom._index = field_t(radical_index, family);
+ append(item_t(atom));
+ radical_state = RADICAL_STATE_NONE;
+ }
+ else
+ append(subfield, superscript, subscript);
+ buffer.clear();
+ }
+ }
+ else if(*iterator == "\\right") {
+ delimiter_level--;
+ // When the delimtier level decreases to 0 here, the
+ // compound expression is complete, create a subfield
+ // and append it with the appropriate delimiter atoms
+ // to the math list.
+ if(level == 0 && delimiter_level == 0) {
+ delimiter_right = true;
+ continue;
+ }
+ }
+
+ /////////////////////////////////////////////////////////
#if 0
- std::cerr << __FILE__ << ':' << __LINE__
- << ": L" << level << ", DL"
- << delimiter_level << ", hbox = "
- << horizontal_box << ", *iterator = "
- << *iterator << std::endl;
+ std::cerr << __FILE__ << ':' << __LINE__
+ << ": L" << level << ", DL"
+ << delimiter_level << ", hbox = "
+ << horizontal_box << ", *iterator = "
+ << *iterator << std::endl;
#endif
- if(level > 0 || delimiter_level > 0 ||
- radical_state == RADICAL_STATE_INDEX) {
- buffer.push_back(*iterator);
- }
- else if(delimiter_right) {
- const std::string left = buffer.front();
-
- buffer.erase(buffer.begin());
-
- const field_t subfield(left, buffer, *iterator,
- family);
-
- if(radical_state == RADICAL_STATE_RADICAND) {
- atom_t atom(atom_t::TYPE_RAD, subfield);
-
- atom._index = field_t(radical_index, family);
- append(item_t(atom));
- radical_state = RADICAL_STATE_NONE;
- }
- else
- append(subfield, superscript, subscript);
- buffer.clear();
- }
- else if(horizontal_box) {
- box_t box(math_text_t::utf8_cast(*iterator));
-
- append(field_t(box), superscript, subscript);
- }
- else if((*iterator)[0] != '{' &&
- (*iterator)[0] != '}' &&
- *iterator != "\\left" &&
- *iterator != "\\right") {
- if(radical_state == RADICAL_STATE_RADICAND) {
- const field_t subfield(
- std::vector<std::string>(1, *iterator),
- family);
- atom_t atom(atom_t::TYPE_RAD, subfield);
-
- atom._index = field_t(radical_index, family);
- append(item_t(atom));
- }
- // FIXME: This should be a true table
- else if(*iterator == "\\over") {
- append(item_t(item_t::TYPE_GENERALIZED_FRACTION,
- 1.0F));
- }
- else if(*iterator == "\\atop") {
- append(item_t(item_t::TYPE_GENERALIZED_FRACTION,
- 0.0F));
- }
- // FIXME: This should be a true table
- else if(*iterator == "\\!") {
- append(item_t(item_t::TYPE_KERN, -3.0F));
- }
- else if(*iterator == "\\,") {
- append(item_t(item_t::TYPE_KERN, 3.0F));
- }
- else if(*iterator == "\\:") {
- append(item_t(item_t::TYPE_KERN, 4.0F));
- }
- else if(*iterator == "\\;") {
- append(item_t(item_t::TYPE_KERN, 5.0F));
- }
- else if(*iterator == "\\quad") {
- append(item_t(item_t::TYPE_KERN, 18.0F));
- }
- else if(*iterator == "\\qquad") {
- append(item_t(item_t::TYPE_KERN, 36.0F));
- }
- else {
- const math_symbol_t
- math_symbol(*iterator, family);
-
- append(item_t::TYPE_ATOM, math_symbol,
- superscript, subscript);
- }
- }
-
- if((*iterator)[0] == '{') {
- level++;
- }
- else if(*iterator == "\\left") {
- // Since the actual delimiter follows, it is going to
- // be appended to the buffer "automatically".
- delimiter_level++;
- }
- // Reset superscript and subscript flags only for level 0
- if(level == 0 && delimiter_level == 0 &&
- (radical_state == RADICAL_STATE_RADICAND ||
- radical_state == RADICAL_STATE_NONE)) {
- superscript = false;
- subscript = false;
- delimiter_right = false;
- radical_state = RADICAL_STATE_NONE;
- family = default_family;
- horizontal_box = false;
- }
- }
+ if(level > 0 || delimiter_level > 0 ||
+ radical_state == RADICAL_STATE_INDEX) {
+ buffer.push_back(*iterator);
+ }
+ else if(delimiter_right) {
+ const std::string left = buffer.front();
+
+ buffer.erase(buffer.begin());
+
+ const field_t subfield(left, buffer, *iterator,
+ family);
+
+ if(radical_state == RADICAL_STATE_RADICAND) {
+ atom_t atom(atom_t::TYPE_RAD, subfield);
+
+ atom._index = field_t(radical_index, family);
+ append(item_t(atom));
+ radical_state = RADICAL_STATE_NONE;
+ }
+ else
+ append(subfield, superscript, subscript);
+ buffer.clear();
+ }
+ else if(horizontal_box) {
+ box_t box(math_text_t::utf8_cast(*iterator));
+
+ append(field_t(box), superscript, subscript);
+ }
+ else if((*iterator)[0] != '{' &&
+ (*iterator)[0] != '}' &&
+ *iterator != "\\left" &&
+ *iterator != "\\right") {
+ if(radical_state == RADICAL_STATE_RADICAND) {
+ const field_t subfield(
+ std::vector<std::string>(1, *iterator),
+ family);
+ atom_t atom(atom_t::TYPE_RAD, subfield);
+
+ atom._index = field_t(radical_index, family);
+ append(item_t(atom));
+ }
+ // FIXME: This should be a true table
+ else if(*iterator == "\\over") {
+ append(item_t(item_t::TYPE_GENERALIZED_FRACTION,
+ 1.0F));
+ }
+ else if(*iterator == "\\atop") {
+ append(item_t(item_t::TYPE_GENERALIZED_FRACTION,
+ 0.0F));
+ }
+ // FIXME: This should be a true table
+ else if(*iterator == "\\!") {
+ append(item_t(item_t::TYPE_KERN, -3.0F));
+ }
+ else if(*iterator == "\\,") {
+ append(item_t(item_t::TYPE_KERN, 3.0F));
+ }
+ else if(*iterator == "\\:") {
+ append(item_t(item_t::TYPE_KERN, 4.0F));
+ }
+ else if(*iterator == "\\;") {
+ append(item_t(item_t::TYPE_KERN, 5.0F));
+ }
+ else if(*iterator == "\\quad") {
+ append(item_t(item_t::TYPE_KERN, 18.0F));
+ }
+ else if(*iterator == "\\qquad") {
+ append(item_t(item_t::TYPE_KERN, 36.0F));
+ }
+ else {
+ const math_symbol_t
+ math_symbol(*iterator, family);
+
+ append(item_t::TYPE_ATOM, math_symbol,
+ superscript, subscript);
+ }
+ }
+
+ if((*iterator)[0] == '{') {
+ level++;
+ }
+ else if(*iterator == "\\left") {
+ // Since the actual delimiter follows, it is going to
+ // be appended to the buffer "automatically".
+ delimiter_level++;
+ }
+ // Reset superscript and subscript flags only for level 0
+ if(level == 0 && delimiter_level == 0 &&
+ (radical_state == RADICAL_STATE_RADICAND ||
+ radical_state == RADICAL_STATE_NONE)) {
+ superscript = false;
+ subscript = false;
+ delimiter_right = false;
+ radical_state = RADICAL_STATE_NONE;
+ family = default_family;
+ horizontal_box = false;
+ }
+ }
#else
- for(std::vector<std::string>::const_iterator iterator =
- str_split.begin();
- iterator != str_split.end(); iterator++) {
- if((*iterator)[0] == '}') {
- level--;
-
- }
- else if(*iterator == "\\right") {
- delimiter_level--;
- }
- if((*iterator)[0] == '{') {
- level++;
- }
- else if(*iterator == "\\left") {
- // Since the actual delimiter follows, it is going to
- // be appended to the buffer "automatically".
- delimiter_level++;
- }
- else if(level == 0 && delimiter_level == 0) {
+ for(std::vector<std::string>::const_iterator iterator =
+ str_split.begin();
+ iterator != str_split.end(); iterator++) {
+ if((*iterator)[0] == '}') {
+ level--;
+
+ }
+ else if(*iterator == "\\right") {
+ delimiter_level--;
+ }
+ if((*iterator)[0] == '{') {
+ level++;
+ }
+ else if(*iterator == "\\left") {
+ // Since the actual delimiter follows, it is going to
+ // be appended to the buffer "automatically".
+ delimiter_level++;
+ }
+ else if(level == 0 && delimiter_level == 0) {
#if 1
- std::cerr << __FILE__ << ':' << __LINE__
- << ": L" << level << ", DL"
- << delimiter_level << ", *iterator = "
- << *iterator << ", buffer = { ";
- for(std::vector<std::string>::const_iterator
- buffer_iterator = buffer.begin();
- buffer_iterator != buffer.end(); buffer_iterator++) {
- std::cerr << '"' << *buffer_iterator << "\" ";
- }
- std::cerr << '}' << std::endl;
+ std::cerr << __FILE__ << ':' << __LINE__
+ << ": L" << level << ", DL"
+ << delimiter_level << ", *iterator = "
+ << *iterator << ", buffer = { ";
+ for(std::vector<std::string>::const_iterator
+ buffer_iterator = buffer.begin();
+ buffer_iterator != buffer.end(); buffer_iterator++) {
+ std::cerr << '"' << *buffer_iterator << "\" ";
+ }
+ std::cerr << '}' << std::endl;
#endif
- buffer.clear();
- }
- else {
- buffer.push_back(*iterator);
- }
- }
+ buffer.clear();
+ }
+ else {
+ buffer.push_back(*iterator);
+ }
+ }
#endif
- }
-
- std::vector<std::string> math_text_t::
- tex_split(const std::string &raw_code, const char escape_character)
- {
- std::string code = raw_code;
-
- for(std::string::iterator iterator = code.begin();
- iterator != code.end(); iterator++) {
- if(*iterator == escape_character) {
- *iterator = '\\';
- }
- }
-
- std::vector<std::string> ret;
-
- if(code.size() <= 0) {
- return ret;
- }
-
- size_t begin = 0;
- size_t end = 1;
- bool box = false;
-
- while (code[begin] == ' ') {
- begin++;
- }
- while (begin < code.size()) {
- end = begin + 1;
- if(code[begin] == '\\') {
- if(isalpha(code[end])) {
- while(end < code.size() && isalpha(code[end])) {
- end++;
- }
- }
- else if(end < code.size()) {
- end++;
- }
+ }
+
+ std::vector<std::string> math_text_t::
+ tex_split(const std::string &raw_code, const char escape_character)
+ {
+ std::string code = raw_code;
+
+ for(std::string::iterator iterator = code.begin();
+ iterator != code.end(); iterator++) {
+ if(*iterator == escape_character) {
+ *iterator = '\\';
+ }
+ }
+
+ std::vector<std::string> ret;
+
+ if(code.size() <= 0) {
+ return ret;
+ }
+
+ size_t begin = 0;
+ size_t end = 1;
+ bool box = false;
+
+ while (code[begin] == ' ') {
+ begin++;
+ }
+ while (begin < code.size()) {
+ end = begin + 1;
+ if(code[begin] == '\\') {
+ if(isalpha(code[end])) {
+ while(end < code.size() && isalpha(code[end])) {
+ end++;
+ }
+ }
+ else if(end < code.size()) {
+ end++;
+ }
#include "table/mathbracketcs.h"
- const char **lower =
- std::lower_bound(bracket_control_sequence,
- bracket_control_sequence +
- nbracket_control_sequence,
- code.substr(begin,
- end - begin));
-
- if(lower < bracket_control_sequence +
- nbracket_control_sequence &&
- *lower == code.substr(begin, end - begin) &&
- end + 1 < code.size() && code[end] == '[') {
- while(end < code.size() && code[end] != ']') {
- end++;
- }
- if(end < code.size()) {
- end++;
- }
- }
- }
-
- std::string code_substr =
- code.substr(begin, end - begin);
+ const char **lower =
+ std::lower_bound(bracket_control_sequence,
+ bracket_control_sequence +
+ nbracket_control_sequence,
+ code.substr(begin,
+ end - begin));
+
+ if(lower < bracket_control_sequence +
+ nbracket_control_sequence &&
+ *lower == code.substr(begin, end - begin) &&
+ end + 1 < code.size() && code[end] == '[') {
+ while(end < code.size() && code[end] != ']') {
+ end++;
+ }
+ if(end < code.size()) {
+ end++;
+ }
+ }
+ }
+
+ std::string code_substr =
+ code.substr(begin, end - begin);
#if 1
- if(code_substr == "\\hbox" || code_substr == "\\text") {
- box = true;
- }
- else if(box) {
- if(code[begin] == '{') {
- for(unsigned int level = 1;
- end < code.size() && level > 0; end++) {
- if(code[end - 1] != '\\') {
- switch(code[end]) {
- case '{': level++; break;
- case '}': level--; break;
- }
- }
- }
- code_substr =
- code.substr(begin + 1, end - begin - 2);
- }
- else if(code[begin] == '\\' &&
- begin + 1 < code.size()) {
- code_substr = code.substr(begin, 2);
- }
- else {
- code_substr = code.substr(begin, 1);
- }
- // FIXME: Proper interpretation of escaped characters
- box = false;
- }
+ if(code_substr == "\\hbox" || code_substr == "\\text") {
+ box = true;
+ }
+ else if(box) {
+ if(code[begin] == '{') {
+ for(unsigned int level = 1;
+ end < code.size() && level > 0; end++) {
+ if(code[end - 1] != '\\') {
+ switch(code[end]) {
+ case '{': level++; break;
+ case '}': level--; break;
+ }
+ }
+ }
+ code_substr =
+ code.substr(begin + 1, end - begin - 2);
+ }
+ else if(code[begin] == '\\' &&
+ begin + 1 < code.size()) {
+ code_substr = code.substr(begin, 2);
+ }
+ else {
+ code_substr = code.substr(begin, 1);
+ }
+ // FIXME: Proper interpretation of escaped characters
+ box = false;
+ }
#endif
-
- ret.push_back(code_substr);
- begin = end;
- while( begin<code.size() && code[begin] == ' ' ) {
- begin++;
- }
- }
-
- return ret;
- }
-
- std::vector<std::string> math_text_t::
- tex_replace(const std::vector<std::string> &/*code*/)
- {
+
+ ret.push_back(code_substr);
+ begin = end;
+ while( begin<code.size() && code[begin] == ' ' ) {
+ begin++;
+ }
+ }
+
+ return ret;
+ }
+
+ std::vector<std::string> math_text_t::
+ tex_replace(const std::vector<std::string> &/*code*/)
+ {
#if 0
- static const size_t ncontrol_max = 256;
- static const char *table[][ncontrol_max] = {
- { "\\%", "\0", "\\root", "\1", "\\of", "\2", NULL },
- { "\\sqrt", "[]", "\1", "\\root", "\1", "\\of", "\2", NULL },
- { "\\frac", "\2", "{", "\1", "\\over", "\2", "}", NULL }
- };
+ static const size_t ncontrol_max = 256;
+ static const char *table[][ncontrol_max] = {
+ { "\\%", "\0", "\\root", "\1", "\\of", "\2", NULL },
+ { "\\sqrt", "[]", "\1", "\\root", "\1", "\\of", "\2", NULL },
+ { "\\frac", "\2", "{", "\1", "\\over", "\2", "}", NULL }
+ };
#endif
-
- return std::vector<std::string>();
- }
-
+
+ return std::vector<std::string>();
+ }
+
}
diff --git a/graf2d/mathtext/src/mathtextview.cxx b/graf2d/mathtext/src/mathtextview.cxx
index f4f8e5c9372..d691bab7900 100644
--- a/graf2d/mathtext/src/mathtextview.cxx
+++ b/graf2d/mathtext/src/mathtextview.cxx
@@ -25,211 +25,211 @@
namespace mathtext {
- /////////////////////////////////////////////////////////////////
-
- void math_text_t::
- tree_view_prefix(const std::vector<bool> &branch,
- const bool final) const
- {
- if(branch.size() > 0) {
- std::cerr << ' ';
- for(std::vector<bool>::const_iterator iterator =
- branch.begin();
- iterator != branch.end(); iterator++) {
- if(*iterator) {
- if(iterator + 1 == branch.end()) {
- if(final)
- std::cerr << "\342\224\224\342\224\200 ";
- else
- std::cerr << "\342\224\234\342\224\200 ";
- }
- else
- std::cerr << "\342\224\202 ";
- }
- else
- if(iterator + 1 == branch.end())
- std::cerr << " ";
- else
- std::cerr << " ";
- }
- }
- }
-
- void math_text_t::tree_view(const field_t &field,
- std::vector<bool> &branch,
- const bool final) const
- {
- switch(field._type) {
- case field_t::TYPE_MATH_SYMBOL:
- tree_view_prefix(branch, true);
- std::cerr << "<math_symbol code=\""
- << field._math_symbol._code
- << "\" glyph="
- << (unsigned int)field._math_symbol._glyph
- << "/>" << std::endl;
- break;
- case field_t::TYPE_BOX:
- tree_view_prefix(branch, true);
- std::cerr << "<box/>" << std::endl;
- break;
- case field_t::TYPE_MATH_LIST:
- if(field._math_list.empty()) {
- tree_view_prefix(branch, true);
- std::cerr << "<empty/>" << std::endl;
- }
- else {
- tree_view_prefix(branch, false);
- std::cerr << "<math_list>" << std::endl;
-
- std::vector<bool> branch_copy = branch;
-
- branch_copy.back() = !final;
- for(std::vector<item_t>::const_iterator iterator =
- field._math_list.begin();
- iterator != field._math_list.end(); iterator++) {
- branch_copy.back() = !final;
- branch_copy.push_back(true);
- tree_view(*iterator, branch_copy,
- iterator + 1 == field._math_list.end());
- branch_copy.pop_back();
- }
- branch_copy.back() = !final;
- tree_view_prefix(branch_copy, true);
- std::cerr << "</math_list>" << std::endl;
- }
- break;
- default:
- tree_view_prefix(branch, true);
- std::cerr << "<err_field/>" << std::endl;
- }
- }
-
- void math_text_t::tree_view(const item_t &item,
- std::vector<bool> &branch,
- const bool final) const
- {
- std::vector<bool> branch_copy = branch;
-
- switch(item._type) {
- case item_t::TYPE_ATOM:
- tree_view_prefix(branch, final);
- std::cerr << "<atom>" << std::endl;
- branch_copy.back() = !final;
- branch_copy.push_back(true);
- tree_view(item._atom, branch_copy, final);
- branch_copy.pop_back();
- tree_view_prefix(branch_copy, final);
- std::cerr << "</atom>" << std::endl;
- break;
- case item_t::TYPE_BOUNDARY:
- tree_view_prefix(branch, final);
- std::cerr << "<boundary>" << std::endl;
- branch_copy.back() = !final;
- branch_copy.push_back(true);
- tree_view(item._atom, branch_copy, final);
- branch_copy.pop_back();
- tree_view_prefix(branch_copy, final);
- std::cerr << "</boundary>" << std::endl;
- break;
- case item_t::TYPE_GENERALIZED_FRACTION:
- tree_view_prefix(branch, final);
- std::cerr << "<generalized_fraction/>" << std::endl;
- break;
- default:
- tree_view_prefix(branch, final);
- std::cerr << "<err_item/>" << std::endl;
- }
- }
-
- void math_text_t::tree_view(const atom_t &atom,
- std::vector<bool> &branch,
- const bool final) const
- {
- tree_view_prefix(branch, false);
- std::cerr << "<type>";
- switch(atom._type) {
- case atom_t::TYPE_ORD:
- std::cerr << "Ord";
- break;
- case atom_t::TYPE_OP:
- std::cerr << "Op";
- break;
- case atom_t::TYPE_BIN:
- std::cerr << "Bin";
- break;
- case atom_t::TYPE_REL:
- std::cerr << "Rel";
- break;
- case atom_t::TYPE_OPEN:
- std::cerr << "Open";
- break;
- case atom_t::TYPE_CLOSE:
- std::cerr << "Close";
- break;
- case atom_t::TYPE_PUNCT:
- std::cerr << "Punct";
- break;
- case atom_t::TYPE_INNER:
- std::cerr << "Inner";
- break;
- case atom_t::TYPE_OVER:
- std::cerr << "Over";
- break;
- case atom_t::TYPE_UNDER:
- std::cerr << "Under";
- break;
- case atom_t::TYPE_ACC:
- std::cerr << "Acc";
- break;
- case atom_t::TYPE_RAD:
- std::cerr << "Rad";
- break;
- case atom_t::TYPE_VCENT:
- std::cerr << "Vcent";
- break;
- default:
- std::cerr << "??" << atom._type;
- break;
- }
- std::cerr << "</type>" << std::endl;
-
- std::vector<bool> branch_copy = branch;
-
- if(!atom._nucleus.empty()) {
- const bool way_final = atom._superscript.empty() &&
- atom._subscript.empty();
-
- tree_view_prefix(branch, way_final);
- std::cerr << "<nucleus>" << std::endl;
- branch_copy.back() = !way_final;
- branch_copy.push_back(true);
- tree_view(atom._nucleus, branch_copy, final);
- branch_copy.pop_back();
- tree_view_prefix(branch_copy, way_final);
- std::cerr << "</nucleus>" << std::endl;
- }
- if(!atom._superscript.empty()) {
- const bool way_final = atom._subscript.empty();
-
- tree_view_prefix(branch, way_final);
- std::cerr << "<superscript>" << std::endl;
- branch_copy.back() = !way_final;
- branch_copy.push_back(true);
- tree_view(atom._superscript, branch_copy, final);
- branch_copy.pop_back();
- tree_view_prefix(branch_copy, way_final);
- std::cerr << "</superscript>" << std::endl;
- }
- if(!atom._subscript.empty()) {
- tree_view_prefix(branch, true);
- std::cerr << "<subscript>" << std::endl;
- branch_copy.back() = false;
- branch_copy.push_back(true);
- tree_view(atom._subscript, branch_copy, final);
- branch_copy.pop_back();
- tree_view_prefix(branch_copy, true);
- std::cerr << "</subscript>" << std::endl;
- }
- }
-
+ /////////////////////////////////////////////////////////////////
+
+ void math_text_t::
+ tree_view_prefix(const std::vector<bool> &branch,
+ const bool final) const
+ {
+ if(branch.size() > 0) {
+ std::cerr << ' ';
+ for(std::vector<bool>::const_iterator iterator =
+ branch.begin();
+ iterator != branch.end(); iterator++) {
+ if(*iterator) {
+ if(iterator + 1 == branch.end()) {
+ if(final)
+ std::cerr << "\342\224\224\342\224\200 ";
+ else
+ std::cerr << "\342\224\234\342\224\200 ";
+ }
+ else
+ std::cerr << "\342\224\202 ";
+ }
+ else
+ if(iterator + 1 == branch.end())
+ std::cerr << " ";
+ else
+ std::cerr << " ";
+ }
+ }
+ }
+
+ void math_text_t::tree_view(const field_t &field,
+ std::vector<bool> &branch,
+ const bool final) const
+ {
+ switch(field._type) {
+ case field_t::TYPE_MATH_SYMBOL:
+ tree_view_prefix(branch, true);
+ std::cerr << "<math_symbol code=\""
+ << field._math_symbol._code
+ << "\" glyph="
+ << (unsigned int)field._math_symbol._glyph
+ << "/>" << std::endl;
+ break;
+ case field_t::TYPE_BOX:
+ tree_view_prefix(branch, true);
+ std::cerr << "<box/>" << std::endl;
+ break;
+ case field_t::TYPE_MATH_LIST:
+ if(field._math_list.empty()) {
+ tree_view_prefix(branch, true);
+ std::cerr << "<empty/>" << std::endl;
+ }
+ else {
+ tree_view_prefix(branch, false);
+ std::cerr << "<math_list>" << std::endl;
+
+ std::vector<bool> branch_copy = branch;
+
+ branch_copy.back() = !final;
+ for(std::vector<item_t>::const_iterator iterator =
+ field._math_list.begin();
+ iterator != field._math_list.end(); iterator++) {
+ branch_copy.back() = !final;
+ branch_copy.push_back(true);
+ tree_view(*iterator, branch_copy,
+ iterator + 1 == field._math_list.end());
+ branch_copy.pop_back();
+ }
+ branch_copy.back() = !final;
+ tree_view_prefix(branch_copy, true);
+ std::cerr << "</math_list>" << std::endl;
+ }
+ break;
+ default:
+ tree_view_prefix(branch, true);
+ std::cerr << "<err_field/>" << std::endl;
+ }
+ }
+
+ void math_text_t::tree_view(const item_t &item,
+ std::vector<bool> &branch,
+ const bool final) const
+ {
+ std::vector<bool> branch_copy = branch;
+
+ switch(item._type) {
+ case item_t::TYPE_ATOM:
+ tree_view_prefix(branch, final);
+ std::cerr << "<atom>" << std::endl;
+ branch_copy.back() = !final;
+ branch_copy.push_back(true);
+ tree_view(item._atom, branch_copy, final);
+ branch_copy.pop_back();
+ tree_view_prefix(branch_copy, final);
+ std::cerr << "</atom>" << std::endl;
+ break;
+ case item_t::TYPE_BOUNDARY:
+ tree_view_prefix(branch, final);
+ std::cerr << "<boundary>" << std::endl;
+ branch_copy.back() = !final;
+ branch_copy.push_back(true);
+ tree_view(item._atom, branch_copy, final);
+ branch_copy.pop_back();
+ tree_view_prefix(branch_copy, final);
+ std::cerr << "</boundary>" << std::endl;
+ break;
+ case item_t::TYPE_GENERALIZED_FRACTION:
+ tree_view_prefix(branch, final);
+ std::cerr << "<generalized_fraction/>" << std::endl;
+ break;
+ default:
+ tree_view_prefix(branch, final);
+ std::cerr << "<err_item/>" << std::endl;
+ }
+ }
+
+ void math_text_t::tree_view(const atom_t &atom,
+ std::vector<bool> &branch,
+ const bool final) const
+ {
+ tree_view_prefix(branch, false);
+ std::cerr << "<type>";
+ switch(atom._type) {
+ case atom_t::TYPE_ORD:
+ std::cerr << "Ord";
+ break;
+ case atom_t::TYPE_OP:
+ std::cerr << "Op";
+ break;
+ case atom_t::TYPE_BIN:
+ std::cerr << "Bin";
+ break;
+ case atom_t::TYPE_REL:
+ std::cerr << "Rel";
+ break;
+ case atom_t::TYPE_OPEN:
+ std::cerr << "Open";
+ break;
+ case atom_t::TYPE_CLOSE:
+ std::cerr << "Close";
+ break;
+ case atom_t::TYPE_PUNCT:
+ std::cerr << "Punct";
+ break;
+ case atom_t::TYPE_INNER:
+ std::cerr << "Inner";
+ break;
+ case atom_t::TYPE_OVER:
+ std::cerr << "Over";
+ break;
+ case atom_t::TYPE_UNDER:
+ std::cerr << "Under";
+ break;
+ case atom_t::TYPE_ACC:
+ std::cerr << "Acc";
+ break;
+ case atom_t::TYPE_RAD:
+ std::cerr << "Rad";
+ break;
+ case atom_t::TYPE_VCENT:
+ std::cerr << "Vcent";
+ break;
+ default:
+ std::cerr << "??" << atom._type;
+ break;
+ }
+ std::cerr << "</type>" << std::endl;
+
+ std::vector<bool> branch_copy = branch;
+
+ if(!atom._nucleus.empty()) {
+ const bool way_final = atom._superscript.empty() &&
+ atom._subscript.empty();
+
+ tree_view_prefix(branch, way_final);
+ std::cerr << "<nucleus>" << std::endl;
+ branch_copy.back() = !way_final;
+ branch_copy.push_back(true);
+ tree_view(atom._nucleus, branch_copy, final);
+ branch_copy.pop_back();
+ tree_view_prefix(branch_copy, way_final);
+ std::cerr << "</nucleus>" << std::endl;
+ }
+ if(!atom._superscript.empty()) {
+ const bool way_final = atom._subscript.empty();
+
+ tree_view_prefix(branch, way_final);
+ std::cerr << "<superscript>" << std::endl;
+ branch_copy.back() = !way_final;
+ branch_copy.push_back(true);
+ tree_view(atom._superscript, branch_copy, final);
+ branch_copy.pop_back();
+ tree_view_prefix(branch_copy, way_final);
+ std::cerr << "</superscript>" << std::endl;
+ }
+ if(!atom._subscript.empty()) {
+ tree_view_prefix(branch, true);
+ std::cerr << "<subscript>" << std::endl;
+ branch_copy.back() = false;
+ branch_copy.push_back(true);
+ tree_view(atom._subscript, branch_copy, final);
+ branch_copy.pop_back();
+ tree_view_prefix(branch_copy, true);
+ std::cerr << "</subscript>" << std::endl;
+ }
+ }
+
}
diff --git a/graf2d/mathtext/src/table/adobeglyphlist.h b/graf2d/mathtext/src/table/adobeglyphlist.h
index 8b6dbfdca4d..68ba1169c35 100644
--- a/graf2d/mathtext/src/table/adobeglyphlist.h
+++ b/graf2d/mathtext/src/table/adobeglyphlist.h
@@ -18,298 +18,298 @@
static const unsigned long nadobe_glyph = 835;
static const wchar_t adobe_glyph_ucs[nadobe_glyph] = {
- L'\040', L'\041', L'\042', L'\043', L'\044', L'\045', L'\046',
- L'\047', L'\050', L'\051', L'\052', L'\053', L'\054', L'\055',
- L'\056', L'\057', L'\060', L'\061', L'\062', L'\063', L'\064',
- L'\065', L'\066', L'\067', L'\070', L'\071', L'\072', L'\073',
- L'\074', L'\075', L'\076', L'\077', L'\100', L'\101', L'\102',
- L'\103', L'\104', L'\105', L'\106', L'\107', L'\110', L'\111',
- L'\112', L'\113', L'\114', L'\115', L'\116', L'\117', L'\120',
- L'\121', L'\122', L'\123', L'\124', L'\125', L'\126', L'\127',
- L'\130', L'\131', L'\132', L'\133', L'\134', L'\135', L'\136',
- L'\137', L'\140', L'\141', L'\142', L'\143', L'\144', L'\145',
- L'\146', L'\147', L'\150', L'\151', L'\152', L'\153', L'\154',
- L'\155', L'\156', L'\157', L'\160', L'\161', L'\162', L'\163',
- L'\164', L'\165', L'\166', L'\167', L'\170', L'\171', L'\172',
- L'\173', L'\174', L'\175', L'\176', L'\241', L'\242', L'\243',
- L'\244', L'\245', L'\246', L'\247', L'\250', L'\251', L'\252',
- L'\253', L'\254', L'\256', L'\257', L'\260', L'\261', L'\264',
- L'\266', L'\267', L'\270', L'\272', L'\273', L'\274', L'\275',
- L'\276', L'\277', L'\300', L'\301', L'\302', L'\303', L'\304',
- L'\305', L'\306', L'\307', L'\310', L'\311', L'\312', L'\313',
- L'\314', L'\315', L'\316', L'\317', L'\320', L'\321', L'\322',
- L'\323', L'\324', L'\325', L'\326', L'\327', L'\330', L'\331',
- L'\332', L'\333', L'\334', L'\335', L'\336', L'\337', L'\340',
- L'\341', L'\342', L'\343', L'\344', L'\345', L'\346', L'\347',
- L'\350', L'\351', L'\352', L'\353', L'\354', L'\355', L'\356',
- L'\357', L'\360', L'\361', L'\362', L'\363', L'\364', L'\365',
- L'\366', L'\367', L'\370', L'\371', L'\372', L'\373', L'\374',
- L'\375', L'\376', L'\377', L'\u0100', L'\u0101', L'\u0102',
- L'\u0103', L'\u0104', L'\u0105', L'\u0106', L'\u0107', L'\u0108',
- L'\u0109', L'\u010a', L'\u010b', L'\u010c', L'\u010d', L'\u010e',
- L'\u010f', L'\u0110', L'\u0111', L'\u0112', L'\u0113', L'\u0114',
- L'\u0115', L'\u0116', L'\u0117', L'\u0118', L'\u0119', L'\u011a',
- L'\u011b', L'\u011c', L'\u011d', L'\u011e', L'\u011f', L'\u0120',
- L'\u0121', L'\u0122', L'\u0123', L'\u0124', L'\u0125', L'\u0126',
- L'\u0127', L'\u0128', L'\u0129', L'\u012a', L'\u012b', L'\u012c',
- L'\u012d', L'\u012e', L'\u012f', L'\u0130', L'\u0131', L'\u0132',
- L'\u0133', L'\u0134', L'\u0135', L'\u0136', L'\u0137', L'\u0138',
- L'\u0139', L'\u013a', L'\u013b', L'\u013c', L'\u013d', L'\u013e',
- L'\u013f', L'\u0140', L'\u0141', L'\u0142', L'\u0143', L'\u0144',
- L'\u0145', L'\u0146', L'\u0147', L'\u0148', L'\u0149', L'\u014a',
- L'\u014b', L'\u014c', L'\u014d', L'\u014e', L'\u014f', L'\u0150',
- L'\u0151', L'\u0152', L'\u0153', L'\u0154', L'\u0155', L'\u0156',
- L'\u0157', L'\u0158', L'\u0159', L'\u015a', L'\u015b', L'\u015c',
- L'\u015d', L'\u015e', L'\u015f', L'\u0160', L'\u0161', L'\u0162',
- L'\u0163', L'\u0164', L'\u0165', L'\u0166', L'\u0167', L'\u0168',
- L'\u0169', L'\u016a', L'\u016b', L'\u016c', L'\u016d', L'\u016e',
- L'\u016f', L'\u0170', L'\u0171', L'\u0172', L'\u0173', L'\u0174',
- L'\u0175', L'\u0176', L'\u0177', L'\u0178', L'\u0179', L'\u017a',
- L'\u017b', L'\u017c', L'\u017d', L'\u017e', L'\u017f', L'\u0192',
- L'\u01a0', L'\u01a1', L'\u01af', L'\u01b0', L'\u01e6', L'\u01e7',
- L'\u01fa', L'\u01fb', L'\u01fc', L'\u01fd', L'\u01fe', L'\u01ff',
- L'\u0218', L'\u0219', L'\u02bc', L'\u02bd', L'\u02c6', L'\u02c7',
- L'\u02d8', L'\u02d9', L'\u02da', L'\u02db', L'\u02dc', L'\u02dd',
- L'\u0300', L'\u0301', L'\u0303', L'\u0309', L'\u0323', L'\u0384',
- L'\u0385', L'\u0386', L'\u0387', L'\u0388', L'\u0389', L'\u038a',
- L'\u038c', L'\u038e', L'\u038f', L'\u0390', L'\u0391', L'\u0392',
- L'\u0393', L'\u0394', L'\u0395', L'\u0396', L'\u0397', L'\u0398',
- L'\u0399', L'\u039a', L'\u039b', L'\u039c', L'\u039d', L'\u039e',
- L'\u039f', L'\u03a0', L'\u03a1', L'\u03a3', L'\u03a4', L'\u03a5',
- L'\u03a6', L'\u03a7', L'\u03a8', L'\u03a9', L'\u03aa', L'\u03ab',
- L'\u03ac', L'\u03ad', L'\u03ae', L'\u03af', L'\u03b0', L'\u03b1',
- L'\u03b2', L'\u03b3', L'\u03b4', L'\u03b5', L'\u03b6', L'\u03b7',
- L'\u03b8', L'\u03b9', L'\u03ba', L'\u03bb', L'\u03bc', L'\u03bd',
- L'\u03be', L'\u03bf', L'\u03c0', L'\u03c1', L'\u03c2', L'\u03c3',
- L'\u03c4', L'\u03c5', L'\u03c6', L'\u03c7', L'\u03c8', L'\u03c9',
- L'\u03ca', L'\u03cb', L'\u03cc', L'\u03cd', L'\u03ce', L'\u03d1',
- L'\u03d2', L'\u03d5', L'\u03d6', L'\u0401', L'\u0402', L'\u0403',
- L'\u0404', L'\u0405', L'\u0406', L'\u0407', L'\u0408', L'\u0409',
- L'\u040a', L'\u040b', L'\u040c', L'\u040e', L'\u040f', L'\u0410',
- L'\u0411', L'\u0412', L'\u0413', L'\u0414', L'\u0415', L'\u0416',
- L'\u0417', L'\u0418', L'\u0419', L'\u041a', L'\u041b', L'\u041c',
- L'\u041d', L'\u041e', L'\u041f', L'\u0420', L'\u0421', L'\u0422',
- L'\u0423', L'\u0424', L'\u0425', L'\u0426', L'\u0427', L'\u0428',
- L'\u0429', L'\u042a', L'\u042b', L'\u042c', L'\u042d', L'\u042e',
- L'\u042f', L'\u0430', L'\u0431', L'\u0432', L'\u0433', L'\u0434',
- L'\u0435', L'\u0436', L'\u0437', L'\u0438', L'\u0439', L'\u043a',
- L'\u043b', L'\u043c', L'\u043d', L'\u043e', L'\u043f', L'\u0440',
- L'\u0441', L'\u0442', L'\u0443', L'\u0444', L'\u0445', L'\u0446',
- L'\u0447', L'\u0448', L'\u0449', L'\u044a', L'\u044b', L'\u044c',
- L'\u044d', L'\u044e', L'\u044f', L'\u0451', L'\u0452', L'\u0453',
- L'\u0454', L'\u0455', L'\u0456', L'\u0457', L'\u0458', L'\u0459',
- L'\u045a', L'\u045b', L'\u045c', L'\u045e', L'\u045f', L'\u0462',
- L'\u0463', L'\u0472', L'\u0473', L'\u0474', L'\u0475', L'\u0490',
- L'\u0491', L'\u04d9', L'\u05b0', L'\u05b1', L'\u05b2', L'\u05b3',
- L'\u05b4', L'\u05b5', L'\u05b6', L'\u05b7', L'\u05b8', L'\u05b9',
- L'\u05bb', L'\u05bc', L'\u05bd', L'\u05be', L'\u05bf', L'\u05c0',
- L'\u05c1', L'\u05c2', L'\u05c3', L'\u05d0', L'\u05d1', L'\u05d2',
- L'\u05d3', L'\u05d4', L'\u05d5', L'\u05d6', L'\u05d7', L'\u05d8',
- L'\u05d9', L'\u05da', L'\u05db', L'\u05dc', L'\u05dd', L'\u05de',
- L'\u05df', L'\u05e0', L'\u05e1', L'\u05e2', L'\u05e3', L'\u05e4',
- L'\u05e5', L'\u05e6', L'\u05e7', L'\u05e8', L'\u05e9', L'\u05ea',
- L'\u05f0', L'\u05f1', L'\u05f2', L'\u060c', L'\u061b', L'\u061f',
- L'\u0621', L'\u0622', L'\u0623', L'\u0624', L'\u0625', L'\u0626',
- L'\u0627', L'\u0628', L'\u0629', L'\u062a', L'\u062b', L'\u062c',
- L'\u062d', L'\u062e', L'\u062f', L'\u0630', L'\u0631', L'\u0632',
- L'\u0633', L'\u0634', L'\u0635', L'\u0636', L'\u0637', L'\u0638',
- L'\u0639', L'\u063a', L'\u0640', L'\u0641', L'\u0642', L'\u0643',
- L'\u0644', L'\u0645', L'\u0646', L'\u0647', L'\u0648', L'\u0649',
- L'\u064a', L'\u064b', L'\u064c', L'\u064d', L'\u064e', L'\u064f',
- L'\u0650', L'\u0651', L'\u0652', L'\u0660', L'\u0661', L'\u0662',
- L'\u0663', L'\u0664', L'\u0665', L'\u0666', L'\u0667', L'\u0668',
- L'\u0669', L'\u066a', L'\u066d', L'\u0679', L'\u067e', L'\u0686',
- L'\u0688', L'\u0691', L'\u0698', L'\u06a4', L'\u06af', L'\u06ba',
- L'\u06d2', L'\u06d5', L'\u1e80', L'\u1e81', L'\u1e82', L'\u1e83',
- L'\u1e84', L'\u1e85', L'\u1ef2', L'\u1ef3', L'\u200c', L'\u200d',
- L'\u200e', L'\u200f', L'\u2012', L'\u2013', L'\u2014', L'\u2015',
- L'\u2017', L'\u2018', L'\u2019', L'\u201a', L'\u201b', L'\u201c',
- L'\u201d', L'\u201e', L'\u2020', L'\u2021', L'\u2022', L'\u2024',
- L'\u2025', L'\u2026', L'\u202c', L'\u202d', L'\u202e', L'\u2030',
- L'\u2032', L'\u2033', L'\u2039', L'\u203a', L'\u203c', L'\u2044',
- L'\u20a1', L'\u20a3', L'\u20a4', L'\u20a7', L'\u20aa', L'\u20ab',
- L'\u20ac', L'\u2105', L'\u2111', L'\u2113', L'\u2116', L'\u2118',
- L'\u211c', L'\u211e', L'\u2122', L'\u212e', L'\u2135', L'\u2153',
- L'\u2154', L'\u215b', L'\u215c', L'\u215d', L'\u215e', L'\u2190',
- L'\u2191', L'\u2192', L'\u2193', L'\u2194', L'\u2195', L'\u21a8',
- L'\u21b5', L'\u21d0', L'\u21d1', L'\u21d2', L'\u21d3', L'\u21d4',
- L'\u2200', L'\u2202', L'\u2203', L'\u2205', L'\u2207', L'\u2208',
- L'\u2209', L'\u220b', L'\u220f', L'\u2211', L'\u2212', L'\u2217',
- L'\u221a', L'\u221d', L'\u221e', L'\u221f', L'\u2220', L'\u2227',
- L'\u2228', L'\u2229', L'\u222a', L'\u222b', L'\u2234', L'\u223c',
- L'\u2245', L'\u2248', L'\u2260', L'\u2261', L'\u2264', L'\u2265',
- L'\u2282', L'\u2283', L'\u2284', L'\u2286', L'\u2287', L'\u2295',
- L'\u2297', L'\u22a5', L'\u22c5', L'\u2302', L'\u2310', L'\u2320',
- L'\u2321', L'\u2329', L'\u232a', L'\u2500', L'\u2502', L'\u250c',
- L'\u2510', L'\u2514', L'\u2518', L'\u251c', L'\u2524', L'\u252c',
- L'\u2534', L'\u253c', L'\u2550', L'\u2551', L'\u2552', L'\u2553',
- L'\u2554', L'\u2555', L'\u2556', L'\u2557', L'\u2558', L'\u2559',
- L'\u255a', L'\u255b', L'\u255c', L'\u255d', L'\u255e', L'\u255f',
- L'\u2560', L'\u2561', L'\u2562', L'\u2563', L'\u2564', L'\u2565',
- L'\u2566', L'\u2567', L'\u2568', L'\u2569', L'\u256a', L'\u256b',
- L'\u256c', L'\u2580', L'\u2584', L'\u2588', L'\u258c', L'\u2590',
- L'\u2591', L'\u2592', L'\u2593', L'\u25a0', L'\u25a1', L'\u25aa',
- L'\u25ab', L'\u25ac', L'\u25b2', L'\u25ba', L'\u25bc', L'\u25c4',
- L'\u25ca', L'\u25cb', L'\u25cf', L'\u25d8', L'\u25d9', L'\u25e6',
- L'\u263a', L'\u263b', L'\u263c', L'\u2640', L'\u2642', L'\u2660',
- L'\u2663', L'\u2665', L'\u2666', L'\u266a', L'\u266b'
+ L'\040', L'\041', L'\042', L'\043', L'\044', L'\045', L'\046',
+ L'\047', L'\050', L'\051', L'\052', L'\053', L'\054', L'\055',
+ L'\056', L'\057', L'\060', L'\061', L'\062', L'\063', L'\064',
+ L'\065', L'\066', L'\067', L'\070', L'\071', L'\072', L'\073',
+ L'\074', L'\075', L'\076', L'\077', L'\100', L'\101', L'\102',
+ L'\103', L'\104', L'\105', L'\106', L'\107', L'\110', L'\111',
+ L'\112', L'\113', L'\114', L'\115', L'\116', L'\117', L'\120',
+ L'\121', L'\122', L'\123', L'\124', L'\125', L'\126', L'\127',
+ L'\130', L'\131', L'\132', L'\133', L'\134', L'\135', L'\136',
+ L'\137', L'\140', L'\141', L'\142', L'\143', L'\144', L'\145',
+ L'\146', L'\147', L'\150', L'\151', L'\152', L'\153', L'\154',
+ L'\155', L'\156', L'\157', L'\160', L'\161', L'\162', L'\163',
+ L'\164', L'\165', L'\166', L'\167', L'\170', L'\171', L'\172',
+ L'\173', L'\174', L'\175', L'\176', L'\241', L'\242', L'\243',
+ L'\244', L'\245', L'\246', L'\247', L'\250', L'\251', L'\252',
+ L'\253', L'\254', L'\256', L'\257', L'\260', L'\261', L'\264',
+ L'\266', L'\267', L'\270', L'\272', L'\273', L'\274', L'\275',
+ L'\276', L'\277', L'\300', L'\301', L'\302', L'\303', L'\304',
+ L'\305', L'\306', L'\307', L'\310', L'\311', L'\312', L'\313',
+ L'\314', L'\315', L'\316', L'\317', L'\320', L'\321', L'\322',
+ L'\323', L'\324', L'\325', L'\326', L'\327', L'\330', L'\331',
+ L'\332', L'\333', L'\334', L'\335', L'\336', L'\337', L'\340',
+ L'\341', L'\342', L'\343', L'\344', L'\345', L'\346', L'\347',
+ L'\350', L'\351', L'\352', L'\353', L'\354', L'\355', L'\356',
+ L'\357', L'\360', L'\361', L'\362', L'\363', L'\364', L'\365',
+ L'\366', L'\367', L'\370', L'\371', L'\372', L'\373', L'\374',
+ L'\375', L'\376', L'\377', L'\u0100', L'\u0101', L'\u0102',
+ L'\u0103', L'\u0104', L'\u0105', L'\u0106', L'\u0107', L'\u0108',
+ L'\u0109', L'\u010a', L'\u010b', L'\u010c', L'\u010d', L'\u010e',
+ L'\u010f', L'\u0110', L'\u0111', L'\u0112', L'\u0113', L'\u0114',
+ L'\u0115', L'\u0116', L'\u0117', L'\u0118', L'\u0119', L'\u011a',
+ L'\u011b', L'\u011c', L'\u011d', L'\u011e', L'\u011f', L'\u0120',
+ L'\u0121', L'\u0122', L'\u0123', L'\u0124', L'\u0125', L'\u0126',
+ L'\u0127', L'\u0128', L'\u0129', L'\u012a', L'\u012b', L'\u012c',
+ L'\u012d', L'\u012e', L'\u012f', L'\u0130', L'\u0131', L'\u0132',
+ L'\u0133', L'\u0134', L'\u0135', L'\u0136', L'\u0137', L'\u0138',
+ L'\u0139', L'\u013a', L'\u013b', L'\u013c', L'\u013d', L'\u013e',
+ L'\u013f', L'\u0140', L'\u0141', L'\u0142', L'\u0143', L'\u0144',
+ L'\u0145', L'\u0146', L'\u0147', L'\u0148', L'\u0149', L'\u014a',
+ L'\u014b', L'\u014c', L'\u014d', L'\u014e', L'\u014f', L'\u0150',
+ L'\u0151', L'\u0152', L'\u0153', L'\u0154', L'\u0155', L'\u0156',
+ L'\u0157', L'\u0158', L'\u0159', L'\u015a', L'\u015b', L'\u015c',
+ L'\u015d', L'\u015e', L'\u015f', L'\u0160', L'\u0161', L'\u0162',
+ L'\u0163', L'\u0164', L'\u0165', L'\u0166', L'\u0167', L'\u0168',
+ L'\u0169', L'\u016a', L'\u016b', L'\u016c', L'\u016d', L'\u016e',
+ L'\u016f', L'\u0170', L'\u0171', L'\u0172', L'\u0173', L'\u0174',
+ L'\u0175', L'\u0176', L'\u0177', L'\u0178', L'\u0179', L'\u017a',
+ L'\u017b', L'\u017c', L'\u017d', L'\u017e', L'\u017f', L'\u0192',
+ L'\u01a0', L'\u01a1', L'\u01af', L'\u01b0', L'\u01e6', L'\u01e7',
+ L'\u01fa', L'\u01fb', L'\u01fc', L'\u01fd', L'\u01fe', L'\u01ff',
+ L'\u0218', L'\u0219', L'\u02bc', L'\u02bd', L'\u02c6', L'\u02c7',
+ L'\u02d8', L'\u02d9', L'\u02da', L'\u02db', L'\u02dc', L'\u02dd',
+ L'\u0300', L'\u0301', L'\u0303', L'\u0309', L'\u0323', L'\u0384',
+ L'\u0385', L'\u0386', L'\u0387', L'\u0388', L'\u0389', L'\u038a',
+ L'\u038c', L'\u038e', L'\u038f', L'\u0390', L'\u0391', L'\u0392',
+ L'\u0393', L'\u0394', L'\u0395', L'\u0396', L'\u0397', L'\u0398',
+ L'\u0399', L'\u039a', L'\u039b', L'\u039c', L'\u039d', L'\u039e',
+ L'\u039f', L'\u03a0', L'\u03a1', L'\u03a3', L'\u03a4', L'\u03a5',
+ L'\u03a6', L'\u03a7', L'\u03a8', L'\u03a9', L'\u03aa', L'\u03ab',
+ L'\u03ac', L'\u03ad', L'\u03ae', L'\u03af', L'\u03b0', L'\u03b1',
+ L'\u03b2', L'\u03b3', L'\u03b4', L'\u03b5', L'\u03b6', L'\u03b7',
+ L'\u03b8', L'\u03b9', L'\u03ba', L'\u03bb', L'\u03bc', L'\u03bd',
+ L'\u03be', L'\u03bf', L'\u03c0', L'\u03c1', L'\u03c2', L'\u03c3',
+ L'\u03c4', L'\u03c5', L'\u03c6', L'\u03c7', L'\u03c8', L'\u03c9',
+ L'\u03ca', L'\u03cb', L'\u03cc', L'\u03cd', L'\u03ce', L'\u03d1',
+ L'\u03d2', L'\u03d5', L'\u03d6', L'\u0401', L'\u0402', L'\u0403',
+ L'\u0404', L'\u0405', L'\u0406', L'\u0407', L'\u0408', L'\u0409',
+ L'\u040a', L'\u040b', L'\u040c', L'\u040e', L'\u040f', L'\u0410',
+ L'\u0411', L'\u0412', L'\u0413', L'\u0414', L'\u0415', L'\u0416',
+ L'\u0417', L'\u0418', L'\u0419', L'\u041a', L'\u041b', L'\u041c',
+ L'\u041d', L'\u041e', L'\u041f', L'\u0420', L'\u0421', L'\u0422',
+ L'\u0423', L'\u0424', L'\u0425', L'\u0426', L'\u0427', L'\u0428',
+ L'\u0429', L'\u042a', L'\u042b', L'\u042c', L'\u042d', L'\u042e',
+ L'\u042f', L'\u0430', L'\u0431', L'\u0432', L'\u0433', L'\u0434',
+ L'\u0435', L'\u0436', L'\u0437', L'\u0438', L'\u0439', L'\u043a',
+ L'\u043b', L'\u043c', L'\u043d', L'\u043e', L'\u043f', L'\u0440',
+ L'\u0441', L'\u0442', L'\u0443', L'\u0444', L'\u0445', L'\u0446',
+ L'\u0447', L'\u0448', L'\u0449', L'\u044a', L'\u044b', L'\u044c',
+ L'\u044d', L'\u044e', L'\u044f', L'\u0451', L'\u0452', L'\u0453',
+ L'\u0454', L'\u0455', L'\u0456', L'\u0457', L'\u0458', L'\u0459',
+ L'\u045a', L'\u045b', L'\u045c', L'\u045e', L'\u045f', L'\u0462',
+ L'\u0463', L'\u0472', L'\u0473', L'\u0474', L'\u0475', L'\u0490',
+ L'\u0491', L'\u04d9', L'\u05b0', L'\u05b1', L'\u05b2', L'\u05b3',
+ L'\u05b4', L'\u05b5', L'\u05b6', L'\u05b7', L'\u05b8', L'\u05b9',
+ L'\u05bb', L'\u05bc', L'\u05bd', L'\u05be', L'\u05bf', L'\u05c0',
+ L'\u05c1', L'\u05c2', L'\u05c3', L'\u05d0', L'\u05d1', L'\u05d2',
+ L'\u05d3', L'\u05d4', L'\u05d5', L'\u05d6', L'\u05d7', L'\u05d8',
+ L'\u05d9', L'\u05da', L'\u05db', L'\u05dc', L'\u05dd', L'\u05de',
+ L'\u05df', L'\u05e0', L'\u05e1', L'\u05e2', L'\u05e3', L'\u05e4',
+ L'\u05e5', L'\u05e6', L'\u05e7', L'\u05e8', L'\u05e9', L'\u05ea',
+ L'\u05f0', L'\u05f1', L'\u05f2', L'\u060c', L'\u061b', L'\u061f',
+ L'\u0621', L'\u0622', L'\u0623', L'\u0624', L'\u0625', L'\u0626',
+ L'\u0627', L'\u0628', L'\u0629', L'\u062a', L'\u062b', L'\u062c',
+ L'\u062d', L'\u062e', L'\u062f', L'\u0630', L'\u0631', L'\u0632',
+ L'\u0633', L'\u0634', L'\u0635', L'\u0636', L'\u0637', L'\u0638',
+ L'\u0639', L'\u063a', L'\u0640', L'\u0641', L'\u0642', L'\u0643',
+ L'\u0644', L'\u0645', L'\u0646', L'\u0647', L'\u0648', L'\u0649',
+ L'\u064a', L'\u064b', L'\u064c', L'\u064d', L'\u064e', L'\u064f',
+ L'\u0650', L'\u0651', L'\u0652', L'\u0660', L'\u0661', L'\u0662',
+ L'\u0663', L'\u0664', L'\u0665', L'\u0666', L'\u0667', L'\u0668',
+ L'\u0669', L'\u066a', L'\u066d', L'\u0679', L'\u067e', L'\u0686',
+ L'\u0688', L'\u0691', L'\u0698', L'\u06a4', L'\u06af', L'\u06ba',
+ L'\u06d2', L'\u06d5', L'\u1e80', L'\u1e81', L'\u1e82', L'\u1e83',
+ L'\u1e84', L'\u1e85', L'\u1ef2', L'\u1ef3', L'\u200c', L'\u200d',
+ L'\u200e', L'\u200f', L'\u2012', L'\u2013', L'\u2014', L'\u2015',
+ L'\u2017', L'\u2018', L'\u2019', L'\u201a', L'\u201b', L'\u201c',
+ L'\u201d', L'\u201e', L'\u2020', L'\u2021', L'\u2022', L'\u2024',
+ L'\u2025', L'\u2026', L'\u202c', L'\u202d', L'\u202e', L'\u2030',
+ L'\u2032', L'\u2033', L'\u2039', L'\u203a', L'\u203c', L'\u2044',
+ L'\u20a1', L'\u20a3', L'\u20a4', L'\u20a7', L'\u20aa', L'\u20ab',
+ L'\u20ac', L'\u2105', L'\u2111', L'\u2113', L'\u2116', L'\u2118',
+ L'\u211c', L'\u211e', L'\u2122', L'\u212e', L'\u2135', L'\u2153',
+ L'\u2154', L'\u215b', L'\u215c', L'\u215d', L'\u215e', L'\u2190',
+ L'\u2191', L'\u2192', L'\u2193', L'\u2194', L'\u2195', L'\u21a8',
+ L'\u21b5', L'\u21d0', L'\u21d1', L'\u21d2', L'\u21d3', L'\u21d4',
+ L'\u2200', L'\u2202', L'\u2203', L'\u2205', L'\u2207', L'\u2208',
+ L'\u2209', L'\u220b', L'\u220f', L'\u2211', L'\u2212', L'\u2217',
+ L'\u221a', L'\u221d', L'\u221e', L'\u221f', L'\u2220', L'\u2227',
+ L'\u2228', L'\u2229', L'\u222a', L'\u222b', L'\u2234', L'\u223c',
+ L'\u2245', L'\u2248', L'\u2260', L'\u2261', L'\u2264', L'\u2265',
+ L'\u2282', L'\u2283', L'\u2284', L'\u2286', L'\u2287', L'\u2295',
+ L'\u2297', L'\u22a5', L'\u22c5', L'\u2302', L'\u2310', L'\u2320',
+ L'\u2321', L'\u2329', L'\u232a', L'\u2500', L'\u2502', L'\u250c',
+ L'\u2510', L'\u2514', L'\u2518', L'\u251c', L'\u2524', L'\u252c',
+ L'\u2534', L'\u253c', L'\u2550', L'\u2551', L'\u2552', L'\u2553',
+ L'\u2554', L'\u2555', L'\u2556', L'\u2557', L'\u2558', L'\u2559',
+ L'\u255a', L'\u255b', L'\u255c', L'\u255d', L'\u255e', L'\u255f',
+ L'\u2560', L'\u2561', L'\u2562', L'\u2563', L'\u2564', L'\u2565',
+ L'\u2566', L'\u2567', L'\u2568', L'\u2569', L'\u256a', L'\u256b',
+ L'\u256c', L'\u2580', L'\u2584', L'\u2588', L'\u258c', L'\u2590',
+ L'\u2591', L'\u2592', L'\u2593', L'\u25a0', L'\u25a1', L'\u25aa',
+ L'\u25ab', L'\u25ac', L'\u25b2', L'\u25ba', L'\u25bc', L'\u25c4',
+ L'\u25ca', L'\u25cb', L'\u25cf', L'\u25d8', L'\u25d9', L'\u25e6',
+ L'\u263a', L'\u263b', L'\u263c', L'\u2640', L'\u2642', L'\u2660',
+ L'\u2663', L'\u2665', L'\u2666', L'\u266a', L'\u266b'
};
static const char *adobe_glyph_name[nadobe_glyph] = {
- "space", "exclam", "quotedbl", "numbersign", "dollar", "percent",
- "ampersand", "quotesingle", "parenleft", "parenright", "asterisk",
- "plus", "comma", "hyphen", "period", "slash", "zero", "one",
- "two", "three", "four", "five", "six", "seven", "eight", "nine",
- "colon", "semicolon", "less", "equal", "greater", "question",
- "at", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L",
- "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y",
- "Z", "bracketleft", "backslash", "bracketright", "asciicircum",
- "underscore", "grave", "a", "b", "c", "d", "e", "f", "g", "h",
- "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u",
- "v", "w", "x", "y", "z", "braceleft", "bar", "braceright",
- "asciitilde", "exclamdown", "cent", "sterling", "currency", "yen",
- "brokenbar", "section", "dieresis", "copyright", "ordfeminine",
- "guillemotleft", "logicalnot", "registered", "macron", "degree",
- "plusminus", "acute", "paragraph", "periodcentered", "cedilla",
- "ordmasculine", "guillemotright", "onequarter", "onehalf",
- "threequarters", "questiondown", "Agrave", "Aacute",
- "Acircumflex", "Atilde", "Adieresis", "Aring", "AE", "Ccedilla",
- "Egrave", "Eacute", "Ecircumflex", "Edieresis", "Igrave",
- "Iacute", "Icircumflex", "Idieresis", "Eth", "Ntilde", "Ograve",
- "Oacute", "Ocircumflex", "Otilde", "Odieresis", "multiply",
- "Oslash", "Ugrave", "Uacute", "Ucircumflex", "Udieresis",
- "Yacute", "Thorn", "germandbls", "agrave", "aacute",
- "acircumflex", "atilde", "adieresis", "aring", "ae", "ccedilla",
- "egrave", "eacute", "ecircumflex", "edieresis", "igrave",
- "iacute", "icircumflex", "idieresis", "eth", "ntilde", "ograve",
- "oacute", "ocircumflex", "otilde", "odieresis", "divide",
- "oslash", "ugrave", "uacute", "ucircumflex", "udieresis",
- "yacute", "thorn", "ydieresis", "Amacron", "amacron", "Abreve",
- "abreve", "Aogonek", "aogonek", "Cacute", "cacute", "Ccircumflex",
- "ccircumflex", "Cdotaccent", "cdotaccent", "Ccaron", "ccaron",
- "Dcaron", "dcaron", "Dcroat", "dcroat", "Emacron", "emacron",
- "Ebreve", "ebreve", "Edotaccent", "edotaccent", "Eogonek",
- "eogonek", "Ecaron", "ecaron", "Gcircumflex", "gcircumflex",
- "Gbreve", "gbreve", "Gdotaccent", "gdotaccent", "Gcommaaccent",
- "gcommaaccent", "Hcircumflex", "hcircumflex", "Hbar", "hbar",
- "Itilde", "itilde", "Imacron", "imacron", "Ibreve", "ibreve",
- "Iogonek", "iogonek", "Idotaccent", "dotlessi", "IJ", "ij",
- "Jcircumflex", "jcircumflex", "Kcommaaccent", "kcommaaccent",
- "kgreenlandic", "Lacute", "lacute", "Lcommaaccent",
- "lcommaaccent", "Lcaron", "lcaron", "Ldot", "ldot", "Lslash",
- "lslash", "Nacute", "nacute", "Ncommaaccent", "ncommaaccent",
- "Ncaron", "ncaron", "napostrophe", "Eng", "eng", "Omacron",
- "omacron", "Obreve", "obreve", "Ohungarumlaut", "ohungarumlaut",
- "OE", "oe", "Racute", "racute", "Rcommaaccent", "rcommaaccent",
- "Rcaron", "rcaron", "Sacute", "sacute", "Scircumflex",
- "scircumflex", "Scedilla", "scedilla", "Scaron", "scaron",
- "Tcommaaccent", "tcommaaccent", "Tcaron", "tcaron", "Tbar",
- "tbar", "Utilde", "utilde", "Umacron", "umacron", "Ubreve",
- "ubreve", "Uring", "uring", "Uhungarumlaut", "uhungarumlaut",
- "Uogonek", "uogonek", "Wcircumflex", "wcircumflex", "Ycircumflex",
- "ycircumflex", "Ydieresis", "Zacute", "zacute", "Zdotaccent",
- "zdotaccent", "Zcaron", "zcaron", "longs", "florin", "Ohorn",
- "ohorn", "Uhorn", "uhorn", "Gcaron", "gcaron", "Aringacute",
- "aringacute", "AEacute", "aeacute", "Oslashacute", "oslashacute",
- "Scommaaccent", "scommaaccent", "afii57929", "afii64937",
- "circumflex", "caron", "breve", "dotaccent", "ring", "ogonek",
- "tilde", "hungarumlaut", "gravecomb", "acutecomb", "tildecomb",
- "hookabovecomb", "dotbelowcomb", "tonos", "dieresistonos",
- "Alphatonos", "anoteleia", "Epsilontonos", "Etatonos",
- "Iotatonos", "Omicrontonos", "Upsilontonos", "Omegatonos",
- "iotadieresistonos", "Alpha", "Beta", "Gamma", "Delta", "Epsilon",
- "Zeta", "Eta", "Theta", "Iota", "Kappa", "Lambda", "Mu", "Nu",
- "Xi", "Omicron", "Pi", "Rho", "Sigma", "Tau", "Upsilon", "Phi",
- "Chi", "Psi", "Omega", "Iotadieresis", "Upsilondieresis",
- "alphatonos", "epsilontonos", "etatonos", "iotatonos",
- "upsilondieresistonos", "alpha", "beta", "gamma", "delta",
- "epsilon", "zeta", "eta", "theta", "iota", "kappa", "lambda",
- "mu", "nu", "xi", "omicron", "pi", "rho", "sigma1", "sigma",
- "tau", "upsilon", "phi", "chi", "psi", "omega", "iotadieresis",
- "upsilondieresis", "omicrontonos", "upsilontonos", "omegatonos",
- "theta1", "Upsilon1", "phi1", "omega1", "afii10023", "afii10051",
- "afii10052", "afii10053", "afii10054", "afii10055", "afii10056",
- "afii10057", "afii10058", "afii10059", "afii10060", "afii10061",
- "afii10062", "afii10145", "afii10017", "afii10018", "afii10019",
- "afii10020", "afii10021", "afii10022", "afii10024", "afii10025",
- "afii10026", "afii10027", "afii10028", "afii10029", "afii10030",
- "afii10031", "afii10032", "afii10033", "afii10034", "afii10035",
- "afii10036", "afii10037", "afii10038", "afii10039", "afii10040",
- "afii10041", "afii10042", "afii10043", "afii10044", "afii10045",
- "afii10046", "afii10047", "afii10048", "afii10049", "afii10065",
- "afii10066", "afii10067", "afii10068", "afii10069", "afii10070",
- "afii10072", "afii10073", "afii10074", "afii10075", "afii10076",
- "afii10077", "afii10078", "afii10079", "afii10080", "afii10081",
- "afii10082", "afii10083", "afii10084", "afii10085", "afii10086",
- "afii10087", "afii10088", "afii10089", "afii10090", "afii10091",
- "afii10092", "afii10093", "afii10094", "afii10095", "afii10096",
- "afii10097", "afii10071", "afii10099", "afii10100", "afii10101",
- "afii10102", "afii10103", "afii10104", "afii10105", "afii10106",
- "afii10107", "afii10108", "afii10109", "afii10110", "afii10193",
- "afii10146", "afii10194", "afii10147", "afii10195", "afii10148",
- "afii10196", "afii10050", "afii10098", "afii10846", "afii57799",
- "afii57801", "afii57800", "afii57802", "afii57793", "afii57794",
- "afii57795", "afii57798", "afii57797", "afii57806", "afii57796",
- "afii57807", "afii57839", "afii57645", "afii57841", "afii57842",
- "afii57804", "afii57803", "afii57658", "afii57664", "afii57665",
- "afii57666", "afii57667", "afii57668", "afii57669", "afii57670",
- "afii57671", "afii57672", "afii57673", "afii57674", "afii57675",
- "afii57676", "afii57677", "afii57678", "afii57679", "afii57680",
- "afii57681", "afii57682", "afii57683", "afii57684", "afii57685",
- "afii57686", "afii57687", "afii57688", "afii57689", "afii57690",
- "afii57716", "afii57717", "afii57718", "afii57388", "afii57403",
- "afii57407", "afii57409", "afii57410", "afii57411", "afii57412",
- "afii57413", "afii57414", "afii57415", "afii57416", "afii57417",
- "afii57418", "afii57419", "afii57420", "afii57421", "afii57422",
- "afii57423", "afii57424", "afii57425", "afii57426", "afii57427",
- "afii57428", "afii57429", "afii57430", "afii57431", "afii57432",
- "afii57433", "afii57434", "afii57440", "afii57441", "afii57442",
- "afii57443", "afii57444", "afii57445", "afii57446", "afii57470",
- "afii57448", "afii57449", "afii57450", "afii57451", "afii57452",
- "afii57453", "afii57454", "afii57455", "afii57456", "afii57457",
- "afii57458", "afii57392", "afii57393", "afii57394", "afii57395",
- "afii57396", "afii57397", "afii57398", "afii57399", "afii57400",
- "afii57401", "afii57381", "afii63167", "afii57511", "afii57506",
- "afii57507", "afii57512", "afii57513", "afii57508", "afii57505",
- "afii57509", "afii57514", "afii57519", "afii57534", "Wgrave",
- "wgrave", "Wacute", "wacute", "Wdieresis", "wdieresis", "Ygrave",
- "ygrave", "afii61664", "afii301", "afii299", "afii300",
- "figuredash", "endash", "emdash", "afii00208", "underscoredbl",
- "quoteleft", "quoteright", "quotesinglbase", "quotereversed",
- "quotedblleft", "quotedblright", "quotedblbase", "dagger",
- "daggerdbl", "bullet", "onedotenleader", "twodotenleader",
- "ellipsis", "afii61573", "afii61574", "afii61575", "perthousand",
- "minute", "second", "guilsinglleft", "guilsinglright",
- "exclamdbl", "fraction", "colonmonetary", "franc", "lira",
- "peseta", "afii57636", "dong", "Euro", "afii61248", "Ifraktur",
- "afii61289", "afii61352", "weierstrass", "Rfraktur",
- "prescription", "trademark", "estimated", "aleph", "onethird",
- "twothirds", "oneeighth", "threeeighths", "fiveeighths",
- "seveneighths", "arrowleft", "arrowup", "arrowright", "arrowdown",
- "arrowboth", "arrowupdn", "arrowupdnbse", "carriagereturn",
- "arrowdblleft", "arrowdblup", "arrowdblright", "arrowdbldown",
- "arrowdblboth", "universal", "partialdiff", "existential",
- "emptyset", "gradient", "element", "notelement", "suchthat",
- "product", "summation", "minus", "asteriskmath", "radical",
- "proportional", "infinity", "orthogonal", "angle", "logicaland",
- "logicalor", "intersection", "union", "integral", "therefore",
- "similar", "congruent", "approxequal", "notequal", "equivalence",
- "lessequal", "greaterequal", "propersubset", "propersuperset",
- "notsubset", "reflexsubset", "reflexsuperset", "circleplus",
- "circlemultiply", "perpendicular", "dotmath", "house",
- "revlogicalnot", "integraltp", "integralbt", "angleleft",
- "angleright", "SF100000", "SF110000", "SF010000", "SF030000",
- "SF020000", "SF040000", "SF080000", "SF090000", "SF060000",
- "SF070000", "SF050000", "SF430000", "SF240000", "SF510000",
- "SF520000", "SF390000", "SF220000", "SF210000", "SF250000",
- "SF500000", "SF490000", "SF380000", "SF280000", "SF270000",
- "SF260000", "SF360000", "SF370000", "SF420000", "SF190000",
- "SF200000", "SF230000", "SF470000", "SF480000", "SF410000",
- "SF450000", "SF460000", "SF400000", "SF540000", "SF530000",
- "SF440000", "upblock", "dnblock", "block", "lfblock", "rtblock",
- "ltshade", "shade", "dkshade", "filledbox", "H22073", "H18543",
- "H18551", "filledrect", "triagup", "triagrt", "triagdn",
- "triaglf", "lozenge", "circle", "H18533", "invbullet",
- "invcircle", "openbullet", "smileface", "invsmileface", "sun",
- "female", "male", "spade", "club", "heart", "diamond",
- "musicalnote", "musicalnotedbl"
+ "space", "exclam", "quotedbl", "numbersign", "dollar", "percent",
+ "ampersand", "quotesingle", "parenleft", "parenright", "asterisk",
+ "plus", "comma", "hyphen", "period", "slash", "zero", "one",
+ "two", "three", "four", "five", "six", "seven", "eight", "nine",
+ "colon", "semicolon", "less", "equal", "greater", "question",
+ "at", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L",
+ "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y",
+ "Z", "bracketleft", "backslash", "bracketright", "asciicircum",
+ "underscore", "grave", "a", "b", "c", "d", "e", "f", "g", "h",
+ "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u",
+ "v", "w", "x", "y", "z", "braceleft", "bar", "braceright",
+ "asciitilde", "exclamdown", "cent", "sterling", "currency", "yen",
+ "brokenbar", "section", "dieresis", "copyright", "ordfeminine",
+ "guillemotleft", "logicalnot", "registered", "macron", "degree",
+ "plusminus", "acute", "paragraph", "periodcentered", "cedilla",
+ "ordmasculine", "guillemotright", "onequarter", "onehalf",
+ "threequarters", "questiondown", "Agrave", "Aacute",
+ "Acircumflex", "Atilde", "Adieresis", "Aring", "AE", "Ccedilla",
+ "Egrave", "Eacute", "Ecircumflex", "Edieresis", "Igrave",
+ "Iacute", "Icircumflex", "Idieresis", "Eth", "Ntilde", "Ograve",
+ "Oacute", "Ocircumflex", "Otilde", "Odieresis", "multiply",
+ "Oslash", "Ugrave", "Uacute", "Ucircumflex", "Udieresis",
+ "Yacute", "Thorn", "germandbls", "agrave", "aacute",
+ "acircumflex", "atilde", "adieresis", "aring", "ae", "ccedilla",
+ "egrave", "eacute", "ecircumflex", "edieresis", "igrave",
+ "iacute", "icircumflex", "idieresis", "eth", "ntilde", "ograve",
+ "oacute", "ocircumflex", "otilde", "odieresis", "divide",
+ "oslash", "ugrave", "uacute", "ucircumflex", "udieresis",
+ "yacute", "thorn", "ydieresis", "Amacron", "amacron", "Abreve",
+ "abreve", "Aogonek", "aogonek", "Cacute", "cacute", "Ccircumflex",
+ "ccircumflex", "Cdotaccent", "cdotaccent", "Ccaron", "ccaron",
+ "Dcaron", "dcaron", "Dcroat", "dcroat", "Emacron", "emacron",
+ "Ebreve", "ebreve", "Edotaccent", "edotaccent", "Eogonek",
+ "eogonek", "Ecaron", "ecaron", "Gcircumflex", "gcircumflex",
+ "Gbreve", "gbreve", "Gdotaccent", "gdotaccent", "Gcommaaccent",
+ "gcommaaccent", "Hcircumflex", "hcircumflex", "Hbar", "hbar",
+ "Itilde", "itilde", "Imacron", "imacron", "Ibreve", "ibreve",
+ "Iogonek", "iogonek", "Idotaccent", "dotlessi", "IJ", "ij",
+ "Jcircumflex", "jcircumflex", "Kcommaaccent", "kcommaaccent",
+ "kgreenlandic", "Lacute", "lacute", "Lcommaaccent",
+ "lcommaaccent", "Lcaron", "lcaron", "Ldot", "ldot", "Lslash",
+ "lslash", "Nacute", "nacute", "Ncommaaccent", "ncommaaccent",
+ "Ncaron", "ncaron", "napostrophe", "Eng", "eng", "Omacron",
+ "omacron", "Obreve", "obreve", "Ohungarumlaut", "ohungarumlaut",
+ "OE", "oe", "Racute", "racute", "Rcommaaccent", "rcommaaccent",
+ "Rcaron", "rcaron", "Sacute", "sacute", "Scircumflex",
+ "scircumflex", "Scedilla", "scedilla", "Scaron", "scaron",
+ "Tcommaaccent", "tcommaaccent", "Tcaron", "tcaron", "Tbar",
+ "tbar", "Utilde", "utilde", "Umacron", "umacron", "Ubreve",
+ "ubreve", "Uring", "uring", "Uhungarumlaut", "uhungarumlaut",
+ "Uogonek", "uogonek", "Wcircumflex", "wcircumflex", "Ycircumflex",
+ "ycircumflex", "Ydieresis", "Zacute", "zacute", "Zdotaccent",
+ "zdotaccent", "Zcaron", "zcaron", "longs", "florin", "Ohorn",
+ "ohorn", "Uhorn", "uhorn", "Gcaron", "gcaron", "Aringacute",
+ "aringacute", "AEacute", "aeacute", "Oslashacute", "oslashacute",
+ "Scommaaccent", "scommaaccent", "afii57929", "afii64937",
+ "circumflex", "caron", "breve", "dotaccent", "ring", "ogonek",
+ "tilde", "hungarumlaut", "gravecomb", "acutecomb", "tildecomb",
+ "hookabovecomb", "dotbelowcomb", "tonos", "dieresistonos",
+ "Alphatonos", "anoteleia", "Epsilontonos", "Etatonos",
+ "Iotatonos", "Omicrontonos", "Upsilontonos", "Omegatonos",
+ "iotadieresistonos", "Alpha", "Beta", "Gamma", "Delta", "Epsilon",
+ "Zeta", "Eta", "Theta", "Iota", "Kappa", "Lambda", "Mu", "Nu",
+ "Xi", "Omicron", "Pi", "Rho", "Sigma", "Tau", "Upsilon", "Phi",
+ "Chi", "Psi", "Omega", "Iotadieresis", "Upsilondieresis",
+ "alphatonos", "epsilontonos", "etatonos", "iotatonos",
+ "upsilondieresistonos", "alpha", "beta", "gamma", "delta",
+ "epsilon", "zeta", "eta", "theta", "iota", "kappa", "lambda",
+ "mu", "nu", "xi", "omicron", "pi", "rho", "sigma1", "sigma",
+ "tau", "upsilon", "phi", "chi", "psi", "omega", "iotadieresis",
+ "upsilondieresis", "omicrontonos", "upsilontonos", "omegatonos",
+ "theta1", "Upsilon1", "phi1", "omega1", "afii10023", "afii10051",
+ "afii10052", "afii10053", "afii10054", "afii10055", "afii10056",
+ "afii10057", "afii10058", "afii10059", "afii10060", "afii10061",
+ "afii10062", "afii10145", "afii10017", "afii10018", "afii10019",
+ "afii10020", "afii10021", "afii10022", "afii10024", "afii10025",
+ "afii10026", "afii10027", "afii10028", "afii10029", "afii10030",
+ "afii10031", "afii10032", "afii10033", "afii10034", "afii10035",
+ "afii10036", "afii10037", "afii10038", "afii10039", "afii10040",
+ "afii10041", "afii10042", "afii10043", "afii10044", "afii10045",
+ "afii10046", "afii10047", "afii10048", "afii10049", "afii10065",
+ "afii10066", "afii10067", "afii10068", "afii10069", "afii10070",
+ "afii10072", "afii10073", "afii10074", "afii10075", "afii10076",
+ "afii10077", "afii10078", "afii10079", "afii10080", "afii10081",
+ "afii10082", "afii10083", "afii10084", "afii10085", "afii10086",
+ "afii10087", "afii10088", "afii10089", "afii10090", "afii10091",
+ "afii10092", "afii10093", "afii10094", "afii10095", "afii10096",
+ "afii10097", "afii10071", "afii10099", "afii10100", "afii10101",
+ "afii10102", "afii10103", "afii10104", "afii10105", "afii10106",
+ "afii10107", "afii10108", "afii10109", "afii10110", "afii10193",
+ "afii10146", "afii10194", "afii10147", "afii10195", "afii10148",
+ "afii10196", "afii10050", "afii10098", "afii10846", "afii57799",
+ "afii57801", "afii57800", "afii57802", "afii57793", "afii57794",
+ "afii57795", "afii57798", "afii57797", "afii57806", "afii57796",
+ "afii57807", "afii57839", "afii57645", "afii57841", "afii57842",
+ "afii57804", "afii57803", "afii57658", "afii57664", "afii57665",
+ "afii57666", "afii57667", "afii57668", "afii57669", "afii57670",
+ "afii57671", "afii57672", "afii57673", "afii57674", "afii57675",
+ "afii57676", "afii57677", "afii57678", "afii57679", "afii57680",
+ "afii57681", "afii57682", "afii57683", "afii57684", "afii57685",
+ "afii57686", "afii57687", "afii57688", "afii57689", "afii57690",
+ "afii57716", "afii57717", "afii57718", "afii57388", "afii57403",
+ "afii57407", "afii57409", "afii57410", "afii57411", "afii57412",
+ "afii57413", "afii57414", "afii57415", "afii57416", "afii57417",
+ "afii57418", "afii57419", "afii57420", "afii57421", "afii57422",
+ "afii57423", "afii57424", "afii57425", "afii57426", "afii57427",
+ "afii57428", "afii57429", "afii57430", "afii57431", "afii57432",
+ "afii57433", "afii57434", "afii57440", "afii57441", "afii57442",
+ "afii57443", "afii57444", "afii57445", "afii57446", "afii57470",
+ "afii57448", "afii57449", "afii57450", "afii57451", "afii57452",
+ "afii57453", "afii57454", "afii57455", "afii57456", "afii57457",
+ "afii57458", "afii57392", "afii57393", "afii57394", "afii57395",
+ "afii57396", "afii57397", "afii57398", "afii57399", "afii57400",
+ "afii57401", "afii57381", "afii63167", "afii57511", "afii57506",
+ "afii57507", "afii57512", "afii57513", "afii57508", "afii57505",
+ "afii57509", "afii57514", "afii57519", "afii57534", "Wgrave",
+ "wgrave", "Wacute", "wacute", "Wdieresis", "wdieresis", "Ygrave",
+ "ygrave", "afii61664", "afii301", "afii299", "afii300",
+ "figuredash", "endash", "emdash", "afii00208", "underscoredbl",
+ "quoteleft", "quoteright", "quotesinglbase", "quotereversed",
+ "quotedblleft", "quotedblright", "quotedblbase", "dagger",
+ "daggerdbl", "bullet", "onedotenleader", "twodotenleader",
+ "ellipsis", "afii61573", "afii61574", "afii61575", "perthousand",
+ "minute", "second", "guilsinglleft", "guilsinglright",
+ "exclamdbl", "fraction", "colonmonetary", "franc", "lira",
+ "peseta", "afii57636", "dong", "Euro", "afii61248", "Ifraktur",
+ "afii61289", "afii61352", "weierstrass", "Rfraktur",
+ "prescription", "trademark", "estimated", "aleph", "onethird",
+ "twothirds", "oneeighth", "threeeighths", "fiveeighths",
+ "seveneighths", "arrowleft", "arrowup", "arrowright", "arrowdown",
+ "arrowboth", "arrowupdn", "arrowupdnbse", "carriagereturn",
+ "arrowdblleft", "arrowdblup", "arrowdblright", "arrowdbldown",
+ "arrowdblboth", "universal", "partialdiff", "existential",
+ "emptyset", "gradient", "element", "notelement", "suchthat",
+ "product", "summation", "minus", "asteriskmath", "radical",
+ "proportional", "infinity", "orthogonal", "angle", "logicaland",
+ "logicalor", "intersection", "union", "integral", "therefore",
+ "similar", "congruent", "approxequal", "notequal", "equivalence",
+ "lessequal", "greaterequal", "propersubset", "propersuperset",
+ "notsubset", "reflexsubset", "reflexsuperset", "circleplus",
+ "circlemultiply", "perpendicular", "dotmath", "house",
+ "revlogicalnot", "integraltp", "integralbt", "angleleft",
+ "angleright", "SF100000", "SF110000", "SF010000", "SF030000",
+ "SF020000", "SF040000", "SF080000", "SF090000", "SF060000",
+ "SF070000", "SF050000", "SF430000", "SF240000", "SF510000",
+ "SF520000", "SF390000", "SF220000", "SF210000", "SF250000",
+ "SF500000", "SF490000", "SF380000", "SF280000", "SF270000",
+ "SF260000", "SF360000", "SF370000", "SF420000", "SF190000",
+ "SF200000", "SF230000", "SF470000", "SF480000", "SF410000",
+ "SF450000", "SF460000", "SF400000", "SF540000", "SF530000",
+ "SF440000", "upblock", "dnblock", "block", "lfblock", "rtblock",
+ "ltshade", "shade", "dkshade", "filledbox", "H22073", "H18543",
+ "H18551", "filledrect", "triagup", "triagrt", "triagdn",
+ "triaglf", "lozenge", "circle", "H18533", "invbullet",
+ "invcircle", "openbullet", "smileface", "invsmileface", "sun",
+ "female", "male", "spade", "club", "heart", "diamond",
+ "musicalnote", "musicalnotedbl"
};
diff --git a/graf2d/mathtext/src/table/mathbracketcs.h b/graf2d/mathtext/src/table/mathbracketcs.h
index 0368b9b4e81..ff0577f0711 100644
--- a/graf2d/mathtext/src/table/mathbracketcs.h
+++ b/graf2d/mathtext/src/table/mathbracketcs.h
@@ -19,5 +19,5 @@
static const unsigned long nbracket_control_sequence = 1;
static const char *
bracket_control_sequence[nbracket_control_sequence] = {
- "\\sqrt"
+ "\\sqrt"
};
diff --git a/graf2d/mathtext/src/table/mathfontch.h b/graf2d/mathtext/src/table/mathfontch.h
index 74eddad36c0..df90ed93c81 100644
--- a/graf2d/mathtext/src/table/mathfontch.h
+++ b/graf2d/mathtext/src/table/mathfontch.h
@@ -19,16 +19,16 @@
static const unsigned long nfont_change = 8;
static const char *
font_change_control_sequence[nfont_change] = {
- "\\mathbb", "\\mathbf", "\\mathfr", "\\mathit", "\\mathrm",
- "\\mathscr", "\\mathsf", "\\mathtt"
+ "\\mathbb", "\\mathbf", "\\mathfr", "\\mathit", "\\mathrm",
+ "\\mathscr", "\\mathsf", "\\mathtt"
};
static const unsigned int font_change_family[nfont_change] = {
- math_symbol_t::FAMILY_MATH_BLACKBOARD_BOLD,
- math_symbol_t::FAMILY_BOLD,
- math_symbol_t::FAMILY_MATH_FRAKTUR_REGULAR,
- math_symbol_t::FAMILY_ITALIC,
- math_symbol_t::FAMILY_REGULAR,
- math_symbol_t::FAMILY_MATH_SCRIPT_ITALIC,
- math_symbol_t::FAMILY_MATH_SANS_SERIF_REGULAR,
- math_symbol_t::FAMILY_MATH_MONOSPACE
+ math_symbol_t::FAMILY_MATH_BLACKBOARD_BOLD,
+ math_symbol_t::FAMILY_BOLD,
+ math_symbol_t::FAMILY_MATH_FRAKTUR_REGULAR,
+ math_symbol_t::FAMILY_ITALIC,
+ math_symbol_t::FAMILY_REGULAR,
+ math_symbol_t::FAMILY_MATH_SCRIPT_ITALIC,
+ math_symbol_t::FAMILY_MATH_SANS_SERIF_REGULAR,
+ math_symbol_t::FAMILY_MATH_MONOSPACE
};
diff --git a/graf2d/mathtext/src/table/mathfontparam.h b/graf2d/mathtext/src/table/mathfontparam.h
index 32ca9794b98..de3cf462447 100644
--- a/graf2d/mathtext/src/table/mathfontparam.h
+++ b/graf2d/mathtext/src/table/mathfontparam.h
@@ -68,8 +68,7 @@ const float math_text_renderer_t::big_op_spacing_5 = 0.111111F;
/////////////////////////////////////////////////////////////////////
// Implicit TFM Font Parameters
const float math_text_renderer_t::radical_rule_thickness = 0.054F;
-const float math_text_renderer_t::large_operator_display_scale =
- 1.4F;
+const float math_text_renderer_t::large_operator_display_scale = 1.4F;
/////////////////////////////////////////////////////////////////////
// Text Mode Parameters
diff --git a/graf2d/mathtext/src/table/mathopstd.h b/graf2d/mathtext/src/table/mathopstd.h
index 637c9e2743e..ddbd159cdfa 100644
--- a/graf2d/mathtext/src/table/mathopstd.h
+++ b/graf2d/mathtext/src/table/mathopstd.h
@@ -18,45 +18,45 @@
static const unsigned long noperator = 66;
static const char *operator_control_sequence[noperator] = {
- "\\Pr", "\\arccos", "\\arcsin", "\\arctan", "\\arg", "\\awoint",
- "\\awointop", "\\barint", "\\barintop", "\\bigcap", "\\bigcup",
- "\\bigodot", "\\bigoplus", "\\bigotimes", "\\bigsqcup",
- "\\biguplus", "\\bigvee", "\\bigwedge", "\\coprod", "\\cos",
- "\\cosh", "\\cot", "\\coth", "\\csc", "\\cwint", "\\cwintop",
- "\\cwoint", "\\cwointop", "\\deg", "\\det", "\\dim", "\\exp",
- "\\gcd", "\\hom", "\\iiint", "\\iiintop", "\\iint", "\\iintop",
- "\\inf", "\\int", "\\intop", "\\ker", "\\lg", "\\lim", "\\liminf",
- "\\limsup", "\\ln", "\\log", "\\max", "\\min", "\\oiiint",
- "\\oiiintop", "\\oiint", "\\oiintop", "\\oint", "\\ointop",
- "\\prod", "\\sec", "\\sin", "\\sinh", "\\slashint",
- "\\slashintop", "\\sum", "\\sup", "\\tan", "\\tanh"
+ "\\Pr", "\\arccos", "\\arcsin", "\\arctan", "\\arg", "\\awoint",
+ "\\awointop", "\\barint", "\\barintop", "\\bigcap", "\\bigcup",
+ "\\bigodot", "\\bigoplus", "\\bigotimes", "\\bigsqcup",
+ "\\biguplus", "\\bigvee", "\\bigwedge", "\\coprod", "\\cos",
+ "\\cosh", "\\cot", "\\coth", "\\csc", "\\cwint", "\\cwintop",
+ "\\cwoint", "\\cwointop", "\\deg", "\\det", "\\dim", "\\exp",
+ "\\gcd", "\\hom", "\\iiint", "\\iiintop", "\\iint", "\\iintop",
+ "\\inf", "\\int", "\\intop", "\\ker", "\\lg", "\\lim", "\\liminf",
+ "\\limsup", "\\ln", "\\log", "\\max", "\\min", "\\oiiint",
+ "\\oiiintop", "\\oiint", "\\oiintop", "\\oint", "\\ointop",
+ "\\prod", "\\sec", "\\sin", "\\sinh", "\\slashint",
+ "\\slashintop", "\\sum", "\\sup", "\\tan", "\\tanh"
};
static const wchar_t operator_code_point[noperator] = {
- L'\0', L'\0', L'\0', L'\0', L'\0', L'\u2233', L'\u2233',
- L'\u2a0d', L'\u2a0d', L'\u22c2', L'\u22c3', L'\u2a00', L'\u2a01',
- L'\u2a02', L'\u2a06', L'\u2a04', L'\u22c1', L'\u22c0', L'\u2210',
- L'\0', L'\0', L'\0', L'\0', L'\0', L'\u2231', L'\u2231',
- L'\u2232', L'\u2232', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0',
- L'\u222d', L'\u222d', L'\u222c', L'\u222c', L'\0', L'\u222b',
- L'\u222b', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0',
- L'\0', L'\u2230', L'\u2230', L'\u222f', L'\u222f', L'\u222e',
- L'\u222e', L'\u220f', L'\0', L'\0', L'\0', L'\u2a0f', L'\u2a0f',
- L'\u2211', L'\0', L'\0', L'\0'
+ L'\0', L'\0', L'\0', L'\0', L'\0', L'\u2233', L'\u2233',
+ L'\u2a0d', L'\u2a0d', L'\u22c2', L'\u22c3', L'\u2a00', L'\u2a01',
+ L'\u2a02', L'\u2a06', L'\u2a04', L'\u22c1', L'\u22c0', L'\u2210',
+ L'\0', L'\0', L'\0', L'\0', L'\0', L'\u2231', L'\u2231',
+ L'\u2232', L'\u2232', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0',
+ L'\u222d', L'\u222d', L'\u222c', L'\u222c', L'\0', L'\u222b',
+ L'\u222b', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0',
+ L'\0', L'\u2230', L'\u2230', L'\u222f', L'\u222f', L'\u222e',
+ L'\u222e', L'\u220f', L'\0', L'\0', L'\0', L'\u2a0f', L'\u2a0f',
+ L'\u2211', L'\0', L'\0', L'\0'
};
static const char *operator_content[noperator] = {
- "Pr", "arccos", "arcsin", "arctan", "arg", "", "", "", "", "", "",
- "", "", "", "", "", "", "", "", "cos", "cosh", "cot", "coth",
- "csc", "", "", "", "", "deg", "det", "dim", "exp", "gcd", "hom",
- "", "", "", "", "inf", "", "", "ker", "lg", "lim", "lim\\,inf",
- "lim\\,sup", "ln", "log", "max", "min", "", "", "", "", "", "",
- "", "sec", "sin", "sinh", "", "", "", "sup", "tan", "tanh"
+ "Pr", "arccos", "arcsin", "arctan", "arg", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "cos", "cosh", "cot", "coth",
+ "csc", "", "", "", "", "deg", "det", "dim", "exp", "gcd", "hom",
+ "", "", "", "", "inf", "", "", "ker", "lg", "lim", "lim\\,inf",
+ "lim\\,sup", "ln", "log", "max", "min", "", "", "", "", "", "",
+ "", "sec", "sin", "sinh", "", "", "", "sup", "tan", "tanh"
};
static const bool operator_nolimits[noperator] = {
- false, true, true, true, true, true, false, true, false, false,
- false, false, false, false, false, false, false, false, false,
- true, true, true, true, true, true, false, true, false, true,
- false, true, true, false, true, true, false, true, false, false,
- true, false, true, true, false, false, false, true, true, false,
- false, true, false, true, false, true, false, false, true, true,
- true, true, false, false, false, true, true
+ false, true, true, true, true, true, false, true, false, false,
+ false, false, false, false, false, false, false, false, false,
+ true, true, true, true, true, true, false, true, false, true,
+ false, true, true, false, true, true, false, true, false, false,
+ true, false, true, true, false, false, false, true, true, false,
+ false, true, false, true, false, true, false, false, true, true,
+ true, true, false, false, false, true, true
};
diff --git a/graf2d/mathtext/src/table/mathspacing.h b/graf2d/mathtext/src/table/mathspacing.h
index 8c948f76dff..7f767427df8 100644
--- a/graf2d/mathtext/src/table/mathspacing.h
+++ b/graf2d/mathtext/src/table/mathspacing.h
@@ -19,13 +19,13 @@
// See also Knuth (1986), p. 170.
static const int nvr = INT_MIN;
static const int spacing_table[64] = {
- // right -> Ord Op Bin Rel Open Close Punct Inner
- /* Ord */ 0, 1, -2, -3, 0, 0, 0, -1,
- /* Op */ 1, 1, nvr, -3, 0, 0, 0, -1,
- /* Bin */ -2, -2, nvr, nvr, -2, nvr, nvr, -2,
- /* Rel */ -3, -3, nvr, 0, -2, nvr, nvr, -2,
- /* Open */ 0, 0, nvr, 0, 0, 0, 0, 0,
- /* Close */ 0, 1, -2, -3, 0, 0, 0, -1,
- /* Punct */ -1, -1, nvr, -1, -1, -1, -1, -1,
- /* Inner */ -1, 1, -2, -3, -1, 0, -1, -1
+ // right -> Ord Op Bin Rel Open Close Punct Inner
+ /* Ord */ 0, 1, -2, -3, 0, 0, 0, -1,
+ /* Op */ 1, 1, nvr, -3, 0, 0, 0, -1,
+ /* Bin */ -2, -2, nvr, nvr, -2, nvr, nvr, -2,
+ /* Rel */ -3, -3, nvr, 0, -2, nvr, nvr, -2,
+ /* Open */ 0, 0, nvr, 0, 0, 0, 0, 0,
+ /* Close */ 0, 1, -2, -3, 0, 0, 0, -1,
+ /* Punct */ -1, -1, nvr, -1, -1, -1, -1, -1,
+ /* Inner */ -1, 1, -2, -3, -1, 0, -1, -1
};
diff --git a/graf2d/postscript/src/AdobeGlyphList.h b/graf2d/postscript/src/AdobeGlyphList.h
index 61e707088a3..c05e79fb449 100644
--- a/graf2d/postscript/src/AdobeGlyphList.h
+++ b/graf2d/postscript/src/AdobeGlyphList.h
@@ -1,297 +1,297 @@
static const unsigned long nadobe_glyph = 835;
static const wchar_t adobe_glyph_ucs[nadobe_glyph] = {
- L'\040', L'\041', L'\042', L'\043', L'\044', L'\045', L'\046',
- L'\047', L'\050', L'\051', L'\052', L'\053', L'\054', L'\055',
- L'\056', L'\057', L'\060', L'\061', L'\062', L'\063', L'\064',
- L'\065', L'\066', L'\067', L'\070', L'\071', L'\072', L'\073',
- L'\074', L'\075', L'\076', L'\077', L'\100', L'\101', L'\102',
- L'\103', L'\104', L'\105', L'\106', L'\107', L'\110', L'\111',
- L'\112', L'\113', L'\114', L'\115', L'\116', L'\117', L'\120',
- L'\121', L'\122', L'\123', L'\124', L'\125', L'\126', L'\127',
- L'\130', L'\131', L'\132', L'\133', L'\134', L'\135', L'\136',
- L'\137', L'\140', L'\141', L'\142', L'\143', L'\144', L'\145',
- L'\146', L'\147', L'\150', L'\151', L'\152', L'\153', L'\154',
- L'\155', L'\156', L'\157', L'\160', L'\161', L'\162', L'\163',
- L'\164', L'\165', L'\166', L'\167', L'\170', L'\171', L'\172',
- L'\173', L'\174', L'\175', L'\176', L'\241', L'\242', L'\243',
- L'\244', L'\245', L'\246', L'\247', L'\250', L'\251', L'\252',
- L'\253', L'\254', L'\256', L'\257', L'\260', L'\261', L'\264',
- L'\266', L'\267', L'\270', L'\272', L'\273', L'\274', L'\275',
- L'\276', L'\277', L'\300', L'\301', L'\302', L'\303', L'\304',
- L'\305', L'\306', L'\307', L'\310', L'\311', L'\312', L'\313',
- L'\314', L'\315', L'\316', L'\317', L'\320', L'\321', L'\322',
- L'\323', L'\324', L'\325', L'\326', L'\327', L'\330', L'\331',
- L'\332', L'\333', L'\334', L'\335', L'\336', L'\337', L'\340',
- L'\341', L'\342', L'\343', L'\344', L'\345', L'\346', L'\347',
- L'\350', L'\351', L'\352', L'\353', L'\354', L'\355', L'\356',
- L'\357', L'\360', L'\361', L'\362', L'\363', L'\364', L'\365',
- L'\366', L'\367', L'\370', L'\371', L'\372', L'\373', L'\374',
- L'\375', L'\376', L'\377', L'\u0100', L'\u0101', L'\u0102',
- L'\u0103', L'\u0104', L'\u0105', L'\u0106', L'\u0107', L'\u0108',
- L'\u0109', L'\u010a', L'\u010b', L'\u010c', L'\u010d', L'\u010e',
- L'\u010f', L'\u0110', L'\u0111', L'\u0112', L'\u0113', L'\u0114',
- L'\u0115', L'\u0116', L'\u0117', L'\u0118', L'\u0119', L'\u011a',
- L'\u011b', L'\u011c', L'\u011d', L'\u011e', L'\u011f', L'\u0120',
- L'\u0121', L'\u0122', L'\u0123', L'\u0124', L'\u0125', L'\u0126',
- L'\u0127', L'\u0128', L'\u0129', L'\u012a', L'\u012b', L'\u012c',
- L'\u012d', L'\u012e', L'\u012f', L'\u0130', L'\u0131', L'\u0132',
- L'\u0133', L'\u0134', L'\u0135', L'\u0136', L'\u0137', L'\u0138',
- L'\u0139', L'\u013a', L'\u013b', L'\u013c', L'\u013d', L'\u013e',
- L'\u013f', L'\u0140', L'\u0141', L'\u0142', L'\u0143', L'\u0144',
- L'\u0145', L'\u0146', L'\u0147', L'\u0148', L'\u0149', L'\u014a',
- L'\u014b', L'\u014c', L'\u014d', L'\u014e', L'\u014f', L'\u0150',
- L'\u0151', L'\u0152', L'\u0153', L'\u0154', L'\u0155', L'\u0156',
- L'\u0157', L'\u0158', L'\u0159', L'\u015a', L'\u015b', L'\u015c',
- L'\u015d', L'\u015e', L'\u015f', L'\u0160', L'\u0161', L'\u0162',
- L'\u0163', L'\u0164', L'\u0165', L'\u0166', L'\u0167', L'\u0168',
- L'\u0169', L'\u016a', L'\u016b', L'\u016c', L'\u016d', L'\u016e',
- L'\u016f', L'\u0170', L'\u0171', L'\u0172', L'\u0173', L'\u0174',
- L'\u0175', L'\u0176', L'\u0177', L'\u0178', L'\u0179', L'\u017a',
- L'\u017b', L'\u017c', L'\u017d', L'\u017e', L'\u017f', L'\u0192',
- L'\u01a0', L'\u01a1', L'\u01af', L'\u01b0', L'\u01e6', L'\u01e7',
- L'\u01fa', L'\u01fb', L'\u01fc', L'\u01fd', L'\u01fe', L'\u01ff',
- L'\u0218', L'\u0219', L'\u02bc', L'\u02bd', L'\u02c6', L'\u02c7',
- L'\u02d8', L'\u02d9', L'\u02da', L'\u02db', L'\u02dc', L'\u02dd',
- L'\u0300', L'\u0301', L'\u0303', L'\u0309', L'\u0323', L'\u0384',
- L'\u0385', L'\u0386', L'\u0387', L'\u0388', L'\u0389', L'\u038a',
- L'\u038c', L'\u038e', L'\u038f', L'\u0390', L'\u0391', L'\u0392',
- L'\u0393', L'\u0394', L'\u0395', L'\u0396', L'\u0397', L'\u0398',
- L'\u0399', L'\u039a', L'\u039b', L'\u039c', L'\u039d', L'\u039e',
- L'\u039f', L'\u03a0', L'\u03a1', L'\u03a3', L'\u03a4', L'\u03a5',
- L'\u03a6', L'\u03a7', L'\u03a8', L'\u03a9', L'\u03aa', L'\u03ab',
- L'\u03ac', L'\u03ad', L'\u03ae', L'\u03af', L'\u03b0', L'\u03b1',
- L'\u03b2', L'\u03b3', L'\u03b4', L'\u03b5', L'\u03b6', L'\u03b7',
- L'\u03b8', L'\u03b9', L'\u03ba', L'\u03bb', L'\u03bc', L'\u03bd',
- L'\u03be', L'\u03bf', L'\u03c0', L'\u03c1', L'\u03c2', L'\u03c3',
- L'\u03c4', L'\u03c5', L'\u03c6', L'\u03c7', L'\u03c8', L'\u03c9',
- L'\u03ca', L'\u03cb', L'\u03cc', L'\u03cd', L'\u03ce', L'\u03d1',
- L'\u03d2', L'\u03d5', L'\u03d6', L'\u0401', L'\u0402', L'\u0403',
- L'\u0404', L'\u0405', L'\u0406', L'\u0407', L'\u0408', L'\u0409',
- L'\u040a', L'\u040b', L'\u040c', L'\u040e', L'\u040f', L'\u0410',
- L'\u0411', L'\u0412', L'\u0413', L'\u0414', L'\u0415', L'\u0416',
- L'\u0417', L'\u0418', L'\u0419', L'\u041a', L'\u041b', L'\u041c',
- L'\u041d', L'\u041e', L'\u041f', L'\u0420', L'\u0421', L'\u0422',
- L'\u0423', L'\u0424', L'\u0425', L'\u0426', L'\u0427', L'\u0428',
- L'\u0429', L'\u042a', L'\u042b', L'\u042c', L'\u042d', L'\u042e',
- L'\u042f', L'\u0430', L'\u0431', L'\u0432', L'\u0433', L'\u0434',
- L'\u0435', L'\u0436', L'\u0437', L'\u0438', L'\u0439', L'\u043a',
- L'\u043b', L'\u043c', L'\u043d', L'\u043e', L'\u043f', L'\u0440',
- L'\u0441', L'\u0442', L'\u0443', L'\u0444', L'\u0445', L'\u0446',
- L'\u0447', L'\u0448', L'\u0449', L'\u044a', L'\u044b', L'\u044c',
- L'\u044d', L'\u044e', L'\u044f', L'\u0451', L'\u0452', L'\u0453',
- L'\u0454', L'\u0455', L'\u0456', L'\u0457', L'\u0458', L'\u0459',
- L'\u045a', L'\u045b', L'\u045c', L'\u045e', L'\u045f', L'\u0462',
- L'\u0463', L'\u0472', L'\u0473', L'\u0474', L'\u0475', L'\u0490',
- L'\u0491', L'\u04d9', L'\u05b0', L'\u05b1', L'\u05b2', L'\u05b3',
- L'\u05b4', L'\u05b5', L'\u05b6', L'\u05b7', L'\u05b8', L'\u05b9',
- L'\u05bb', L'\u05bc', L'\u05bd', L'\u05be', L'\u05bf', L'\u05c0',
- L'\u05c1', L'\u05c2', L'\u05c3', L'\u05d0', L'\u05d1', L'\u05d2',
- L'\u05d3', L'\u05d4', L'\u05d5', L'\u05d6', L'\u05d7', L'\u05d8',
- L'\u05d9', L'\u05da', L'\u05db', L'\u05dc', L'\u05dd', L'\u05de',
- L'\u05df', L'\u05e0', L'\u05e1', L'\u05e2', L'\u05e3', L'\u05e4',
- L'\u05e5', L'\u05e6', L'\u05e7', L'\u05e8', L'\u05e9', L'\u05ea',
- L'\u05f0', L'\u05f1', L'\u05f2', L'\u060c', L'\u061b', L'\u061f',
- L'\u0621', L'\u0622', L'\u0623', L'\u0624', L'\u0625', L'\u0626',
- L'\u0627', L'\u0628', L'\u0629', L'\u062a', L'\u062b', L'\u062c',
- L'\u062d', L'\u062e', L'\u062f', L'\u0630', L'\u0631', L'\u0632',
- L'\u0633', L'\u0634', L'\u0635', L'\u0636', L'\u0637', L'\u0638',
- L'\u0639', L'\u063a', L'\u0640', L'\u0641', L'\u0642', L'\u0643',
- L'\u0644', L'\u0645', L'\u0646', L'\u0647', L'\u0648', L'\u0649',
- L'\u064a', L'\u064b', L'\u064c', L'\u064d', L'\u064e', L'\u064f',
- L'\u0650', L'\u0651', L'\u0652', L'\u0660', L'\u0661', L'\u0662',
- L'\u0663', L'\u0664', L'\u0665', L'\u0666', L'\u0667', L'\u0668',
- L'\u0669', L'\u066a', L'\u066d', L'\u0679', L'\u067e', L'\u0686',
- L'\u0688', L'\u0691', L'\u0698', L'\u06a4', L'\u06af', L'\u06ba',
- L'\u06d2', L'\u06d5', L'\u1e80', L'\u1e81', L'\u1e82', L'\u1e83',
- L'\u1e84', L'\u1e85', L'\u1ef2', L'\u1ef3', L'\u200c', L'\u200d',
- L'\u200e', L'\u200f', L'\u2012', L'\u2013', L'\u2014', L'\u2015',
- L'\u2017', L'\u2018', L'\u2019', L'\u201a', L'\u201b', L'\u201c',
- L'\u201d', L'\u201e', L'\u2020', L'\u2021', L'\u2022', L'\u2024',
- L'\u2025', L'\u2026', L'\u202c', L'\u202d', L'\u202e', L'\u2030',
- L'\u2032', L'\u2033', L'\u2039', L'\u203a', L'\u203c', L'\u2044',
- L'\u20a1', L'\u20a3', L'\u20a4', L'\u20a7', L'\u20aa', L'\u20ab',
- L'\u20ac', L'\u2105', L'\u2111', L'\u2113', L'\u2116', L'\u2118',
- L'\u211c', L'\u211e', L'\u2122', L'\u212e', L'\u2135', L'\u2153',
- L'\u2154', L'\u215b', L'\u215c', L'\u215d', L'\u215e', L'\u2190',
- L'\u2191', L'\u2192', L'\u2193', L'\u2194', L'\u2195', L'\u21a8',
- L'\u21b5', L'\u21d0', L'\u21d1', L'\u21d2', L'\u21d3', L'\u21d4',
- L'\u2200', L'\u2202', L'\u2203', L'\u2205', L'\u2207', L'\u2208',
- L'\u2209', L'\u220b', L'\u220f', L'\u2211', L'\u2212', L'\u2217',
- L'\u221a', L'\u221d', L'\u221e', L'\u221f', L'\u2220', L'\u2227',
- L'\u2228', L'\u2229', L'\u222a', L'\u222b', L'\u2234', L'\u223c',
- L'\u2245', L'\u2248', L'\u2260', L'\u2261', L'\u2264', L'\u2265',
- L'\u2282', L'\u2283', L'\u2284', L'\u2286', L'\u2287', L'\u2295',
- L'\u2297', L'\u22a5', L'\u22c5', L'\u2302', L'\u2310', L'\u2320',
- L'\u2321', L'\u2329', L'\u232a', L'\u2500', L'\u2502', L'\u250c',
- L'\u2510', L'\u2514', L'\u2518', L'\u251c', L'\u2524', L'\u252c',
- L'\u2534', L'\u253c', L'\u2550', L'\u2551', L'\u2552', L'\u2553',
- L'\u2554', L'\u2555', L'\u2556', L'\u2557', L'\u2558', L'\u2559',
- L'\u255a', L'\u255b', L'\u255c', L'\u255d', L'\u255e', L'\u255f',
- L'\u2560', L'\u2561', L'\u2562', L'\u2563', L'\u2564', L'\u2565',
- L'\u2566', L'\u2567', L'\u2568', L'\u2569', L'\u256a', L'\u256b',
- L'\u256c', L'\u2580', L'\u2584', L'\u2588', L'\u258c', L'\u2590',
- L'\u2591', L'\u2592', L'\u2593', L'\u25a0', L'\u25a1', L'\u25aa',
- L'\u25ab', L'\u25ac', L'\u25b2', L'\u25ba', L'\u25bc', L'\u25c4',
- L'\u25ca', L'\u25cb', L'\u25cf', L'\u25d8', L'\u25d9', L'\u25e6',
- L'\u263a', L'\u263b', L'\u263c', L'\u2640', L'\u2642', L'\u2660',
- L'\u2663', L'\u2665', L'\u2666', L'\u266a', L'\u266b'
+ L'\040', L'\041', L'\042', L'\043', L'\044', L'\045', L'\046',
+ L'\047', L'\050', L'\051', L'\052', L'\053', L'\054', L'\055',
+ L'\056', L'\057', L'\060', L'\061', L'\062', L'\063', L'\064',
+ L'\065', L'\066', L'\067', L'\070', L'\071', L'\072', L'\073',
+ L'\074', L'\075', L'\076', L'\077', L'\100', L'\101', L'\102',
+ L'\103', L'\104', L'\105', L'\106', L'\107', L'\110', L'\111',
+ L'\112', L'\113', L'\114', L'\115', L'\116', L'\117', L'\120',
+ L'\121', L'\122', L'\123', L'\124', L'\125', L'\126', L'\127',
+ L'\130', L'\131', L'\132', L'\133', L'\134', L'\135', L'\136',
+ L'\137', L'\140', L'\141', L'\142', L'\143', L'\144', L'\145',
+ L'\146', L'\147', L'\150', L'\151', L'\152', L'\153', L'\154',
+ L'\155', L'\156', L'\157', L'\160', L'\161', L'\162', L'\163',
+ L'\164', L'\165', L'\166', L'\167', L'\170', L'\171', L'\172',
+ L'\173', L'\174', L'\175', L'\176', L'\241', L'\242', L'\243',
+ L'\244', L'\245', L'\246', L'\247', L'\250', L'\251', L'\252',
+ L'\253', L'\254', L'\256', L'\257', L'\260', L'\261', L'\264',
+ L'\266', L'\267', L'\270', L'\272', L'\273', L'\274', L'\275',
+ L'\276', L'\277', L'\300', L'\301', L'\302', L'\303', L'\304',
+ L'\305', L'\306', L'\307', L'\310', L'\311', L'\312', L'\313',
+ L'\314', L'\315', L'\316', L'\317', L'\320', L'\321', L'\322',
+ L'\323', L'\324', L'\325', L'\326', L'\327', L'\330', L'\331',
+ L'\332', L'\333', L'\334', L'\335', L'\336', L'\337', L'\340',
+ L'\341', L'\342', L'\343', L'\344', L'\345', L'\346', L'\347',
+ L'\350', L'\351', L'\352', L'\353', L'\354', L'\355', L'\356',
+ L'\357', L'\360', L'\361', L'\362', L'\363', L'\364', L'\365',
+ L'\366', L'\367', L'\370', L'\371', L'\372', L'\373', L'\374',
+ L'\375', L'\376', L'\377', L'\u0100', L'\u0101', L'\u0102',
+ L'\u0103', L'\u0104', L'\u0105', L'\u0106', L'\u0107', L'\u0108',
+ L'\u0109', L'\u010a', L'\u010b', L'\u010c', L'\u010d', L'\u010e',
+ L'\u010f', L'\u0110', L'\u0111', L'\u0112', L'\u0113', L'\u0114',
+ L'\u0115', L'\u0116', L'\u0117', L'\u0118', L'\u0119', L'\u011a',
+ L'\u011b', L'\u011c', L'\u011d', L'\u011e', L'\u011f', L'\u0120',
+ L'\u0121', L'\u0122', L'\u0123', L'\u0124', L'\u0125', L'\u0126',
+ L'\u0127', L'\u0128', L'\u0129', L'\u012a', L'\u012b', L'\u012c',
+ L'\u012d', L'\u012e', L'\u012f', L'\u0130', L'\u0131', L'\u0132',
+ L'\u0133', L'\u0134', L'\u0135', L'\u0136', L'\u0137', L'\u0138',
+ L'\u0139', L'\u013a', L'\u013b', L'\u013c', L'\u013d', L'\u013e',
+ L'\u013f', L'\u0140', L'\u0141', L'\u0142', L'\u0143', L'\u0144',
+ L'\u0145', L'\u0146', L'\u0147', L'\u0148', L'\u0149', L'\u014a',
+ L'\u014b', L'\u014c', L'\u014d', L'\u014e', L'\u014f', L'\u0150',
+ L'\u0151', L'\u0152', L'\u0153', L'\u0154', L'\u0155', L'\u0156',
+ L'\u0157', L'\u0158', L'\u0159', L'\u015a', L'\u015b', L'\u015c',
+ L'\u015d', L'\u015e', L'\u015f', L'\u0160', L'\u0161', L'\u0162',
+ L'\u0163', L'\u0164', L'\u0165', L'\u0166', L'\u0167', L'\u0168',
+ L'\u0169', L'\u016a', L'\u016b', L'\u016c', L'\u016d', L'\u016e',
+ L'\u016f', L'\u0170', L'\u0171', L'\u0172', L'\u0173', L'\u0174',
+ L'\u0175', L'\u0176', L'\u0177', L'\u0178', L'\u0179', L'\u017a',
+ L'\u017b', L'\u017c', L'\u017d', L'\u017e', L'\u017f', L'\u0192',
+ L'\u01a0', L'\u01a1', L'\u01af', L'\u01b0', L'\u01e6', L'\u01e7',
+ L'\u01fa', L'\u01fb', L'\u01fc', L'\u01fd', L'\u01fe', L'\u01ff',
+ L'\u0218', L'\u0219', L'\u02bc', L'\u02bd', L'\u02c6', L'\u02c7',
+ L'\u02d8', L'\u02d9', L'\u02da', L'\u02db', L'\u02dc', L'\u02dd',
+ L'\u0300', L'\u0301', L'\u0303', L'\u0309', L'\u0323', L'\u0384',
+ L'\u0385', L'\u0386', L'\u0387', L'\u0388', L'\u0389', L'\u038a',
+ L'\u038c', L'\u038e', L'\u038f', L'\u0390', L'\u0391', L'\u0392',
+ L'\u0393', L'\u0394', L'\u0395', L'\u0396', L'\u0397', L'\u0398',
+ L'\u0399', L'\u039a', L'\u039b', L'\u039c', L'\u039d', L'\u039e',
+ L'\u039f', L'\u03a0', L'\u03a1', L'\u03a3', L'\u03a4', L'\u03a5',
+ L'\u03a6', L'\u03a7', L'\u03a8', L'\u03a9', L'\u03aa', L'\u03ab',
+ L'\u03ac', L'\u03ad', L'\u03ae', L'\u03af', L'\u03b0', L'\u03b1',
+ L'\u03b2', L'\u03b3', L'\u03b4', L'\u03b5', L'\u03b6', L'\u03b7',
+ L'\u03b8', L'\u03b9', L'\u03ba', L'\u03bb', L'\u03bc', L'\u03bd',
+ L'\u03be', L'\u03bf', L'\u03c0', L'\u03c1', L'\u03c2', L'\u03c3',
+ L'\u03c4', L'\u03c5', L'\u03c6', L'\u03c7', L'\u03c8', L'\u03c9',
+ L'\u03ca', L'\u03cb', L'\u03cc', L'\u03cd', L'\u03ce', L'\u03d1',
+ L'\u03d2', L'\u03d5', L'\u03d6', L'\u0401', L'\u0402', L'\u0403',
+ L'\u0404', L'\u0405', L'\u0406', L'\u0407', L'\u0408', L'\u0409',
+ L'\u040a', L'\u040b', L'\u040c', L'\u040e', L'\u040f', L'\u0410',
+ L'\u0411', L'\u0412', L'\u0413', L'\u0414', L'\u0415', L'\u0416',
+ L'\u0417', L'\u0418', L'\u0419', L'\u041a', L'\u041b', L'\u041c',
+ L'\u041d', L'\u041e', L'\u041f', L'\u0420', L'\u0421', L'\u0422',
+ L'\u0423', L'\u0424', L'\u0425', L'\u0426', L'\u0427', L'\u0428',
+ L'\u0429', L'\u042a', L'\u042b', L'\u042c', L'\u042d', L'\u042e',
+ L'\u042f', L'\u0430', L'\u0431', L'\u0432', L'\u0433', L'\u0434',
+ L'\u0435', L'\u0436', L'\u0437', L'\u0438', L'\u0439', L'\u043a',
+ L'\u043b', L'\u043c', L'\u043d', L'\u043e', L'\u043f', L'\u0440',
+ L'\u0441', L'\u0442', L'\u0443', L'\u0444', L'\u0445', L'\u0446',
+ L'\u0447', L'\u0448', L'\u0449', L'\u044a', L'\u044b', L'\u044c',
+ L'\u044d', L'\u044e', L'\u044f', L'\u0451', L'\u0452', L'\u0453',
+ L'\u0454', L'\u0455', L'\u0456', L'\u0457', L'\u0458', L'\u0459',
+ L'\u045a', L'\u045b', L'\u045c', L'\u045e', L'\u045f', L'\u0462',
+ L'\u0463', L'\u0472', L'\u0473', L'\u0474', L'\u0475', L'\u0490',
+ L'\u0491', L'\u04d9', L'\u05b0', L'\u05b1', L'\u05b2', L'\u05b3',
+ L'\u05b4', L'\u05b5', L'\u05b6', L'\u05b7', L'\u05b8', L'\u05b9',
+ L'\u05bb', L'\u05bc', L'\u05bd', L'\u05be', L'\u05bf', L'\u05c0',
+ L'\u05c1', L'\u05c2', L'\u05c3', L'\u05d0', L'\u05d1', L'\u05d2',
+ L'\u05d3', L'\u05d4', L'\u05d5', L'\u05d6', L'\u05d7', L'\u05d8',
+ L'\u05d9', L'\u05da', L'\u05db', L'\u05dc', L'\u05dd', L'\u05de',
+ L'\u05df', L'\u05e0', L'\u05e1', L'\u05e2', L'\u05e3', L'\u05e4',
+ L'\u05e5', L'\u05e6', L'\u05e7', L'\u05e8', L'\u05e9', L'\u05ea',
+ L'\u05f0', L'\u05f1', L'\u05f2', L'\u060c', L'\u061b', L'\u061f',
+ L'\u0621', L'\u0622', L'\u0623', L'\u0624', L'\u0625', L'\u0626',
+ L'\u0627', L'\u0628', L'\u0629', L'\u062a', L'\u062b', L'\u062c',
+ L'\u062d', L'\u062e', L'\u062f', L'\u0630', L'\u0631', L'\u0632',
+ L'\u0633', L'\u0634', L'\u0635', L'\u0636', L'\u0637', L'\u0638',
+ L'\u0639', L'\u063a', L'\u0640', L'\u0641', L'\u0642', L'\u0643',
+ L'\u0644', L'\u0645', L'\u0646', L'\u0647', L'\u0648', L'\u0649',
+ L'\u064a', L'\u064b', L'\u064c', L'\u064d', L'\u064e', L'\u064f',
+ L'\u0650', L'\u0651', L'\u0652', L'\u0660', L'\u0661', L'\u0662',
+ L'\u0663', L'\u0664', L'\u0665', L'\u0666', L'\u0667', L'\u0668',
+ L'\u0669', L'\u066a', L'\u066d', L'\u0679', L'\u067e', L'\u0686',
+ L'\u0688', L'\u0691', L'\u0698', L'\u06a4', L'\u06af', L'\u06ba',
+ L'\u06d2', L'\u06d5', L'\u1e80', L'\u1e81', L'\u1e82', L'\u1e83',
+ L'\u1e84', L'\u1e85', L'\u1ef2', L'\u1ef3', L'\u200c', L'\u200d',
+ L'\u200e', L'\u200f', L'\u2012', L'\u2013', L'\u2014', L'\u2015',
+ L'\u2017', L'\u2018', L'\u2019', L'\u201a', L'\u201b', L'\u201c',
+ L'\u201d', L'\u201e', L'\u2020', L'\u2021', L'\u2022', L'\u2024',
+ L'\u2025', L'\u2026', L'\u202c', L'\u202d', L'\u202e', L'\u2030',
+ L'\u2032', L'\u2033', L'\u2039', L'\u203a', L'\u203c', L'\u2044',
+ L'\u20a1', L'\u20a3', L'\u20a4', L'\u20a7', L'\u20aa', L'\u20ab',
+ L'\u20ac', L'\u2105', L'\u2111', L'\u2113', L'\u2116', L'\u2118',
+ L'\u211c', L'\u211e', L'\u2122', L'\u212e', L'\u2135', L'\u2153',
+ L'\u2154', L'\u215b', L'\u215c', L'\u215d', L'\u215e', L'\u2190',
+ L'\u2191', L'\u2192', L'\u2193', L'\u2194', L'\u2195', L'\u21a8',
+ L'\u21b5', L'\u21d0', L'\u21d1', L'\u21d2', L'\u21d3', L'\u21d4',
+ L'\u2200', L'\u2202', L'\u2203', L'\u2205', L'\u2207', L'\u2208',
+ L'\u2209', L'\u220b', L'\u220f', L'\u2211', L'\u2212', L'\u2217',
+ L'\u221a', L'\u221d', L'\u221e', L'\u221f', L'\u2220', L'\u2227',
+ L'\u2228', L'\u2229', L'\u222a', L'\u222b', L'\u2234', L'\u223c',
+ L'\u2245', L'\u2248', L'\u2260', L'\u2261', L'\u2264', L'\u2265',
+ L'\u2282', L'\u2283', L'\u2284', L'\u2286', L'\u2287', L'\u2295',
+ L'\u2297', L'\u22a5', L'\u22c5', L'\u2302', L'\u2310', L'\u2320',
+ L'\u2321', L'\u2329', L'\u232a', L'\u2500', L'\u2502', L'\u250c',
+ L'\u2510', L'\u2514', L'\u2518', L'\u251c', L'\u2524', L'\u252c',
+ L'\u2534', L'\u253c', L'\u2550', L'\u2551', L'\u2552', L'\u2553',
+ L'\u2554', L'\u2555', L'\u2556', L'\u2557', L'\u2558', L'\u2559',
+ L'\u255a', L'\u255b', L'\u255c', L'\u255d', L'\u255e', L'\u255f',
+ L'\u2560', L'\u2561', L'\u2562', L'\u2563', L'\u2564', L'\u2565',
+ L'\u2566', L'\u2567', L'\u2568', L'\u2569', L'\u256a', L'\u256b',
+ L'\u256c', L'\u2580', L'\u2584', L'\u2588', L'\u258c', L'\u2590',
+ L'\u2591', L'\u2592', L'\u2593', L'\u25a0', L'\u25a1', L'\u25aa',
+ L'\u25ab', L'\u25ac', L'\u25b2', L'\u25ba', L'\u25bc', L'\u25c4',
+ L'\u25ca', L'\u25cb', L'\u25cf', L'\u25d8', L'\u25d9', L'\u25e6',
+ L'\u263a', L'\u263b', L'\u263c', L'\u2640', L'\u2642', L'\u2660',
+ L'\u2663', L'\u2665', L'\u2666', L'\u266a', L'\u266b'
};
static const char *adobe_glyph_name[nadobe_glyph] = {
- "space", "exclam", "quotedbl", "numbersign", "dollar", "percent",
- "ampersand", "quotesingle", "parenleft", "parenright", "asterisk",
- "plus", "comma", "hyphen", "period", "slash", "zero", "one",
- "two", "three", "four", "five", "six", "seven", "eight", "nine",
- "colon", "semicolon", "less", "equal", "greater", "question",
- "at", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L",
- "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y",
- "Z", "bracketleft", "backslash", "bracketright", "asciicircum",
- "underscore", "grave", "a", "b", "c", "d", "e", "f", "g", "h",
- "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u",
- "v", "w", "x", "y", "z", "braceleft", "bar", "braceright",
- "asciitilde", "exclamdown", "cent", "sterling", "currency", "yen",
- "brokenbar", "section", "dieresis", "copyright", "ordfeminine",
- "guillemotleft", "logicalnot", "registered", "macron", "degree",
- "plusminus", "acute", "paragraph", "periodcentered", "cedilla",
- "ordmasculine", "guillemotright", "onequarter", "onehalf",
- "threequarters", "questiondown", "Agrave", "Aacute",
- "Acircumflex", "Atilde", "Adieresis", "Aring", "AE", "Ccedilla",
- "Egrave", "Eacute", "Ecircumflex", "Edieresis", "Igrave",
- "Iacute", "Icircumflex", "Idieresis", "Eth", "Ntilde", "Ograve",
- "Oacute", "Ocircumflex", "Otilde", "Odieresis", "multiply",
- "Oslash", "Ugrave", "Uacute", "Ucircumflex", "Udieresis",
- "Yacute", "Thorn", "germandbls", "agrave", "aacute",
- "acircumflex", "atilde", "adieresis", "aring", "ae", "ccedilla",
- "egrave", "eacute", "ecircumflex", "edieresis", "igrave",
- "iacute", "icircumflex", "idieresis", "eth", "ntilde", "ograve",
- "oacute", "ocircumflex", "otilde", "odieresis", "divide",
- "oslash", "ugrave", "uacute", "ucircumflex", "udieresis",
- "yacute", "thorn", "ydieresis", "Amacron", "amacron", "Abreve",
- "abreve", "Aogonek", "aogonek", "Cacute", "cacute", "Ccircumflex",
- "ccircumflex", "Cdotaccent", "cdotaccent", "Ccaron", "ccaron",
- "Dcaron", "dcaron", "Dcroat", "dcroat", "Emacron", "emacron",
- "Ebreve", "ebreve", "Edotaccent", "edotaccent", "Eogonek",
- "eogonek", "Ecaron", "ecaron", "Gcircumflex", "gcircumflex",
- "Gbreve", "gbreve", "Gdotaccent", "gdotaccent", "Gcommaaccent",
- "gcommaaccent", "Hcircumflex", "hcircumflex", "Hbar", "hbar",
- "Itilde", "itilde", "Imacron", "imacron", "Ibreve", "ibreve",
- "Iogonek", "iogonek", "Idotaccent", "dotlessi", "IJ", "ij",
- "Jcircumflex", "jcircumflex", "Kcommaaccent", "kcommaaccent",
- "kgreenlandic", "Lacute", "lacute", "Lcommaaccent",
- "lcommaaccent", "Lcaron", "lcaron", "Ldot", "ldot", "Lslash",
- "lslash", "Nacute", "nacute", "Ncommaaccent", "ncommaaccent",
- "Ncaron", "ncaron", "napostrophe", "Eng", "eng", "Omacron",
- "omacron", "Obreve", "obreve", "Ohungarumlaut", "ohungarumlaut",
- "OE", "oe", "Racute", "racute", "Rcommaaccent", "rcommaaccent",
- "Rcaron", "rcaron", "Sacute", "sacute", "Scircumflex",
- "scircumflex", "Scedilla", "scedilla", "Scaron", "scaron",
- "Tcommaaccent", "tcommaaccent", "Tcaron", "tcaron", "Tbar",
- "tbar", "Utilde", "utilde", "Umacron", "umacron", "Ubreve",
- "ubreve", "Uring", "uring", "Uhungarumlaut", "uhungarumlaut",
- "Uogonek", "uogonek", "Wcircumflex", "wcircumflex", "Ycircumflex",
- "ycircumflex", "Ydieresis", "Zacute", "zacute", "Zdotaccent",
- "zdotaccent", "Zcaron", "zcaron", "longs", "florin", "Ohorn",
- "ohorn", "Uhorn", "uhorn", "Gcaron", "gcaron", "Aringacute",
- "aringacute", "AEacute", "aeacute", "Oslashacute", "oslashacute",
- "Scommaaccent", "scommaaccent", "afii57929", "afii64937",
- "circumflex", "caron", "breve", "dotaccent", "ring", "ogonek",
- "tilde", "hungarumlaut", "gravecomb", "acutecomb", "tildecomb",
- "hookabovecomb", "dotbelowcomb", "tonos", "dieresistonos",
- "Alphatonos", "anoteleia", "Epsilontonos", "Etatonos",
- "Iotatonos", "Omicrontonos", "Upsilontonos", "Omegatonos",
- "iotadieresistonos", "Alpha", "Beta", "Gamma", "Delta", "Epsilon",
- "Zeta", "Eta", "Theta", "Iota", "Kappa", "Lambda", "Mu", "Nu",
- "Xi", "Omicron", "Pi", "Rho", "Sigma", "Tau", "Upsilon", "Phi",
- "Chi", "Psi", "Omega", "Iotadieresis", "Upsilondieresis",
- "alphatonos", "epsilontonos", "etatonos", "iotatonos",
- "upsilondieresistonos", "alpha", "beta", "gamma", "delta",
- "epsilon", "zeta", "eta", "theta", "iota", "kappa", "lambda",
- "mu", "nu", "xi", "omicron", "pi", "rho", "sigma1", "sigma",
- "tau", "upsilon", "phi", "chi", "psi", "omega", "iotadieresis",
- "upsilondieresis", "omicrontonos", "upsilontonos", "omegatonos",
- "theta1", "Upsilon1", "phi1", "omega1", "afii10023", "afii10051",
- "afii10052", "afii10053", "afii10054", "afii10055", "afii10056",
- "afii10057", "afii10058", "afii10059", "afii10060", "afii10061",
- "afii10062", "afii10145", "afii10017", "afii10018", "afii10019",
- "afii10020", "afii10021", "afii10022", "afii10024", "afii10025",
- "afii10026", "afii10027", "afii10028", "afii10029", "afii10030",
- "afii10031", "afii10032", "afii10033", "afii10034", "afii10035",
- "afii10036", "afii10037", "afii10038", "afii10039", "afii10040",
- "afii10041", "afii10042", "afii10043", "afii10044", "afii10045",
- "afii10046", "afii10047", "afii10048", "afii10049", "afii10065",
- "afii10066", "afii10067", "afii10068", "afii10069", "afii10070",
- "afii10072", "afii10073", "afii10074", "afii10075", "afii10076",
- "afii10077", "afii10078", "afii10079", "afii10080", "afii10081",
- "afii10082", "afii10083", "afii10084", "afii10085", "afii10086",
- "afii10087", "afii10088", "afii10089", "afii10090", "afii10091",
- "afii10092", "afii10093", "afii10094", "afii10095", "afii10096",
- "afii10097", "afii10071", "afii10099", "afii10100", "afii10101",
- "afii10102", "afii10103", "afii10104", "afii10105", "afii10106",
- "afii10107", "afii10108", "afii10109", "afii10110", "afii10193",
- "afii10146", "afii10194", "afii10147", "afii10195", "afii10148",
- "afii10196", "afii10050", "afii10098", "afii10846", "afii57799",
- "afii57801", "afii57800", "afii57802", "afii57793", "afii57794",
- "afii57795", "afii57798", "afii57797", "afii57806", "afii57796",
- "afii57807", "afii57839", "afii57645", "afii57841", "afii57842",
- "afii57804", "afii57803", "afii57658", "afii57664", "afii57665",
- "afii57666", "afii57667", "afii57668", "afii57669", "afii57670",
- "afii57671", "afii57672", "afii57673", "afii57674", "afii57675",
- "afii57676", "afii57677", "afii57678", "afii57679", "afii57680",
- "afii57681", "afii57682", "afii57683", "afii57684", "afii57685",
- "afii57686", "afii57687", "afii57688", "afii57689", "afii57690",
- "afii57716", "afii57717", "afii57718", "afii57388", "afii57403",
- "afii57407", "afii57409", "afii57410", "afii57411", "afii57412",
- "afii57413", "afii57414", "afii57415", "afii57416", "afii57417",
- "afii57418", "afii57419", "afii57420", "afii57421", "afii57422",
- "afii57423", "afii57424", "afii57425", "afii57426", "afii57427",
- "afii57428", "afii57429", "afii57430", "afii57431", "afii57432",
- "afii57433", "afii57434", "afii57440", "afii57441", "afii57442",
- "afii57443", "afii57444", "afii57445", "afii57446", "afii57470",
- "afii57448", "afii57449", "afii57450", "afii57451", "afii57452",
- "afii57453", "afii57454", "afii57455", "afii57456", "afii57457",
- "afii57458", "afii57392", "afii57393", "afii57394", "afii57395",
- "afii57396", "afii57397", "afii57398", "afii57399", "afii57400",
- "afii57401", "afii57381", "afii63167", "afii57511", "afii57506",
- "afii57507", "afii57512", "afii57513", "afii57508", "afii57505",
- "afii57509", "afii57514", "afii57519", "afii57534", "Wgrave",
- "wgrave", "Wacute", "wacute", "Wdieresis", "wdieresis", "Ygrave",
- "ygrave", "afii61664", "afii301", "afii299", "afii300",
- "figuredash", "endash", "emdash", "afii00208", "underscoredbl",
- "quoteleft", "quoteright", "quotesinglbase", "quotereversed",
- "quotedblleft", "quotedblright", "quotedblbase", "dagger",
- "daggerdbl", "bullet", "onedotenleader", "twodotenleader",
- "ellipsis", "afii61573", "afii61574", "afii61575", "perthousand",
- "minute", "second", "guilsinglleft", "guilsinglright",
- "exclamdbl", "fraction", "colonmonetary", "franc", "lira",
- "peseta", "afii57636", "dong", "Euro", "afii61248", "Ifraktur",
- "afii61289", "afii61352", "weierstrass", "Rfraktur",
- "prescription", "trademark", "estimated", "aleph", "onethird",
- "twothirds", "oneeighth", "threeeighths", "fiveeighths",
- "seveneighths", "arrowleft", "arrowup", "arrowright", "arrowdown",
- "arrowboth", "arrowupdn", "arrowupdnbse", "carriagereturn",
- "arrowdblleft", "arrowdblup", "arrowdblright", "arrowdbldown",
- "arrowdblboth", "universal", "partialdiff", "existential",
- "emptyset", "gradient", "element", "notelement", "suchthat",
- "product", "summation", "minus", "asteriskmath", "radical",
- "proportional", "infinity", "orthogonal", "angle", "logicaland",
- "logicalor", "intersection", "union", "integral", "therefore",
- "similar", "congruent", "approxequal", "notequal", "equivalence",
- "lessequal", "greaterequal", "propersubset", "propersuperset",
- "notsubset", "reflexsubset", "reflexsuperset", "circleplus",
- "circlemultiply", "perpendicular", "dotmath", "house",
- "revlogicalnot", "integraltp", "integralbt", "angleleft",
- "angleright", "SF100000", "SF110000", "SF010000", "SF030000",
- "SF020000", "SF040000", "SF080000", "SF090000", "SF060000",
- "SF070000", "SF050000", "SF430000", "SF240000", "SF510000",
- "SF520000", "SF390000", "SF220000", "SF210000", "SF250000",
- "SF500000", "SF490000", "SF380000", "SF280000", "SF270000",
- "SF260000", "SF360000", "SF370000", "SF420000", "SF190000",
- "SF200000", "SF230000", "SF470000", "SF480000", "SF410000",
- "SF450000", "SF460000", "SF400000", "SF540000", "SF530000",
- "SF440000", "upblock", "dnblock", "block", "lfblock", "rtblock",
- "ltshade", "shade", "dkshade", "filledbox", "H22073", "H18543",
- "H18551", "filledrect", "triagup", "triagrt", "triagdn",
- "triaglf", "lozenge", "circle", "H18533", "invbullet",
- "invcircle", "openbullet", "smileface", "invsmileface", "sun",
- "female", "male", "spade", "club", "heart", "diamond",
- "musicalnote", "musicalnotedbl"
+ "space", "exclam", "quotedbl", "numbersign", "dollar", "percent",
+ "ampersand", "quotesingle", "parenleft", "parenright", "asterisk",
+ "plus", "comma", "hyphen", "period", "slash", "zero", "one",
+ "two", "three", "four", "five", "six", "seven", "eight", "nine",
+ "colon", "semicolon", "less", "equal", "greater", "question",
+ "at", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L",
+ "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y",
+ "Z", "bracketleft", "backslash", "bracketright", "asciicircum",
+ "underscore", "grave", "a", "b", "c", "d", "e", "f", "g", "h",
+ "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u",
+ "v", "w", "x", "y", "z", "braceleft", "bar", "braceright",
+ "asciitilde", "exclamdown", "cent", "sterling", "currency", "yen",
+ "brokenbar", "section", "dieresis", "copyright", "ordfeminine",
+ "guillemotleft", "logicalnot", "registered", "macron", "degree",
+ "plusminus", "acute", "paragraph", "periodcentered", "cedilla",
+ "ordmasculine", "guillemotright", "onequarter", "onehalf",
+ "threequarters", "questiondown", "Agrave", "Aacute",
+ "Acircumflex", "Atilde", "Adieresis", "Aring", "AE", "Ccedilla",
+ "Egrave", "Eacute", "Ecircumflex", "Edieresis", "Igrave",
+ "Iacute", "Icircumflex", "Idieresis", "Eth", "Ntilde", "Ograve",
+ "Oacute", "Ocircumflex", "Otilde", "Odieresis", "multiply",
+ "Oslash", "Ugrave", "Uacute", "Ucircumflex", "Udieresis",
+ "Yacute", "Thorn", "germandbls", "agrave", "aacute",
+ "acircumflex", "atilde", "adieresis", "aring", "ae", "ccedilla",
+ "egrave", "eacute", "ecircumflex", "edieresis", "igrave",
+ "iacute", "icircumflex", "idieresis", "eth", "ntilde", "ograve",
+ "oacute", "ocircumflex", "otilde", "odieresis", "divide",
+ "oslash", "ugrave", "uacute", "ucircumflex", "udieresis",
+ "yacute", "thorn", "ydieresis", "Amacron", "amacron", "Abreve",
+ "abreve", "Aogonek", "aogonek", "Cacute", "cacute", "Ccircumflex",
+ "ccircumflex", "Cdotaccent", "cdotaccent", "Ccaron", "ccaron",
+ "Dcaron", "dcaron", "Dcroat", "dcroat", "Emacron", "emacron",
+ "Ebreve", "ebreve", "Edotaccent", "edotaccent", "Eogonek",
+ "eogonek", "Ecaron", "ecaron", "Gcircumflex", "gcircumflex",
+ "Gbreve", "gbreve", "Gdotaccent", "gdotaccent", "Gcommaaccent",
+ "gcommaaccent", "Hcircumflex", "hcircumflex", "Hbar", "hbar",
+ "Itilde", "itilde", "Imacron", "imacron", "Ibreve", "ibreve",
+ "Iogonek", "iogonek", "Idotaccent", "dotlessi", "IJ", "ij",
+ "Jcircumflex", "jcircumflex", "Kcommaaccent", "kcommaaccent",
+ "kgreenlandic", "Lacute", "lacute", "Lcommaaccent",
+ "lcommaaccent", "Lcaron", "lcaron", "Ldot", "ldot", "Lslash",
+ "lslash", "Nacute", "nacute", "Ncommaaccent", "ncommaaccent",
+ "Ncaron", "ncaron", "napostrophe", "Eng", "eng", "Omacron",
+ "omacron", "Obreve", "obreve", "Ohungarumlaut", "ohungarumlaut",
+ "OE", "oe", "Racute", "racute", "Rcommaaccent", "rcommaaccent",
+ "Rcaron", "rcaron", "Sacute", "sacute", "Scircumflex",
+ "scircumflex", "Scedilla", "scedilla", "Scaron", "scaron",
+ "Tcommaaccent", "tcommaaccent", "Tcaron", "tcaron", "Tbar",
+ "tbar", "Utilde", "utilde", "Umacron", "umacron", "Ubreve",
+ "ubreve", "Uring", "uring", "Uhungarumlaut", "uhungarumlaut",
+ "Uogonek", "uogonek", "Wcircumflex", "wcircumflex", "Ycircumflex",
+ "ycircumflex", "Ydieresis", "Zacute", "zacute", "Zdotaccent",
+ "zdotaccent", "Zcaron", "zcaron", "longs", "florin", "Ohorn",
+ "ohorn", "Uhorn", "uhorn", "Gcaron", "gcaron", "Aringacute",
+ "aringacute", "AEacute", "aeacute", "Oslashacute", "oslashacute",
+ "Scommaaccent", "scommaaccent", "afii57929", "afii64937",
+ "circumflex", "caron", "breve", "dotaccent", "ring", "ogonek",
+ "tilde", "hungarumlaut", "gravecomb", "acutecomb", "tildecomb",
+ "hookabovecomb", "dotbelowcomb", "tonos", "dieresistonos",
+ "Alphatonos", "anoteleia", "Epsilontonos", "Etatonos",
+ "Iotatonos", "Omicrontonos", "Upsilontonos", "Omegatonos",
+ "iotadieresistonos", "Alpha", "Beta", "Gamma", "Delta", "Epsilon",
+ "Zeta", "Eta", "Theta", "Iota", "Kappa", "Lambda", "Mu", "Nu",
+ "Xi", "Omicron", "Pi", "Rho", "Sigma", "Tau", "Upsilon", "Phi",
+ "Chi", "Psi", "Omega", "Iotadieresis", "Upsilondieresis",
+ "alphatonos", "epsilontonos", "etatonos", "iotatonos",
+ "upsilondieresistonos", "alpha", "beta", "gamma", "delta",
+ "epsilon", "zeta", "eta", "theta", "iota", "kappa", "lambda",
+ "mu", "nu", "xi", "omicron", "pi", "rho", "sigma1", "sigma",
+ "tau", "upsilon", "phi", "chi", "psi", "omega", "iotadieresis",
+ "upsilondieresis", "omicrontonos", "upsilontonos", "omegatonos",
+ "theta1", "Upsilon1", "phi1", "omega1", "afii10023", "afii10051",
+ "afii10052", "afii10053", "afii10054", "afii10055", "afii10056",
+ "afii10057", "afii10058", "afii10059", "afii10060", "afii10061",
+ "afii10062", "afii10145", "afii10017", "afii10018", "afii10019",
+ "afii10020", "afii10021", "afii10022", "afii10024", "afii10025",
+ "afii10026", "afii10027", "afii10028", "afii10029", "afii10030",
+ "afii10031", "afii10032", "afii10033", "afii10034", "afii10035",
+ "afii10036", "afii10037", "afii10038", "afii10039", "afii10040",
+ "afii10041", "afii10042", "afii10043", "afii10044", "afii10045",
+ "afii10046", "afii10047", "afii10048", "afii10049", "afii10065",
+ "afii10066", "afii10067", "afii10068", "afii10069", "afii10070",
+ "afii10072", "afii10073", "afii10074", "afii10075", "afii10076",
+ "afii10077", "afii10078", "afii10079", "afii10080", "afii10081",
+ "afii10082", "afii10083", "afii10084", "afii10085", "afii10086",
+ "afii10087", "afii10088", "afii10089", "afii10090", "afii10091",
+ "afii10092", "afii10093", "afii10094", "afii10095", "afii10096",
+ "afii10097", "afii10071", "afii10099", "afii10100", "afii10101",
+ "afii10102", "afii10103", "afii10104", "afii10105", "afii10106",
+ "afii10107", "afii10108", "afii10109", "afii10110", "afii10193",
+ "afii10146", "afii10194", "afii10147", "afii10195", "afii10148",
+ "afii10196", "afii10050", "afii10098", "afii10846", "afii57799",
+ "afii57801", "afii57800", "afii57802", "afii57793", "afii57794",
+ "afii57795", "afii57798", "afii57797", "afii57806", "afii57796",
+ "afii57807", "afii57839", "afii57645", "afii57841", "afii57842",
+ "afii57804", "afii57803", "afii57658", "afii57664", "afii57665",
+ "afii57666", "afii57667", "afii57668", "afii57669", "afii57670",
+ "afii57671", "afii57672", "afii57673", "afii57674", "afii57675",
+ "afii57676", "afii57677", "afii57678", "afii57679", "afii57680",
+ "afii57681", "afii57682", "afii57683", "afii57684", "afii57685",
+ "afii57686", "afii57687", "afii57688", "afii57689", "afii57690",
+ "afii57716", "afii57717", "afii57718", "afii57388", "afii57403",
+ "afii57407", "afii57409", "afii57410", "afii57411", "afii57412",
+ "afii57413", "afii57414", "afii57415", "afii57416", "afii57417",
+ "afii57418", "afii57419", "afii57420", "afii57421", "afii57422",
+ "afii57423", "afii57424", "afii57425", "afii57426", "afii57427",
+ "afii57428", "afii57429", "afii57430", "afii57431", "afii57432",
+ "afii57433", "afii57434", "afii57440", "afii57441", "afii57442",
+ "afii57443", "afii57444", "afii57445", "afii57446", "afii57470",
+ "afii57448", "afii57449", "afii57450", "afii57451", "afii57452",
+ "afii57453", "afii57454", "afii57455", "afii57456", "afii57457",
+ "afii57458", "afii57392", "afii57393", "afii57394", "afii57395",
+ "afii57396", "afii57397", "afii57398", "afii57399", "afii57400",
+ "afii57401", "afii57381", "afii63167", "afii57511", "afii57506",
+ "afii57507", "afii57512", "afii57513", "afii57508", "afii57505",
+ "afii57509", "afii57514", "afii57519", "afii57534", "Wgrave",
+ "wgrave", "Wacute", "wacute", "Wdieresis", "wdieresis", "Ygrave",
+ "ygrave", "afii61664", "afii301", "afii299", "afii300",
+ "figuredash", "endash", "emdash", "afii00208", "underscoredbl",
+ "quoteleft", "quoteright", "quotesinglbase", "quotereversed",
+ "quotedblleft", "quotedblright", "quotedblbase", "dagger",
+ "daggerdbl", "bullet", "onedotenleader", "twodotenleader",
+ "ellipsis", "afii61573", "afii61574", "afii61575", "perthousand",
+ "minute", "second", "guilsinglleft", "guilsinglright",
+ "exclamdbl", "fraction", "colonmonetary", "franc", "lira",
+ "peseta", "afii57636", "dong", "Euro", "afii61248", "Ifraktur",
+ "afii61289", "afii61352", "weierstrass", "Rfraktur",
+ "prescription", "trademark", "estimated", "aleph", "onethird",
+ "twothirds", "oneeighth", "threeeighths", "fiveeighths",
+ "seveneighths", "arrowleft", "arrowup", "arrowright", "arrowdown",
+ "arrowboth", "arrowupdn", "arrowupdnbse", "carriagereturn",
+ "arrowdblleft", "arrowdblup", "arrowdblright", "arrowdbldown",
+ "arrowdblboth", "universal", "partialdiff", "existential",
+ "emptyset", "gradient", "element", "notelement", "suchthat",
+ "product", "summation", "minus", "asteriskmath", "radical",
+ "proportional", "infinity", "orthogonal", "angle", "logicaland",
+ "logicalor", "intersection", "union", "integral", "therefore",
+ "similar", "congruent", "approxequal", "notequal", "equivalence",
+ "lessequal", "greaterequal", "propersubset", "propersuperset",
+ "notsubset", "reflexsubset", "reflexsuperset", "circleplus",
+ "circlemultiply", "perpendicular", "dotmath", "house",
+ "revlogicalnot", "integraltp", "integralbt", "angleleft",
+ "angleright", "SF100000", "SF110000", "SF010000", "SF030000",
+ "SF020000", "SF040000", "SF080000", "SF090000", "SF060000",
+ "SF070000", "SF050000", "SF430000", "SF240000", "SF510000",
+ "SF520000", "SF390000", "SF220000", "SF210000", "SF250000",
+ "SF500000", "SF490000", "SF380000", "SF280000", "SF270000",
+ "SF260000", "SF360000", "SF370000", "SF420000", "SF190000",
+ "SF200000", "SF230000", "SF470000", "SF480000", "SF410000",
+ "SF450000", "SF460000", "SF400000", "SF540000", "SF530000",
+ "SF440000", "upblock", "dnblock", "block", "lfblock", "rtblock",
+ "ltshade", "shade", "dkshade", "filledbox", "H22073", "H18543",
+ "H18551", "filledrect", "triagup", "triagrt", "triagdn",
+ "triaglf", "lozenge", "circle", "H18533", "invbullet",
+ "invcircle", "openbullet", "smileface", "invsmileface", "sun",
+ "female", "male", "spade", "club", "heart", "diamond",
+ "musicalnote", "musicalnotedbl"
};
diff --git a/graf2d/postscript/src/TPostScript.cxx b/graf2d/postscript/src/TPostScript.cxx
index 33c15df0100..214572043bd 100644
--- a/graf2d/postscript/src/TPostScript.cxx
+++ b/graf2d/postscript/src/TPostScript.cxx
@@ -12,223 +12,223 @@
//______________________________________________________________________________
/* Begin_Html
-<center><h2>TPostScript: Graphics interface to PostScript</h2></center>
-This code was initially developed in the context of HIGZ and PAW
-by Olivier Couet and Pierre Juillot. It has been converted to a C++ class by
-Rene Brun.
-
-<P>To generate a Postscript (or encapsulated ps) file corresponding to
-a single image in a canvas, you can:
-
-<UL>
-<LI>Select the <B>Print PostScript</B> item in the canvas <B>File</B> menu.
-By default, a Postscript file with the name of the canvas.ps is generated.
-
-<br>
-<LI>Click in the canvas area, near the edges, with the right mouse button
-and select the <B>Print</B> item. You can select the name of the Postscript
-file. If the file name is xxx.ps, you will generate a Postscript file named
-xxx.ps. If the file name is xxx.eps, you generate an encapsulated Postscript
-file instead.
-<br>
-
-<LI>In your program (or macro), you can type:
-
-<P><TT><B>
-c1->Print("xxx.ps")</B> or <B>c1->Print("xxx.eps")
-</B></TT>
-
-<P>This will generate a file corresponding to the picture in the canvas
-pointed by <tt><B>c1</B></tt>.
-
-<P><TT><B>pad1->Print("xxx.ps")</B></TT>
-
-<P>prints only the picture in the pad pointed by <tt><B>pad1</B></tt>. The size
-of the Postscript picture, by default, is computed to keep the aspect ratio
-of the picture on the screen, where the size along x is always 20cm. You
-can set the size of the PostScript picture before generating the picture
-with a command such as:
-
-<PRE>
- TPostScript myps("myfile.ps",111)
- myps.Range(xsize,ysize);
- object->Draw();
- myps.Close();
-</PRE>
-
-<P>You can set the default paper size with:
-<PRE>
- gStyle->SetPaperSize(xsize,ysize);
-</PRE>
-<P>You can resume writing again in this file with <tt><B>myps.Open();</B></tt>.
-Note that you may have several Postscript files opened simultaneously.
-</UL>
-
-<H2>Output type</H2>
-
-The output type allows to define how the PostScript output will looks like.
-It allows to define the page format (A4, Legal etc..), the orientation
-(Portrait, Landscape) and the number of images (zones) per page.
-The output type has the following form:
-<pre>
- [Format][Nx][Ny][Type]
-</pre>
-Where:
-<ul>
- <li> Format : Is an integer between 0 and 99 defining the page format.
- Example:
- <br> Format = 3 the paper is in the standard A3 format.
- <br> Format = n (1<n<98) is an An format.
- <br> Format = 4 and Format=0 are the same and define an A4 page.
- <br> The A0 format is selected by Format=99.
- <br> The US format Letter is selected by Format = 100.
- <br> The US format Legal is selected by Format = 200.
- <br> The US format Ledger is selected by Format = 300.
-
- <li> Nx, Ny : Specify respectively the number of zones on the x and y axis.
- Nx and Ny are integers between 1 and 9.
-
- <li> Type : Can be equal to:
- <ul>
- <li> 1 : Portrait mode with a small margin at the bottom of the page.
- <li> 2 : Landscape mode with a small margin at the bottom of the page.
- <li> 4 : Portrait mode with a large margin at the bottom of the page.
- <li> 5 : Landscape mode with a large margin at the bottom of the page.
- The large margin is useful for some PostScript printers (very often
- for the colour printers) as they need more space to grip the paper
- for mechanical reasons. Note that some PostScript colour printers
- can also use the so called special A4 format permitting the full
- usage of the A4 area; in this case larger margins are not necessary
- and Type=1 or 2 can be used.
- <li> 3 : Encapsulated PostScript. This Type permits the generation of files
- which can be included in other documents, for example in LaTeX
- files.
- </ul>
-</ul>
-
-<H2>Making several pictures in the same Postscript file: case 1</H2>
-<P>The following macro is an example illustrating how to open a Postscript
-file and draw several pictures. The generation of a new Postscript page
-is automatic when <tt><B>TCanvas::Clear</B></tt> is called by
-<tt><b>object->Draw()</b></tt>.
-<PRE>
-{
- TFile f("hsimple.root");
- TCanvas c1("c1","canvas",800,600);
-
- <b>// select postscript output type</b>
- <b>// type = 111 portrait ps</b>
- <b>// type = 112 landscape ps</b>
- <b>// type = 113 eps</b>
- Int_t type = 111;
-
- <b>// create a postscript file and set the paper size</b>
- TPostScript ps("test.ps",type);
- ps.Range(16,24); //set x,y of printed page
-
- <b>// draw 3 histograms from file hsimple.root on separate pages</b>
- hpx->Draw();
- c1.Update(); //force drawing in a macro
- hprof->Draw();
- c1.Update();
- hpx->Draw("lego1");
- c1.Update();
- ps.Close();
-}
-</PRE>
-
-<H2>Making several pictures in the same Postscript file: case 2</H2>
-<P>This example shows 2 pages. The canvas is divided.
-<tt><B>TPostScript::NewPage</B></tt> must be called before starting a new
-picture.<tt><b>object->Draw</b></tt> does not clear the canvas in this case
-because we clear only the pads and not the main canvas.
-Note that <tt><b>c1->Update</b></tt> must be called at the end of the first
-picture.
-<PRE>
-{
- TFile *f1 = new TFile("hsimple.root");
- TCanvas *c1 = new TCanvas("c1");
- TPostScript *ps = new TPostScript("file.ps",112);
- c1->Divide(2,1);
-<b>// picture 1</b>
- ps->NewPage();
- c1->cd(1);
- hpx->Draw();
- c1->cd(2);
- hprof->Draw();
- c1->Update();
-
-<b>// picture 2</b>
- ps->NewPage();
- c1->cd(1);
- hpxpy->Draw();
- c1->cd(2);
- ntuple->Draw("px");
- c1->Update();
- ps->Close();
-
-<b>// invoke Postscript viewer</b>
- gSystem->Exec("gs file.ps");
-}
-</PRE>
-
-<H2>Making several pictures in the same Postscript file: case 3</H2>
-<b>This is the recommended way</b>. If the Postscript file name finishes with
-"(", the file remains opened (it is not closed). If the Postscript file name
-finishes with ")" and the file has been opened with "(", the file is closed.
-<P>Example:
-<PRE>
-{
- TCanvas c1("c1");
- h1.Draw();
- c1.Print("c1.ps("); // write canvas and keep the ps file open
- h2.Draw();
- c1.Print("c1.ps"); // canvas is added to "c1.ps"
- h3.Draw();
- c1.Print("c1.ps)"); // canvas is added to "c1.ps" and ps file is closed
-}
-</PRE>
-The <tt>TCanvas::Print("file.ps(")</tt> mechanism is very useful, but it can
-be a little inconvenient to have the action of opening/closing a file being
-atomic with printing a page. Particularly if pages are being generated in some
-loop one needs to detect the special cases of first and last page and then
-munge the argument to Print() accordingly.
-<BR>The "[" and "]" can be used instead of "(" and ")" as shown below.
-<P>Example:
-<PRE>
- c1.Print("file.ps["); // No actual print, just open file.ps
-
- for (int i=0; i<10; ++i) {
- // fill canvas for context i
- // ...
-
- c1.Print("file.ps"); // Actually print canvas to the file
- }
-
- c1.Print("file.ps]"); // No actual print, just close the file
-</PRE>
-
-<H2>Color Model</H2>
-TPostScript support two color model RGB and CMYK. CMY and CMYK models are
-subtractive color models unlike RGB which is an additive. They are mainly
-used for printing purposes. CMY means Cyan Magenta Yellow to convert RGB
-to CMY it is enough to do: C=1-R, M=1-G and Y=1-B. CMYK has one more
-component K (black). The conversion from RGB to CMYK is:
-<PRE>
+ <center><h2>TPostScript: Graphics interface to PostScript</h2></center>
+ This code was initially developed in the context of HIGZ and PAW
+ by Olivier Couet and Pierre Juillot. It has been converted to a C++ class by
+ Rene Brun.
+
+ <P>To generate a Postscript (or encapsulated ps) file corresponding to
+ a single image in a canvas, you can:
+
+ <UL>
+ <LI>Select the <B>Print PostScript</B> item in the canvas <B>File</B> menu.
+ By default, a Postscript file with the name of the canvas.ps is generated.
+
+ <br>
+ <LI>Click in the canvas area, near the edges, with the right mouse button
+ and select the <B>Print</B> item. You can select the name of the Postscript
+ file. If the file name is xxx.ps, you will generate a Postscript file named
+ xxx.ps. If the file name is xxx.eps, you generate an encapsulated Postscript
+ file instead.
+ <br>
+
+ <LI>In your program (or macro), you can type:
+
+ <P><TT><B>
+ c1->Print("xxx.ps")</B> or <B>c1->Print("xxx.eps")
+ </B></TT>
+
+ <P>This will generate a file corresponding to the picture in the canvas
+ pointed by <tt><B>c1</B></tt>.
+
+ <P><TT><B>pad1->Print("xxx.ps")</B></TT>
+
+ <P>prints only the picture in the pad pointed by <tt><B>pad1</B></tt>. The size
+ of the Postscript picture, by default, is computed to keep the aspect ratio
+ of the picture on the screen, where the size along x is always 20cm. You
+ can set the size of the PostScript picture before generating the picture
+ with a command such as:
+
+ <PRE>
+ TPostScript myps("myfile.ps",111)
+ myps.Range(xsize,ysize);
+ object->Draw();
+ myps.Close();
+ </PRE>
+
+ <P>You can set the default paper size with:
+ <PRE>
+ gStyle->SetPaperSize(xsize,ysize);
+ </PRE>
+ <P>You can resume writing again in this file with <tt><B>myps.Open();</B></tt>.
+ Note that you may have several Postscript files opened simultaneously.
+ </UL>
+
+ <H2>Output type</H2>
+
+ The output type allows to define how the PostScript output will looks like.
+ It allows to define the page format (A4, Legal etc..), the orientation
+ (Portrait, Landscape) and the number of images (zones) per page.
+ The output type has the following form:
+ <pre>
+ [Format][Nx][Ny][Type]
+ </pre>
+ Where:
+ <ul>
+ <li> Format : Is an integer between 0 and 99 defining the page format.
+ Example:
+ <br> Format = 3 the paper is in the standard A3 format.
+ <br> Format = n (1<n<98) is an An format.
+ <br> Format = 4 and Format=0 are the same and define an A4 page.
+ <br> The A0 format is selected by Format=99.
+ <br> The US format Letter is selected by Format = 100.
+ <br> The US format Legal is selected by Format = 200.
+ <br> The US format Ledger is selected by Format = 300.
+
+ <li> Nx, Ny : Specify respectively the number of zones on the x and y axis.
+ Nx and Ny are integers between 1 and 9.
+
+ <li> Type : Can be equal to:
+ <ul>
+ <li> 1 : Portrait mode with a small margin at the bottom of the page.
+ <li> 2 : Landscape mode with a small margin at the bottom of the page.
+ <li> 4 : Portrait mode with a large margin at the bottom of the page.
+ <li> 5 : Landscape mode with a large margin at the bottom of the page.
+ The large margin is useful for some PostScript printers (very often
+ for the colour printers) as they need more space to grip the paper
+ for mechanical reasons. Note that some PostScript colour printers
+ can also use the so called special A4 format permitting the full
+ usage of the A4 area; in this case larger margins are not necessary
+ and Type=1 or 2 can be used.
+ <li> 3 : Encapsulated PostScript. This Type permits the generation of files
+ which can be included in other documents, for example in LaTeX
+ files.
+ </ul>
+ </ul>
+
+ <H2>Making several pictures in the same Postscript file: case 1</H2>
+ <P>The following macro is an example illustrating how to open a Postscript
+ file and draw several pictures. The generation of a new Postscript page
+ is automatic when <tt><B>TCanvas::Clear</B></tt> is called by
+ <tt><b>object->Draw()</b></tt>.
+ <PRE>
+ {
+ TFile f("hsimple.root");
+ TCanvas c1("c1","canvas",800,600);
+
+ <b>// select postscript output type</b>
+ <b>// type = 111 portrait ps</b>
+ <b>// type = 112 landscape ps</b>
+ <b>// type = 113 eps</b>
+ Int_t type = 111;
+
+ <b>// create a postscript file and set the paper size</b>
+ TPostScript ps("test.ps",type);
+ ps.Range(16,24); //set x,y of printed page
+
+ <b>// draw 3 histograms from file hsimple.root on separate pages</b>
+ hpx->Draw();
+ c1.Update(); //force drawing in a macro
+ hprof->Draw();
+ c1.Update();
+ hpx->Draw("lego1");
+ c1.Update();
+ ps.Close();
+ }
+ </PRE>
+
+ <H2>Making several pictures in the same Postscript file: case 2</H2>
+ <P>This example shows 2 pages. The canvas is divided.
+ <tt><B>TPostScript::NewPage</B></tt> must be called before starting a new
+ picture.<tt><b>object->Draw</b></tt> does not clear the canvas in this case
+ because we clear only the pads and not the main canvas.
+ Note that <tt><b>c1->Update</b></tt> must be called at the end of the first
+ picture.
+ <PRE>
+ {
+ TFile *f1 = new TFile("hsimple.root");
+ TCanvas *c1 = new TCanvas("c1");
+ TPostScript *ps = new TPostScript("file.ps",112);
+ c1->Divide(2,1);
+ <b>// picture 1</b>
+ ps->NewPage();
+ c1->cd(1);
+ hpx->Draw();
+ c1->cd(2);
+ hprof->Draw();
+ c1->Update();
+
+ <b>// picture 2</b>
+ ps->NewPage();
+ c1->cd(1);
+ hpxpy->Draw();
+ c1->cd(2);
+ ntuple->Draw("px");
+ c1->Update();
+ ps->Close();
+
+ <b>// invoke Postscript viewer</b>
+ gSystem->Exec("gs file.ps");
+ }
+ </PRE>
+
+ <H2>Making several pictures in the same Postscript file: case 3</H2>
+ <b>This is the recommended way</b>. If the Postscript file name finishes with
+ "(", the file remains opened (it is not closed). If the Postscript file name
+ finishes with ")" and the file has been opened with "(", the file is closed.
+ <P>Example:
+ <PRE>
+ {
+ TCanvas c1("c1");
+ h1.Draw();
+ c1.Print("c1.ps("); // write canvas and keep the ps file open
+ h2.Draw();
+ c1.Print("c1.ps"); // canvas is added to "c1.ps"
+ h3.Draw();
+ c1.Print("c1.ps)"); // canvas is added to "c1.ps" and ps file is closed
+ }
+ </PRE>
+ The <tt>TCanvas::Print("file.ps(")</tt> mechanism is very useful, but it can
+ be a little inconvenient to have the action of opening/closing a file being
+ atomic with printing a page. Particularly if pages are being generated in some
+ loop one needs to detect the special cases of first and last page and then
+ munge the argument to Print() accordingly.
+ <BR>The "[" and "]" can be used instead of "(" and ")" as shown below.
+ <P>Example:
+ <PRE>
+ c1.Print("file.ps["); // No actual print, just open file.ps
+
+ for (int i=0; i<10; ++i) {
+ // fill canvas for context i
+ // ...
+
+ c1.Print("file.ps"); // Actually print canvas to the file
+ }
+
+ c1.Print("file.ps]"); // No actual print, just close the file
+ </PRE>
+
+ <H2>Color Model</H2>
+ TPostScript support two color model RGB and CMYK. CMY and CMYK models are
+ subtractive color models unlike RGB which is an additive. They are mainly
+ used for printing purposes. CMY means Cyan Magenta Yellow to convert RGB
+ to CMY it is enough to do: C=1-R, M=1-G and Y=1-B. CMYK has one more
+ component K (black). The conversion from RGB to CMYK is:
+ <PRE>
Double_t Black = TMath::Min(TMath::Min(1-Red,1-Green),1-Blue);
Double_t Cyan = (1-Red-Black)/(1-Black);
Double_t Magenta = (1-Green-Black)/(1-Black);
Double_t Yellow = (1-Blue-Black)/(1-Black);
-</PRE>
-CMYK add the black component which allows to have a better quality for black
-printing. PostScript support the CMYK model.
-<br>
-To change the color model use gStyle->SetColorModelPS(c).
-<ul>
-<li> c = 0 means TPostScript will use RGB color model (default)
-<li> c = 1 means TPostScript will use CMYK color model
-</ul>
-End_Html */
+ </PRE>
+ CMYK add the black component which allows to have a better quality for black
+ printing. PostScript support the CMYK model.
+ <br>
+ To change the color model use gStyle->SetColorModelPS(c).
+ <ul>
+ <li> c = 0 means TPostScript will use RGB color model (default)
+ <li> c = 1 means TPostScript will use CMYK color model
+ </ul>
+ End_Html */
#ifdef WIN32
#pragma optimize("",off)
@@ -332,7 +332,7 @@ TPostScript::TPostScript() : TVirtualPS()
//______________________________________________________________________________
TPostScript::TPostScript(const char *fname, Int_t wtype)
- :TVirtualPS(fname, wtype)
+:TVirtualPS(fname, wtype)
{
// Initialize the PostScript interface
//
@@ -523,9 +523,9 @@ void TPostScript::CellArrayBegin(Int_t W, Int_t /*H*/, Double_t x1, Double_t x2,
Int_t iy1 = YtoPS(y1);
Float_t wt = (288/2.54)*gPad->GetAbsWNDC()*
- fXsize*((x2 - x1)/(gPad->GetX2()-gPad->GetX1()));
+ fXsize*((x2 - x1)/(gPad->GetX2()-gPad->GetX1()));
Float_t ht = (288/2.54)*gPad->GetAbsHNDC()*
- fYsize*((y2 - y1)/(gPad->GetY2()-gPad->GetY1()));
+ fYsize*((y2 - y1)/(gPad->GetY2()-gPad->GetY1()));
fLastCellRed = 300;
fLastCellGreen = 300;
@@ -1176,11 +1176,11 @@ void TPostScript::DrawPS(Int_t nn, Float_t *xw, Float_t *yw)
// If nn<0 the line is clipped as a fill area.
static Float_t dyhatch[24] = {.0075,.0075,.0075,.0075,.0075,.0075,.0075,.0075,
- .01 ,.01 ,.01 ,.01 ,.01 ,.01 ,.01 ,.01 ,
- .015 ,.015 ,.015 ,.015 ,.015 ,.015 ,.015 ,.015};
+ .01 ,.01 ,.01 ,.01 ,.01 ,.01 ,.01 ,.01 ,
+ .015 ,.015 ,.015 ,.015 ,.015 ,.015 ,.015 ,.015};
static Float_t anglehatch[24] = {180, 90,135, 45,150, 30,120, 60,
- 180, 90,135, 45,150, 30,120, 60,
- 180, 90,135, 45,150, 30,120, 60};
+ 180, 90,135, 45,150, 30,120, 60,
+ 180, 90,135, 45,150, 30,120, 60};
Int_t i, n, ixd0, iyd0, idx, idy, ixdi, iydi, ix, iy, fais, fasi;
fais = fasi = n = 0;
Int_t jxd0 = XtoPS(xw[0]);
@@ -1287,11 +1287,11 @@ void TPostScript::DrawPS(Int_t nn, Double_t *xw, Double_t *yw)
// If nn<0 the line is clipped as a fill area.
static Float_t dyhatch[24] = {.0075,.0075,.0075,.0075,.0075,.0075,.0075,.0075,
- .01 ,.01 ,.01 ,.01 ,.01 ,.01 ,.01 ,.01 ,
- .015 ,.015 ,.015 ,.015 ,.015 ,.015 ,.015 ,.015};
+ .01 ,.01 ,.01 ,.01 ,.01 ,.01 ,.01 ,.01 ,
+ .015 ,.015 ,.015 ,.015 ,.015 ,.015 ,.015 ,.015};
static Float_t anglehatch[24] = {180, 90,135, 45,150, 30,120, 60,
- 180, 90,135, 45,150, 30,120, 60,
- 180, 90,135, 45,150, 30,120, 60};
+ 180, 90,135, 45,150, 30,120, 60,
+ 180, 90,135, 45,150, 30,120, 60};
Int_t i, n, ixd0, iyd0, idx, idy, ixdi, iydi, ix, iy, fais, fasi;
fais = fasi = n = 0;
Int_t jxd0 = XtoPS(xw[0]);
@@ -1406,103 +1406,103 @@ void TPostScript::DrawHatch(Float_t, Float_t, Int_t, Double_t *, Double_t *)
//______________________________________________________________________________
Bool_t TPostScript::FontEmbedType1(const char *filename)
{
- std::ifstream font_file(filename, std::ios::binary);
+ std::ifstream font_file(filename, std::ios::binary);
- // We cannot read directly using iostream iterators due to
- // signedness
- font_file.seekg(0, std::ios::end);
+ // We cannot read directly using iostream iterators due to
+ // signedness
+ font_file.seekg(0, std::ios::end);
- const size_t font_file_length = font_file.tellg();
+ const size_t font_file_length = font_file.tellg();
- font_file.seekg(0, std::ios::beg);
+ font_file.seekg(0, std::ios::beg);
- std::vector<unsigned char> font_data(font_file_length, '\0');
+ std::vector<unsigned char> font_data(font_file_length, '\0');
- font_file.read(reinterpret_cast<char *>(&font_data[0]),
- font_file_length);
+ font_file.read(reinterpret_cast<char *>(&font_data[0]),
+ font_file_length);
- std::string font_name;
- std::string postscript_string =
- mathtext::font_embed_postscript_t::font_embed_type_1(
- font_name, font_data);
+ std::string font_name;
+ std::string postscript_string =
+ mathtext::font_embed_postscript_t::font_embed_type_1(
+ font_name, font_data);
- if (!postscript_string.empty()) {
- PrintRaw(postscript_string.size(), postscript_string.data());
- PrintStr("@");
+ if (!postscript_string.empty()) {
+ PrintRaw(postscript_string.size(), postscript_string.data());
+ PrintStr("@");
- return true;
- }
+ return true;
+ }
- return false;
+ return false;
}
//______________________________________________________________________________
Bool_t TPostScript::FontEmbedType2(const char *filename)
{
- std::ifstream font_file(filename, std::ios::binary);
+ std::ifstream font_file(filename, std::ios::binary);
- // We cannot read directly using iostream iterators due to
- // signedness
- font_file.seekg(0, std::ios::end);
+ // We cannot read directly using iostream iterators due to
+ // signedness
+ font_file.seekg(0, std::ios::end);
- const size_t font_file_length = font_file.tellg();
+ const size_t font_file_length = font_file.tellg();
- font_file.seekg(0, std::ios::beg);
+ font_file.seekg(0, std::ios::beg);
- std::vector<unsigned char> font_data(font_file_length, '\0');
+ std::vector<unsigned char> font_data(font_file_length, '\0');
- font_file.read(reinterpret_cast<char *>(&font_data[0]),
- font_file_length);
+ font_file.read(reinterpret_cast<char *>(&font_data[0]),
+ font_file_length);
- std::string font_name;
- std::string postscript_string =
- mathtext::font_embed_postscript_t::font_embed_type_2(
- font_name, font_data);
+ std::string font_name;
+ std::string postscript_string =
+ mathtext::font_embed_postscript_t::font_embed_type_2(
+ font_name, font_data);
- if (!postscript_string.empty()) {
- PrintRaw(postscript_string.size(), postscript_string.data());
- PrintStr("@");
+ if (!postscript_string.empty()) {
+ PrintRaw(postscript_string.size(), postscript_string.data());
+ PrintStr("@");
- return true;
- }
+ return true;
+ }
- return false;
+ return false;
}
//______________________________________________________________________________
Bool_t TPostScript::FontEmbedType42(const char *filename)
{
- std::ifstream font_file(filename, std::ios::binary);
+ std::ifstream font_file(filename, std::ios::binary);
- // We cannot read directly using iostream iterators due to
- // signedness
- font_file.seekg(0, std::ios::end);
+ // We cannot read directly using iostream iterators due to
+ // signedness
+ font_file.seekg(0, std::ios::end);
- const size_t font_file_length = font_file.tellg();
+ const size_t font_file_length = font_file.tellg();
- font_file.seekg(0, std::ios::beg);
+ font_file.seekg(0, std::ios::beg);
- std::vector<unsigned char> font_data(font_file_length, '\0');
+ std::vector<unsigned char> font_data(font_file_length, '\0');
- font_file.read(reinterpret_cast<char *>(&font_data[0]),
- font_file_length);
+ font_file.read(reinterpret_cast<char *>(&font_data[0]),
+ font_file_length);
- std::string font_name;
- std::string postscript_string =
- mathtext::font_embed_postscript_t::font_embed_type_42(
- font_name, font_data);
+ std::string font_name;
+ std::string postscript_string =
+ mathtext::font_embed_postscript_t::font_embed_type_42(
+ font_name, font_data);
- if (!postscript_string.empty()) {
- PrintRaw(postscript_string.size(), postscript_string.data());
- PrintStr("@");
+ if (!postscript_string.empty()) {
+ PrintRaw(postscript_string.size(), postscript_string.data());
+ PrintStr("@");
- return true;
- }
- fprintf(stderr, "%s:%d:\n", __FILE__, __LINE__);
+ return true;
+ }
+ fprintf(stderr, "%s:%d:\n", __FILE__, __LINE__);
- return false;
+ return false;
}
@@ -1512,38 +1512,38 @@ void TPostScript::FontEmbed(void)
// Embed font in PS file.
static const char *fonttable[32][2] = {
- { "Root.TTFont.0", "FreeSansBold.otf" },
- { "Root.TTFont.1", "FreeSerifItalic.otf" },
- { "Root.TTFont.2", "FreeSerifBold.otf" },
- { "Root.TTFont.3", "FreeSerifBoldItalic.otf" },
- { "Root.TTFont.4", "FreeSans.otf" },
- { "Root.TTFont.5", "FreeSansOblique.otf" },
- { "Root.TTFont.6", "FreeSansBold.otf" },
- { "Root.TTFont.7", "FreeSansBoldOblique.otf" },
- { "Root.TTFont.8", "FreeMono.otf" },
- { "Root.TTFont.9", "FreeMonoOblique.otf" },
- { "Root.TTFont.10", "FreeMonoBold.otf" },
- { "Root.TTFont.11", "FreeMonoBoldOblique.otf" },
- { "Root.TTFont.12", "symbol.ttf" },
- { "Root.TTFont.13", "FreeSerif.otf" },
- { "Root.TTFont.14", "wingding.ttf" },
- { "Root.TTFont.15", "symbol.ttf" },
- { "Root.TTFont.STIXGen", "STIXGeneral.otf" },
- { "Root.TTFont.STIXGenIt", "STIXGeneralItalic.otf" },
- { "Root.TTFont.STIXGenBd", "STIXGeneralBol.otf" },
- { "Root.TTFont.STIXGenBdIt", "STIXGeneralBolIta.otf" },
- { "Root.TTFont.STIXSiz1Sym", "STIXSiz1Sym.otf" },
- { "Root.TTFont.STIXSiz1SymBd", "STIXSiz1SymBol.otf" },
- { "Root.TTFont.STIXSiz2Sym", "STIXSiz2Sym.otf" },
- { "Root.TTFont.STIXSiz2SymBd", "STIXSiz2SymBol.otf" },
- { "Root.TTFont.STIXSiz3Sym", "STIXSiz3Sym.otf" },
- { "Root.TTFont.STIXSiz3SymBd", "STIXSiz3SymBol.otf" },
- { "Root.TTFont.STIXSiz4Sym", "STIXSiz4Sym.otf" },
- { "Root.TTFont.STIXSiz4SymBd", "STIXSiz4SymBol.otf" },
- { "Root.TTFont.STIXSiz5Sym", "STIXSiz5Sym.otf" },
- { "Root.TTFont.ME", "DroidSansFallback.ttf" },
- { "Root.TTFont.CJKMing", "DroidSansFallback.ttf" },
- { "Root.TTFont.CJKCothic", "DroidSansFallback.ttf" }
+ { "Root.TTFont.0", "FreeSansBold.otf" },
+ { "Root.TTFont.1", "FreeSerifItalic.otf" },
+ { "Root.TTFont.2", "FreeSerifBold.otf" },
+ { "Root.TTFont.3", "FreeSerifBoldItalic.otf" },
+ { "Root.TTFont.4", "FreeSans.otf" },
+ { "Root.TTFont.5", "FreeSansOblique.otf" },
+ { "Root.TTFont.6", "FreeSansBold.otf" },
+ { "Root.TTFont.7", "FreeSansBoldOblique.otf" },
+ { "Root.TTFont.8", "FreeMono.otf" },
+ { "Root.TTFont.9", "FreeMonoOblique.otf" },
+ { "Root.TTFont.10", "FreeMonoBold.otf" },
+ { "Root.TTFont.11", "FreeMonoBoldOblique.otf" },
+ { "Root.TTFont.12", "symbol.ttf" },
+ { "Root.TTFont.13", "FreeSerif.otf" },
+ { "Root.TTFont.14", "wingding.ttf" },
+ { "Root.TTFont.15", "symbol.ttf" },
+ { "Root.TTFont.STIXGen", "STIXGeneral.otf" },
+ { "Root.TTFont.STIXGenIt", "STIXGeneralItalic.otf" },
+ { "Root.TTFont.STIXGenBd", "STIXGeneralBol.otf" },
+ { "Root.TTFont.STIXGenBdIt", "STIXGeneralBolIta.otf" },
+ { "Root.TTFont.STIXSiz1Sym", "STIXSiz1Sym.otf" },
+ { "Root.TTFont.STIXSiz1SymBd", "STIXSiz1SymBol.otf" },
+ { "Root.TTFont.STIXSiz2Sym", "STIXSiz2Sym.otf" },
+ { "Root.TTFont.STIXSiz2SymBd", "STIXSiz2SymBol.otf" },
+ { "Root.TTFont.STIXSiz3Sym", "STIXSiz3Sym.otf" },
+ { "Root.TTFont.STIXSiz3SymBd", "STIXSiz3SymBol.otf" },
+ { "Root.TTFont.STIXSiz4Sym", "STIXSiz4Sym.otf" },
+ { "Root.TTFont.STIXSiz4SymBd", "STIXSiz4SymBol.otf" },
+ { "Root.TTFont.STIXSiz5Sym", "STIXSiz5Sym.otf" },
+ { "Root.TTFont.ME", "DroidSansFallback.ttf" },
+ { "Root.TTFont.CJKMing", "DroidSansFallback.ttf" },
+ { "Root.TTFont.CJKCothic", "DroidSansFallback.ttf" }
};
PrintStr("%%IncludeResource: ProcSet (FontSetInit)@");
@@ -1551,38 +1551,38 @@ void TPostScript::FontEmbed(void)
// try to load font (font must be in Root.TTFontPath resource)
const char *ttpath = gEnv->GetValue("Root.TTFontPath",
#ifdef TTFFONTDIR
- TTFFONTDIR
+ TTFFONTDIR
#else // TTFFONTDIR
- "$(ROOTSYS)/fonts"
+ "$(ROOTSYS)/fonts"
#endif // TTFFONTDIR
- );
+ );
for (Int_t fontid = 1; fontid < 30; fontid++) {
- if (fontid != 15) {
- const char *filename = gEnv->GetValue(
- fonttable[fontid][0], fonttable[fontid][1]);
- char *ttfont = gSystem->Which(ttpath, filename,
- kReadPermission);
-
- if(!ttfont) {
- Error("TPostScript::FontEmbed",
- "font %d (filename `%s') not found in path",
- fontid, filename);
- } else {
- if (FontEmbedType2(ttfont)) {
- // nothing
- } else if(FontEmbedType1(ttfont)) {
- // nothing
- } else if(FontEmbedType42(ttfont)) {
- // nothing
- } else {
- Error("TPostScript::FontEmbed",
- "failed to embed font %d (filename `%s')",
- fontid, filename);
- }
- delete [] ttfont;
- }
- }
+ if (fontid != 15) {
+ const char *filename = gEnv->GetValue(
+ fonttable[fontid][0], fonttable[fontid][1]);
+ char *ttfont = gSystem->Which(ttpath, filename,
+ kReadPermission);
+
+ if(!ttfont) {
+ Error("TPostScript::FontEmbed",
+ "font %d (filename `%s') not found in path",
+ fontid, filename);
+ } else {
+ if (FontEmbedType2(ttfont)) {
+ // nothing
+ } else if(FontEmbedType1(ttfont)) {
+ // nothing
+ } else if(FontEmbedType42(ttfont)) {
+ // nothing
+ } else {
+ Error("TPostScript::FontEmbed",
+ "failed to embed font %d (filename `%s')",
+ fontid, filename);
+ }
+ delete [] ttfont;
+ }
+ }
}
PrintStr("%%IncludeResource: font Times-Roman@");
PrintStr("%%IncludeResource: font Times-Italic@");
@@ -1598,7 +1598,7 @@ void TPostScript::FontEmbed(void)
PrintStr("%%IncludeResource: font Courier-BoldOblique@");
PrintStr("%%IncludeResource: font Symbol@");
PrintStr("%%IncludeResource: font ZapfDingbats@");
-
+
fFontEmbed = kTRUE;
}
@@ -1753,7 +1753,7 @@ void TPostScript::Initialize()
PrintStr("%%Pages: (atend)@");
}
else {
- if (!strchr(pstitle,'\n')) {
+ if (!strchr(pstitle,'\n')) {
PrintFast(2,": ");
PrintStr(pstitle);
}
@@ -1979,7 +1979,7 @@ void TPostScript::NewPage()
// Compute pad conversion coefficients
if (gPad) {
-// if (!gPad->GetPadPaint()) gPad->Update();
+ // if (!gPad->GetPadPaint()) gPad->Update();
Double_t ww = gPad->GetWw();
Double_t wh = gPad->GetWh();
fYsize = fXsize*wh/ww;
@@ -2121,9 +2121,9 @@ void TPostScript::SetFillPatterns(Int_t ipat, Int_t color)
// been defined in the current file (see label 200).
if (fPatterns[ipat] == 0) {
- // Define the Patterns. Line width must be 1
- // Setting fLineWidth to -1 will force the line width definition next time
- // TPostScript::SetLineWidth will be called.
+ // Define the Patterns. Line width must be 1
+ // Setting fLineWidth to -1 will force the line width definition next time
+ // TPostScript::SetLineWidth will be called.
fLineWidth = -1;
PrintFast(5," 1 lw");
PrintStr(" << /PatternType 1 /PaintType 2 /TilingType 1");
@@ -2441,8 +2441,8 @@ void TPostScript::SetLineJoin( Int_t linejoin )
//
//Begin_Html
/*
- <img src="gif/linejoin.gif">
- */
+ <img src="gif/linejoin.gif">
+ */
//End_Html
//
// To change the line join behaviour just do:
@@ -2564,37 +2564,37 @@ void TPostScript::Text(Double_t xx, Double_t yy, const char *chars)
// at position xx,yy in world coordinates.
static const char *psfont[31][2] = {
- { "Root.PSFont.1", "/Times-Italic" },
- { "Root.PSFont.2", "/Times-Bold" },
- { "Root.PSFont.3", "/Times-BoldItalic" },
- { "Root.PSFont.4", "/Helvetica" },
- { "Root.PSFont.5", "/Helvetica-Oblique" },
- { "Root.PSFont.6", "/Helvetica-Bold" },
- { "Root.PSFont.7", "/Helvetica-BoldOblique" },
- { "Root.PSFont.8", "/Courrier" },
- { "Root.PSFont.9", "/Courrier-Oblique" },
- { "Root.PSFont.10", "/Courrier-Bold" },
- { "Root.PSFont.11", "/Courrier-BoldOblique" },
- { "Root.PSFont.12", "/Symbol" },
- { "Root.PSFont.13", "/Times-Roman" },
- { "Root.PSFont.14", "/ZapfDingbats" },
- { "Root.PSFont.15", "/Symbol" },
- { "Root.PSFont.STIXGen", "/STIXGeneral" },
- { "Root.PSFont.STIXGenIt", "/STIXGeneral-Italic" },
- { "Root.PSFont.STIXGenBd", "/STIXGeneral-Bold" },
- { "Root.PSFont.STIXGenBdIt", "/STIXGeneral-BoldItalic" },
- { "Root.PSFont.STIXSiz1Sym", "/STIXSize1Symbols" },
- { "Root.PSFont.STIXSiz1SymBd", "/STIXSize1Symbols-Bold" },
- { "Root.PSFont.STIXSiz2Sym", "/STIXSize2Symbols" },
- { "Root.PSFont.STIXSiz2SymBd", "/STIXSize2Symbols-Bold" },
- { "Root.PSFont.STIXSiz3Sym", "/STIXSize3Symbols" },
- { "Root.PSFont.STIXSiz3SymBd", "/STIXSize3Symbols-Bold" },
- { "Root.PSFont.STIXSiz4Sym", "/STIXSize4Symbols" },
- { "Root.PSFont.STIXSiz4SymBd", "/STIXSize4Symbols-Bold" },
- { "Root.PSFont.STIXSiz5Sym", "/STIXSize5Symbols" },
- { "Root.PSFont.ME", "/DroidSansFallback" },
- { "Root.PSFont.CJKMing", "/DroidSansFallback" },
- { "Root.PSFont.CJKGothic", "/DroidSansFallback" }
+ { "Root.PSFont.1", "/Times-Italic" },
+ { "Root.PSFont.2", "/Times-Bold" },
+ { "Root.PSFont.3", "/Times-BoldItalic" },
+ { "Root.PSFont.4", "/Helvetica" },
+ { "Root.PSFont.5", "/Helvetica-Oblique" },
+ { "Root.PSFont.6", "/Helvetica-Bold" },
+ { "Root.PSFont.7", "/Helvetica-BoldOblique" },
+ { "Root.PSFont.8", "/Courrier" },
+ { "Root.PSFont.9", "/Courrier-Oblique" },
+ { "Root.PSFont.10", "/Courrier-Bold" },
+ { "Root.PSFont.11", "/Courrier-BoldOblique" },
+ { "Root.PSFont.12", "/Symbol" },
+ { "Root.PSFont.13", "/Times-Roman" },
+ { "Root.PSFont.14", "/ZapfDingbats" },
+ { "Root.PSFont.15", "/Symbol" },
+ { "Root.PSFont.STIXGen", "/STIXGeneral" },
+ { "Root.PSFont.STIXGenIt", "/STIXGeneral-Italic" },
+ { "Root.PSFont.STIXGenBd", "/STIXGeneral-Bold" },
+ { "Root.PSFont.STIXGenBdIt", "/STIXGeneral-BoldItalic" },
+ { "Root.PSFont.STIXSiz1Sym", "/STIXSize1Symbols" },
+ { "Root.PSFont.STIXSiz1SymBd", "/STIXSize1Symbols-Bold" },
+ { "Root.PSFont.STIXSiz2Sym", "/STIXSize2Symbols" },
+ { "Root.PSFont.STIXSiz2SymBd", "/STIXSize2Symbols-Bold" },
+ { "Root.PSFont.STIXSiz3Sym", "/STIXSize3Symbols" },
+ { "Root.PSFont.STIXSiz3SymBd", "/STIXSize3Symbols-Bold" },
+ { "Root.PSFont.STIXSiz4Sym", "/STIXSize4Symbols" },
+ { "Root.PSFont.STIXSiz4SymBd", "/STIXSize4Symbols-Bold" },
+ { "Root.PSFont.STIXSiz5Sym", "/STIXSize5Symbols" },
+ { "Root.PSFont.ME", "/DroidSansFallback" },
+ { "Root.PSFont.CJKMing", "/DroidSansFallback" },
+ { "Root.PSFont.CJKGothic", "/DroidSansFallback" }
};
const Double_t kDEGRAD = TMath::Pi()/180.;
@@ -2710,9 +2710,9 @@ void TPostScript::Text(Double_t xx, Double_t yy, const char *chars)
if(txalh == 3) PrintStr(Form(" %d 0 t ", -psCharsLength));
PrintStr(gEnv->GetValue(psfont[font-1][0], psfont[font-1][1]));
if (font != 15) {
- PrintStr(Form(" findfont %g sf 0 0 m ",fontsize));
+ PrintStr(Form(" findfont %g sf 0 0 m ",fontsize));
} else {
- PrintStr(Form(" findfont %g sf 0 0 m ita ",fontsize));
+ PrintStr(Form(" findfont %g sf 0 0 m ita ",fontsize));
}
if (kerning) {
@@ -2770,42 +2770,42 @@ void TPostScript::Text(Double_t xx, Double_t yy, const wchar_t *chars)
// at position xx,yy in world coordinates.
static const char *psfont[31][2] = {
- { "Root.PSFont.1", "/FreeSerifItalic" },
- { "Root.PSFont.2", "/FreeSerifBold" },
- { "Root.PSFont.3", "/FreeSerifBoldItalic" },
- { "Root.PSFont.4", "/FreeSans" },
- { "Root.PSFont.5", "/FreeSansOblique" },
- { "Root.PSFont.6", "/FreeSansBold" },
- { "Root.PSFont.7", "/FreeSansBoldOblique" },
- { "Root.PSFont.8", "/FreeMono" },
- { "Root.PSFont.9", "/FreeMonoOblique" },
- { "Root.PSFont.10", "/FreeMonoBold" },
- { "Root.PSFont.11", "/FreeMonoBoldOblique" },
- { "Root.PSFont.12", "/SymbolMT" },
- { "Root.PSFont.13", "/FreeSerif" },
- { "Root.PSFont.14", "/Wingdings-Regular" },
- { "Root.PSFont.15", "/SymbolMT" },
- { "Root.PSFont.STIXGen", "/STIXGeneral" },
- { "Root.PSFont.STIXGenIt", "/STIXGeneral-Italic" },
- { "Root.PSFont.STIXGenBd", "/STIXGeneral-Bold" },
- { "Root.PSFont.STIXGenBdIt", "/STIXGeneral-BoldItalic" },
- { "Root.PSFont.STIXSiz1Sym", "/STIXSize1Symbols" },
- { "Root.PSFont.STIXSiz1SymBd", "/STIXSize1Symbols-Bold" },
- { "Root.PSFont.STIXSiz2Sym", "/STIXSize2Symbols" },
- { "Root.PSFont.STIXSiz2SymBd", "/STIXSize2Symbols-Bold" },
- { "Root.PSFont.STIXSiz3Sym", "/STIXSize3Symbols" },
- { "Root.PSFont.STIXSiz3SymBd", "/STIXSize3Symbols-Bold" },
- { "Root.PSFont.STIXSiz4Sym", "/STIXSize4Symbols" },
- { "Root.PSFont.STIXSiz4SymBd", "/STIXSize4Symbols-Bold" },
- { "Root.PSFont.STIXSiz5Sym", "/STIXSize5Symbols" },
- { "Root.PSFont.ME", "/DroidSansFallback" },
- { "Root.PSFont.CJKMing", "/DroidSansFallback" },
- { "Root.PSFont.CJKGothic", "/DroidSansFallback" }
+ { "Root.PSFont.1", "/FreeSerifItalic" },
+ { "Root.PSFont.2", "/FreeSerifBold" },
+ { "Root.PSFont.3", "/FreeSerifBoldItalic" },
+ { "Root.PSFont.4", "/FreeSans" },
+ { "Root.PSFont.5", "/FreeSansOblique" },
+ { "Root.PSFont.6", "/FreeSansBold" },
+ { "Root.PSFont.7", "/FreeSansBoldOblique" },
+ { "Root.PSFont.8", "/FreeMono" },
+ { "Root.PSFont.9", "/FreeMonoOblique" },
+ { "Root.PSFont.10", "/FreeMonoBold" },
+ { "Root.PSFont.11", "/FreeMonoBoldOblique" },
+ { "Root.PSFont.12", "/SymbolMT" },
+ { "Root.PSFont.13", "/FreeSerif" },
+ { "Root.PSFont.14", "/Wingdings-Regular" },
+ { "Root.PSFont.15", "/SymbolMT" },
+ { "Root.PSFont.STIXGen", "/STIXGeneral" },
+ { "Root.PSFont.STIXGenIt", "/STIXGeneral-Italic" },
+ { "Root.PSFont.STIXGenBd", "/STIXGeneral-Bold" },
+ { "Root.PSFont.STIXGenBdIt", "/STIXGeneral-BoldItalic" },
+ { "Root.PSFont.STIXSiz1Sym", "/STIXSize1Symbols" },
+ { "Root.PSFont.STIXSiz1SymBd", "/STIXSize1Symbols-Bold" },
+ { "Root.PSFont.STIXSiz2Sym", "/STIXSize2Symbols" },
+ { "Root.PSFont.STIXSiz2SymBd", "/STIXSize2Symbols-Bold" },
+ { "Root.PSFont.STIXSiz3Sym", "/STIXSize3Symbols" },
+ { "Root.PSFont.STIXSiz3SymBd", "/STIXSize3Symbols-Bold" },
+ { "Root.PSFont.STIXSiz4Sym", "/STIXSize4Symbols" },
+ { "Root.PSFont.STIXSiz4SymBd", "/STIXSize4Symbols-Bold" },
+ { "Root.PSFont.STIXSiz5Sym", "/STIXSize5Symbols" },
+ { "Root.PSFont.ME", "/DroidSansFallback" },
+ { "Root.PSFont.CJKMing", "/DroidSansFallback" },
+ { "Root.PSFont.CJKGothic", "/DroidSansFallback" }
};
Int_t len = wcslen(chars);
if (len<=0) return;
-
+
const Double_t kDEGRAD = TMath::Pi()/180.;
Double_t x = xx;
Double_t y = yy;
@@ -2931,35 +2931,35 @@ void TPostScript::Text(Double_t xx, Double_t yy, const wchar_t *chars)
// Output text.
if (len > 1) PrintStr(Form("%d ", len));
for(Int_t i = 0; i < len; i++) {
- // Adobe Glyph Naming Convention
- // http://www.adobe.com/devnet/opentype/archives/glyph.html
+ // Adobe Glyph Naming Convention
+ // http://www.adobe.com/devnet/opentype/archives/glyph.html
#include "AdobeGlyphList.h"
- const wchar_t *lower = std::lower_bound(
- adobe_glyph_ucs, adobe_glyph_ucs + nadobe_glyph,
- chars[i]);
- if(lower < adobe_glyph_ucs + nadobe_glyph &&
- *lower == chars[i]) {
- // Named glyph from AGL 1.2
- const unsigned long index =
- lower - adobe_glyph_ucs;
- PrintStr(Form("/%s ", adobe_glyph_name[index]));
- }
- else if((unsigned int)chars[i] < 0xffff) {
- // Unicode BMP
- PrintStr(Form("/uni%04X ",
- (unsigned int)chars[i]));
- }
- else {
- // Unicode supplemental planes
- PrintStr(Form("/u%04X ",
- (unsigned int)chars[i]));
- }
+ const wchar_t *lower = std::lower_bound(
+ adobe_glyph_ucs, adobe_glyph_ucs + nadobe_glyph,
+ chars[i]);
+ if(lower < adobe_glyph_ucs + nadobe_glyph &&
+ *lower == chars[i]) {
+ // Named glyph from AGL 1.2
+ const unsigned long index =
+ lower - adobe_glyph_ucs;
+ PrintStr(Form("/%s ", adobe_glyph_name[index]));
+ }
+ else if((unsigned int)chars[i] < 0xffff) {
+ // Unicode BMP
+ PrintStr(Form("/uni%04X ",
+ (unsigned int)chars[i]));
+ }
+ else {
+ // Unicode supplemental planes
+ PrintStr(Form("/u%04X ",
+ (unsigned int)chars[i]));
+ }
}
if(len > 1) {
- PrintStr("{glyphshow} repeat ");
+ PrintStr("{glyphshow} repeat ");
}
else {
- PrintStr("glyphshow ");
+ PrintStr("glyphshow ");
}
PrintStr("NC");
@@ -3069,7 +3069,7 @@ void TPostScript::Zone()
fIXzone++;
if( fIXzone > fNXzone) { fIXzone=1; fIYzone++; }
}
-
+
// Picture Initialisation
SaveRestore(1);
if (fgLineJoin) {
diff --git a/graf2d/qt/inc/TQUserEvent.h b/graf2d/qt/inc/TQUserEvent.h
index ee1e4f5117d..3b65618ca33 100644
--- a/graf2d/qt/inc/TQUserEvent.h
+++ b/graf2d/qt/inc/TQUserEvent.h
@@ -35,7 +35,7 @@ public:
Event_t *data() const { return fEvent;}
void setData(Event_t *ev) { delete data(); fEvent=ev;}
TQUserEvent(const Event_t &pData) : QEvent(Type(QEvent::User+Type(1))),
- fEvent(0)
+ fEvent(0)
#else
TQUserEvent(const Event_t &pData) : QCustomEvent(Id(),0)
#endif
diff --git a/graf2d/qt/inc/TQtClientFilter.h b/graf2d/qt/inc/TQtClientFilter.h
index ff4e736b956..017793d2c9a 100644
--- a/graf2d/qt/inc/TQtClientFilter.h
+++ b/graf2d/qt/inc/TQtClientFilter.h
@@ -46,8 +46,8 @@ class TQtClientFilter : public QObject {
friend class TGQt;
friend class TQtClientWidget;
private:
- void operator=(const TQtClientFilter &);
- TQtClientFilter(const TQtClientFilter &);
+ void operator=(const TQtClientFilter &);
+ TQtClientFilter(const TQtClientFilter &);
protected:
TQtEventQueue *fRootEventQueue;
TQtNextEventMessage *fNotifyClient;
diff --git a/graf2d/qt/inc/TQtMarker.h b/graf2d/qt/inc/TQtMarker.h
index 16d7fe6ad89..b834ec7f03d 100644
--- a/graf2d/qt/inc/TQtMarker.h
+++ b/graf2d/qt/inc/TQtMarker.h
@@ -53,11 +53,11 @@ public:
TQtMarker &operator=(const TAttMarker&);
TQtMarker(const TAttMarker&);
virtual ~TQtMarker();
- void DrawPolyMarker(QPainter &p, int n, TPoint *xy);
- void SetMarkerAttributes(const TAttMarker& markerAttributes);
- void SetColor(Color_t mcolor);
+ void DrawPolyMarker(QPainter &p, int n, TPoint *xy);
+ void SetMarkerAttributes(const TAttMarker& markerAttributes);
+ void SetColor(Color_t mcolor);
void SetPenAttributes(int type);
- Color_t GetColor() const;
+ Color_t GetColor() const;
int GetNumber() const;
const QPolygon &GetNodes() const;
@@ -75,7 +75,7 @@ inline TQtMarker &TQtMarker::operator=(const TQtMarker&m)
fCindex = m.fCindex;
fMarkerType=m.fMarkerType;
fLineWidth =m.fLineWidth;
- return *this;
+ return *this;
}
//_________________________________________________________
inline TQtMarker::TQtMarker(const TQtMarker&m) : fNumNode(m.fNumNode),
diff --git a/graf2d/qt/inc/TQtTimer.h b/graf2d/qt/inc/TQtTimer.h
index 8d346aa3c6b..bb1e0919417 100644
--- a/graf2d/qt/inc/TQtTimer.h
+++ b/graf2d/qt/inc/TQtTimer.h
@@ -31,22 +31,22 @@ class TQtTimer : public QTimer {
Q_OBJECT
#endif
private:
- void operator=(const TQtTimer &);
- TQtTimer(const TQtTimer &);
+ void operator=(const TQtTimer &);
+ TQtTimer(const TQtTimer &);
protected:
- static TQtTimer *fgQTimer;
- int fCounter;
- TQtTimer (QObject *mother=0): QTimer(mother),fCounter(0)
- {}
+ static TQtTimer *fgQTimer;
+ int fCounter;
+ TQtTimer (QObject *mother=0): QTimer(mother),fCounter(0)
+ {}
protected slots:
- virtual void AwakeRootEvent();
-
+ virtual void AwakeRootEvent();
+
public:
- virtual ~TQtTimer(){}
- static TQtTimer *Create(QObject *parent=0);
- static TQtTimer *QtTimer();
- ClassDef(TQtTimer,0) // QTimer to awake the ROOT event loop from Qt event loop
+ virtual ~TQtTimer(){}
+ static TQtTimer *Create(QObject *parent=0);
+ static TQtTimer *QtTimer();
+ ClassDef(TQtTimer,0) // QTimer to awake the ROOT event loop from Qt event loop
};
diff --git a/graf2d/qt/inc/TQtWidget.h b/graf2d/qt/inc/TQtWidget.h
index 89215c754c7..ed43c3a004c 100644
--- a/graf2d/qt/inc/TQtWidget.h
+++ b/graf2d/qt/inc/TQtWidget.h
@@ -102,8 +102,8 @@ class TQtWidget : public QWidget {
#endif
private:
- TQtWidget(const TQtWidget&);
- void operator=(const TQtWidget&);
+ TQtWidget(const TQtWidget&);
+ void operator=(const TQtWidget&);
//----- Private bits, clients can only test but not change them
UInt_t fBits; //bit field status word
enum {
diff --git a/graf2d/qt/inc/TWaitCondition.h b/graf2d/qt/inc/TWaitCondition.h
index 5501fa0d9c3..8ee749cdb96 100644
--- a/graf2d/qt/inc/TWaitCondition.h
+++ b/graf2d/qt/inc/TWaitCondition.h
@@ -33,7 +33,7 @@ class TWaitCondition
public:
TWaitCondition() {}
~TWaitCondition() {}
- bool wait (unsigned long time=ULONG_MAX ) { if (time) {/* Wait() */} return TRUE;}
+ bool wait (unsigned long time=ULONG_MAX ) { if (time) {/* Wait() */} return TRUE;}
void wakeOne () { /* Release();*/ }
};
diff --git a/graf2d/qt/inc/rootlibs.pri b/graf2d/qt/inc/rootlibs.pri
index 01ba3860cb2..7b3c0ad1113 100644
--- a/graf2d/qt/inc/rootlibs.pri
+++ b/graf2d/qt/inc/rootlibs.pri
@@ -56,25 +56,25 @@ win32 {
#-- permanent components to be included into any ".pro" file to build the RootCint dictionary
win32 {
- LIBS += \
+ LIBS += \
-include:_G__cpp_setupG__Hist -include:_G__cpp_setupG__G3D \
-include:_G__cpp_setupG__GPad -include:_G__cpp_setupG__Tree -include:_G__cpp_setupG__Rint \
-include:_G__cpp_setupG__PostScript -include:_G__cpp_setupG__Matrix -include:_G__cpp_setupG__Physics \
-include:_G__cpp_setupG__Gui1 -include:_G__cpp_setupG__Geom1
exists( $$(ROOTSYS)/lib/libRIO.lib ) {
- LIBS += -include:_G__cpp_setupG__IO
+ LIBS += -include:_G__cpp_setupG__IO
}
exists( $$(ROOTSYS)/lib/libTable.lib ) {
- LIBS += -include:_G__cpp_setupG__Table
+ LIBS += -include:_G__cpp_setupG__Table
}
exists( $%(ROOTSYS)/lib/libQtRootGui.lib ) {
- LIBS += -include:_G__cpp_setupG__QtGUI
+ LIBS += -include:_G__cpp_setupG__QtGUI
}
- LIBS += \
+ LIBS += \
"$(ROOTSYS)/lib/libCore.lib" "$(ROOTSYS)/lib/libCint.lib" "$(ROOTSYS)/lib/libHist.lib" \
"$(ROOTSYS)/lib/libGraf.lib" "$(ROOTSYS)/lib/libGraf3d.lib" "$(ROOTSYS)/lib/libGpad.lib" \
"$(ROOTSYS)/lib/libTree.lib" "$(ROOTSYS)/lib/libRint.lib" "$(ROOTSYS)/lib/libPostscript.lib" \
@@ -83,15 +83,15 @@ win32 {
"$(ROOTSYS)/lib/libGQt.lib"
exists( $$(ROOTSYS)/lib/libRIO.lib ) {
- LIBS += "$(ROOTSYS)/lib/libRIO.lib"
+ LIBS += "$(ROOTSYS)/lib/libRIO.lib"
}
exists( $$(ROOTSYS)/lib/libTable.lib ) {
- LIBS += "$(ROOTSYS)/lib/libTable.lib"
+ LIBS += "$(ROOTSYS)/lib/libTable.lib"
}
exists( $$(ROOTSYS)/lib/libQtRootGui.lib ) {
- LIBS += "$(ROOTSYS)/lib/libQtRootGui.lib"
+ LIBS += "$(ROOTSYS)/lib/libQtRootGui.lib"
}
}
@@ -105,7 +105,7 @@ unix {
exists ($$libFile ) {
LIBS += -lQtRootGui
}
- LIBS += $$system(${ROOTSYS}/bin/root-config --glibs)
+ LIBS += $$system(${ROOTSYS}/bin/root-config --glibs)
libFile = $$(ROOTSYS)/lib/libTable.$$QMAKE_EXTENSION_SHLIB
exists( $$libFile ) {
LIBS += -lTable
@@ -114,11 +114,11 @@ unix {
LIBS *= -lGQt
exists( $$(ROOTSYS)/lib/libQtRootGui.$$QMAKE_EXTENSION_SHLIB ) {
- LIBS *= -lQtRootGui
+ LIBS *= -lQtRootGui
message ( "Found Qt extensions library !!!")
}
}
-FORCELINKLIST += \
+FORCELINKLIST += \
_G__cpp_setupG__Hist _G__cpp_setupG__Graf1 _G__cpp_setupG__G3D \
_G__cpp_setupG__GPad _G__cpp_setupG__Tree _G__cpp_setupG__Rint \
_G__cpp_setupG__PostScript _G__cpp_setupG__Matrix _G__cpp_setupG__Physics \
@@ -127,14 +127,14 @@ FORCELINKLIST +=
mac {
equals(TEMPLATE, app_fake) {
# this trick does not work yet (To be fixed. V.Fine)
- LIBS += $$join( FORCELINKLIST, " -u ")
+ LIBS += $$join( FORCELINKLIST, " -u ")
exists( $$(ROOTSYS)/lib/libTable.lib ) {
- LIBS += -u _G__cpp_setupG__Table
+ LIBS += -u _G__cpp_setupG__Table
}
exists( $$(ROOTSYS)/lib/libQtRootGui.lib ) {
- LIBS += -u _G__cpp_setupG__QtGUI
+ LIBS += -u _G__cpp_setupG__QtGUI
}
}
# -- trick to force the trivial symbolic link under UNIX
diff --git a/graf2d/qt/qt.pro b/graf2d/qt/qt.pro
index a2ec7f2ca2d..4c5cbf47ffb 100644
--- a/graf2d/qt/qt.pro
+++ b/graf2d/qt/qt.pro
@@ -80,14 +80,14 @@ CREATE_ROOT_DICT_FOR_CLASSES = $$GQTH1 $$GQTDIRI/LinkDef.h
win32 {
# copy from rootlibs.pri for GQt project
- LIBS += \
+ LIBS += \
-include:_G__cpp_setupG__Hist -include:_G__cpp_setupG__Graf1 -include:_G__cpp_setupG__G3D \
-include:_G__cpp_setupG__GPad -include:_G__cpp_setupG__Tree -include:_G__cpp_setupG__Rint \
-include:_G__cpp_setupG__PostScript -include:_G__cpp_setupG__Matrix -include:_G__cpp_setupG__Physics \
-include:_G__cpp_setupG__Gui1 -include:_G__cpp_setupG__Geom1
- LIBS += \
+ LIBS += \
$(ROOTSYS)/lib/libCore.lib $(ROOTSYS)/lib/libCint.lib $(ROOTSYS)/lib/libHist.lib \
$(ROOTSYS)/lib/libGraf.lib $(ROOTSYS)/lib/libGraf3d.lib $(ROOTSYS)/lib/libGpad.lib \
$(ROOTSYS)/lib/libTree.lib $(ROOTSYS)/lib/libRint.lib $(ROOTSYS)/lib/libPostscript.lib \
diff --git a/graf2d/qt/src/GQtGUI.cxx b/graf2d/qt/src/GQtGUI.cxx
index 18586745d00..44c2e9bd068 100644
--- a/graf2d/qt/src/GQtGUI.cxx
+++ b/graf2d/qt/src/GQtGUI.cxx
@@ -358,8 +358,8 @@ const QtGContext &QtGContext::Copy(const GCValues_t &gval)
#endif /* not QT_VERSION */
default:
#if QT_VERSION < 0x40000
- fROp = Qt::CopyROP;
- break;
+ fROp = Qt::CopyROP;
+ break;
#else /* QT_VERSION */
fROp = QPainter::CompositionMode_Source; //Qt::CopyROP;
break;
@@ -371,9 +371,9 @@ const QtGContext &QtGContext::Copy(const GCValues_t &gval)
// Fons said this must be like this. 4/07/2003 Valeri Fine
SETBIT(fMask, kROp);
#if QT_VERSION < 0x40000
- fROp = Qt::CopyROP;
+ fROp = Qt::CopyROP;
#else /* QT_VERSION */
- fROp = QPainter::CompositionMode_Source; // Qt::CopyROP;
+ fROp = QPainter::CompositionMode_Source; // Qt::CopyROP;
#endif /* QT_VERSION */
};
@@ -390,7 +390,7 @@ const QtGContext &QtGContext::Copy(const GCValues_t &gval)
// xmask |= GDK_GC_FOREGROUND;
// QColor paletteBackgroundColor - the background color of the widget
SetForeground(gval.fForeground);
- // fprintf(stderr," kGCForeground %s \root.exen", (const char*)QtColor(gval.fForeground).name());
+ // fprintf(stderr," kGCForeground %s \root.exen", (const char*)QtColor(gval.fForeground).name());
}
if ((rootMask & kGCBackground)) {
SetBackground(gval.fBackground);
@@ -2361,7 +2361,7 @@ static KeyQSymbolMap_t gKeyQMap[] = {
//______________________________________________________________________________________
static inline Int_t MapKeySym(int key, bool toQt=true)
{
- for (int i = 0; gKeyQMap[i].fKeySym; i++) { // any other keys
+ for (int i = 0; gKeyQMap[i].fKeySym; i++) { // any other keys
if (toQt) {
if (key == gKeyQMap[i].fKeySym ) {
return UInt_t(gKeyQMap[i].fQKeySym);
@@ -2782,14 +2782,14 @@ void TGQt::IntersectRegion(Region_t rega, Region_t regb, Region_t result)
// Compute the intersection of rega and regb and return result region.
// The output region may be the same as the result region.
- if( !rega || !regb || !result )
- return;
+ if( !rega || !regb || !result )
+ return;
- QRegion& a = *(QRegion*) rega;
- QRegion& b = *(QRegion*) regb;
- QRegion& r = *(QRegion*) result;
+ QRegion& a = *(QRegion*) rega;
+ QRegion& b = *(QRegion*) regb;
+ QRegion& r = *(QRegion*) result;
- r = a & b;
+ r = a & b;
}
//______________________________________________________________________________
void TGQt::SubtractRegion(Region_t rega, Region_t regb, Region_t result)
@@ -2825,21 +2825,21 @@ Bool_t TGQt::EmptyRegion(Region_t reg)
// Return true if the region is empty.
if( !reg )
- return true;
+ return true;
- QRegion& r = *(QRegion*) reg;
+ QRegion& r = *(QRegion*) reg;
- return r.isEmpty();
+ return r.isEmpty();
}
//______________________________________________________________________________
Bool_t TGQt::PointInRegion(Int_t x, Int_t y, Region_t reg)
{
// Returns true if the point x,y is in the region.
- if( !reg )
- return false;
+ if( !reg )
+ return false;
- QRegion& r = *(QRegion*) reg;
- return r.contains( QPoint(x, y) );
+ QRegion& r = *(QRegion*) reg;
+ return r.contains( QPoint(x, y) );
}
//______________________________________________________________________________
Bool_t TGQt::EqualRegion(Region_t rega, Region_t regb)
@@ -2859,16 +2859,16 @@ void TGQt::GetRegionBox(Region_t reg, Rectangle_t *rect)
{
// Return smallest enclosing rectangle.
- if( !reg || !rect )
- return;
+ if( !reg || !rect )
+ return;
- QRegion& r = *(QRegion*) reg;
- QRect rc = r.boundingRect();
+ QRegion& r = *(QRegion*) reg;
+ QRect rc = r.boundingRect();
- rect->fX = rc.x();
- rect->fY = rc.y();
- rect->fWidth = rc.width();
- rect->fHeight = rc.height();
+ rect->fX = rc.x();
+ rect->fY = rc.y();
+ rect->fWidth = rc.width();
+ rect->fHeight = rc.height();
}
//______________________________________________________________________________
char **TGQt::ListFonts(const char *fontname, Int_t max, Int_t &count)
diff --git a/graf2d/qt/src/TGQt.cxx b/graf2d/qt/src/TGQt.cxx
index dee8f8cf202..b642b11b5ef 100644
--- a/graf2d/qt/src/TGQt.cxx
+++ b/graf2d/qt/src/TGQt.cxx
@@ -768,11 +768,11 @@ TQtApplication *TGQt::CreateQtApplicationImp()
// app = new TQtApplication(gApplication->ApplicationName(),gApplication->Argc(),gApplication->Argv());
static TString argvString (
#ifdef ROOTBINDIR
- ROOTBINDIR "/root.exe"
+ ROOTBINDIR "/root.exe"
#else
- "$ROOTSYS/bin/root.exe"
+ "$ROOTSYS/bin/root.exe"
#endif
- );
+ );
gSystem->ExpandPathName(argvString);
static char *argv[] = {(char *)argvString.Data()};
static int nArg = 1;
@@ -958,9 +958,9 @@ Bool_t TGQt::Init(void* /*display*/)
// Load the local ROOT font
QString fontdir =
#ifdef TTFFONTDIR
- TTFFONTDIR
+ TTFFONTDIR
#else
- "$ROOTSYS/fonts"
+ "$ROOTSYS/fonts"
#endif
;
QString symbolFontFile = fontdir + "/" + QString(fSymbolFontFamily).toLower() + ".ttf";
@@ -974,11 +974,11 @@ Bool_t TGQt::Init(void* /*display*/)
qDebug() << " Make sure your local \"~/.fonts.conf\" or \"/etc/fonts/fonts.conf\" file points to \""
<<
#ifdef TTFFONTDIR
- TTFFONTDIR
+ TTFFONTDIR
#else
- "$ROOTSYS/fonts"
+ "$ROOTSYS/fonts"
#endif
- << "\" directory to get the proper support for ROOT TLatex class";
+ << "\" directory to get the proper support for ROOT TLatex class";
// create a custom codec
new QSymbolCodec();
}
@@ -1373,14 +1373,14 @@ void TGQt::DrawBox(int x1, int y1, int x2, int y2, EBoxMode mode)
// The reason of the problem has not been found yet.
// By some reason TBox::ExecuteEvent messes y2 and y1
if (y2 > y1) {
- // swap them :-(()
- int swap = y1;
- y1=y2; y2=swap;
+ // swap them :-(()
+ int swap = y1;
+ y1=y2; y2=swap;
}
if (x1 > x2) {
- // swap them :-(()
- int swap = x1;
- x1=x2; x2=swap;
+ // swap them :-(()
+ int swap = x1;
+ x1=x2; x2=swap;
}
if ( (fSelectedWindow->devType() == QInternal::Widget) && fFeedBackMode && fFeedBackWidget) {
fFeedBackWidget->SetGeometry(x1,y2,x2-x1,y1-y2,(TQtWidget *)fSelectedWindow);
@@ -1528,7 +1528,7 @@ void TGQt::DrawPolyMarker(int n, TPoint *xy)
TQtLock lock;
if (fSelectedWindow) {
TQtPainter p(this,TQtPainter::kNone);
- fQtMarker->DrawPolyMarker(p,n,xy);
+ fQtMarker->DrawPolyMarker(p,n,xy);
}
}
//______________________________________________________________________________
@@ -2099,9 +2099,9 @@ void TGQt::SetDrawMode(TVirtualX::EDrawMode mode)
fFeedBackWidget = new TQtFeedBackWidget;
fFeedBackWidget->setFrameStyle(QFrame::Box);
}
- // This makes no sense on X11 yet due the
- // TQtWidget::setAttribute(Qt::WA_PaintOnScreen) flag
- // TQtWidget keeps painting itself over the feedback windows. Wierd !!!
+ // This makes no sense on X11 yet due the
+ // TQtWidget::setAttribute(Qt::WA_PaintOnScreen) flag
+ // TQtWidget keeps painting itself over the feedback windows. Wierd !!!
// reparent if needed
fFeedBackWidget->SetParent(0);
fFeedBackWidget->SetParent((TQtWidget *)fSelectedWindow);
@@ -2246,8 +2246,8 @@ void TGQt::SetMarkerColor( Color_t cindex)
//*-* cindex : color index defined my IXSETCOL
//*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
- if (fQtMarker->GetColor() != cindex)
- fQtMarker->SetColor(fMarkerColor = UpdateColor(cindex));
+ if (fQtMarker->GetColor() != cindex)
+ fQtMarker->SetColor(fMarkerColor = UpdateColor(cindex));
}
//______________________________________________________________________________
diff --git a/graf2d/qt/src/TQtBrush.cxx b/graf2d/qt/src/TQtBrush.cxx
index 318d10e3805..3910508abc6 100644
--- a/graf2d/qt/src/TQtBrush.cxx
+++ b/graf2d/qt/src/TQtBrush.cxx
@@ -144,26 +144,28 @@ TQtBrush::TQtBrush(): QBrush(),fStyle(0),fFasi(0),fAlpha(255)
//______________________________________________________________________________
TQtBrush::TQtBrush(const TAttFill &rootFillAttributes)
{
- // TQtBrush ctor from ROOT TAttFill object
- SetFillAttributes(rootFillAttributes);
+ // TQtBrush ctor from ROOT TAttFill object
+ SetFillAttributes(rootFillAttributes);
}
//______________________________________________________________________________
TQtBrush::~TQtBrush()
{
- // TQtBrush dtor
+ // TQtBrush dtor
}
+
//______________________________________________________________________________
TQtBrush &TQtBrush::operator=(const TAttFill &rootFillAttributes)
{
- SetFillAttributes(rootFillAttributes);
+ SetFillAttributes(rootFillAttributes);
return *this;
}
+
//______________________________________________________________________________
void TQtBrush::SetFillAttributes(const TAttFill &rootFillAttributes)
{
- SetColor(rootFillAttributes.GetFillColor());
- SetStyle(rootFillAttributes.GetFillStyle());
+ SetColor(rootFillAttributes.GetFillColor());
+ SetStyle(rootFillAttributes.GetFillStyle());
}
//______________________________________________________________________________
@@ -179,7 +181,7 @@ void TQtBrush::SetColor(const QColor &qtcolor)
{
// remember the user's alpha value and set the brush color
fAlpha = qtcolor.alpha();
- fBackground = qtcolor;
+ fBackground = qtcolor;
SetColorOwn();
}
@@ -189,13 +191,13 @@ void TQtBrush::SetColorOwn()
// Set the brush color and adjust its alpha value from fStyle
// Take in account the new transperency if needed
- static const int opaqAlpha = QColor(0,0,0).alpha(); // Qt alpha range is [0:255]
- static const float opaqFactor = opaqAlpha/100.; // ROOT alpha range is [0:100]
- if (fAlpha >=0 ) {
- int alpha = ( fStyle == 4) ? int(opaqFactor*fFasi) : fAlpha;
- if (fBackground.alpha() != alpha) fBackground.setAlpha(alpha);
- setColor(fBackground);
- }
+ static const int opaqAlpha = QColor(0,0,0).alpha(); // Qt alpha range is [0:255]
+ static const float opaqFactor = opaqAlpha/100.; // ROOT alpha range is [0:100]
+ if (fAlpha >=0 ) {
+ int alpha = ( fStyle == 4) ? int(opaqFactor*fFasi) : fAlpha;
+ if (fBackground.alpha() != alpha) fBackground.setAlpha(alpha);
+ setColor(fBackground);
+ }
}
//______________________________________________________________________________
@@ -213,7 +215,7 @@ void TQtBrush::SetStyle(int sty, int fasi)
case 0:
setStyle(Qt::NoBrush); // hollow
fBackground = Qt::transparent;
- fAlpha = 0;
+ fAlpha = 0;
break;
case 1: // solid
setStyle(Qt::SolidPattern);
@@ -247,7 +249,7 @@ void TQtBrush::SetStyle(int sty, int fasi)
break;
case 4: // transparent
if (!fasi) setStyle(Qt::NoBrush); // the window is transparent
- else setStyle(Qt::SolidPattern);
+ else setStyle(Qt::SolidPattern);
break;
default: // solid - default
setStyle(Qt::SolidPattern);
diff --git a/graf2d/qt/src/TQtClientFilter.cxx b/graf2d/qt/src/TQtClientFilter.cxx
index 61ea70ef887..953492ec81f 100644
--- a/graf2d/qt/src/TQtClientFilter.cxx
+++ b/graf2d/qt/src/TQtClientFilter.cxx
@@ -205,7 +205,7 @@ static inline UInt_t MapKeySym(const QKeyEvent &qev)
{
UInt_t text = 0;;
Qt::Key key = Qt::Key(qev.key());
- for (int i = 0; gKeyQMap[i].fKeySym; i++) { // any other keys
+ for (int i = 0; gKeyQMap[i].fKeySym; i++) { // any other keys
if (key == gKeyQMap[i].fQKeySym) {
return UInt_t(gKeyQMap[i].fKeySym);
}
@@ -251,18 +251,18 @@ static inline void MapEvent(const QMoveEvent &qev, Event_t &ev)
//______________________________________________________________________________________
static inline void MapEvent(const QResizeEvent &qev, Event_t &ev)
{
- ev.fWidth = qev.size().width(); // width and
- ev.fHeight = qev.size().height(); // height of exposed area
+ ev.fWidth = qev.size().width(); // width and
+ ev.fHeight = qev.size().height(); // height of exposed area
}
//______________________________________________________________________________________
static inline void MapEvent(const QPaintEvent &qev, Event_t &ev)
{
ev.fX = qev.rect().x();
ev.fY = qev.rect().y();
- ev.fWidth = qev.rect().width(); // width and
+ ev.fWidth = qev.rect().width(); // width and
ev.fHeight = qev.rect().height(); // height of exposed area
ev.fCount = 0;
- // ev.fCount = xev.expose.count; // number of expose events still to come
+ // ev.fCount = xev.expose.count; // number of expose events still to come
}
//______________________________________________________________________________________
static inline void MapEvent(const TQUserEvent &qev, Event_t &ev)
@@ -357,8 +357,8 @@ void TQtClientFilter::AddKeyEvent( const QKeyEvent &keyEvent, TQtClientWidget *f
evt.fTime = QTime::currentTime().msec ();
evt.fX = frame->x();
evt.fY = frame->y();
- evt.fWidth = frame->width(); // width and
- evt.fHeight = frame->height(); // height excluding the frame
+ evt.fWidth = frame->width(); // width and
+ evt.fHeight = frame->height(); // height excluding the frame
QPoint pointRoot = frame->mapToGlobal(QPoint(0,0));
evt.fXRoot = pointRoot.x();
@@ -410,8 +410,8 @@ bool TQtClientFilter::eventFilter( QObject *qWidget, QEvent *e ){
evt.fTime = QTime::currentTime().msec ();
evt.fX = frame->x();
evt.fY = frame->y();
- evt.fWidth = frame->width(); // width and
- evt.fHeight = frame->height(); // height excluding the frame
+ evt.fWidth = frame->width(); // width and
+ evt.fHeight = frame->height(); // height excluding the frame
QPoint pointRoot = frame->mapToGlobal(QPoint(0,0));
evt.fXRoot = pointRoot.x();
diff --git a/graf2d/qt/src/TQtMarker.cxx b/graf2d/qt/src/TQtMarker.cxx
index c40f0e410b5..5440a321540 100644
--- a/graf2d/qt/src/TQtMarker.cxx
+++ b/graf2d/qt/src/TQtMarker.cxx
@@ -23,38 +23,39 @@ ClassImp(TQtMarker)
////////////////////////////////////////////////////////////////////////
//
-// TQtMarker - class-utility to convert the ROOT TMarker object shape
+// TQtMarker - class-utility to convert the ROOT TMarker object shape
// into the Qt QPointArray.
//
////////////////////////////////////////////////////////////////////////
//______________________________________________________________________________
TQtMarker::TQtMarker(int n, TPoint *xy, int type) : fNumNode(n),
- fChain(0), fCindex(0), fMarkerType(0),fLineWidth(0),fLineOption(false)
+fChain(0), fCindex(0), fMarkerType(0),fLineWidth(0),fLineOption(false)
{
- SetPenAttributes(type);
- if (GetType() != kDot) {
- fChain.resize(n);
- TPoint *rootPoint = xy;
- for (int i=0;i<n;i++,rootPoint++)
- fChain.setPoint(i,rootPoint->fX,rootPoint->fY);
- }
+ SetPenAttributes(type);
+ if (GetType() != kDot) {
+ fChain.resize(n);
+ TPoint *rootPoint = xy;
+ for (int i=0;i<n;i++,rootPoint++)
+ fChain.setPoint(i,rootPoint->fX,rootPoint->fY);
+ }
}
//______________________________________________________________________________
TQtMarker::~TQtMarker(){}
+
//______________________________________________________________________________
TQtMarker &TQtMarker::operator=(const TAttMarker&markerAttributes)
{
- // Assign the TQtMarker from ROOT TAttMarker
- SetMarkerAttributes(markerAttributes);
- return *this;
+ // Assign the TQtMarker from ROOT TAttMarker
+ SetMarkerAttributes(markerAttributes);
+ return *this;
}
//______________________________________________________________________________
TQtMarker::TQtMarker(const TAttMarker &markerAttributes)
{
- // Create the TQtMarker from ROOT TAttMarker
- SetMarkerAttributes(markerAttributes);
+ // Create the TQtMarker from ROOT TAttMarker
+ SetMarkerAttributes(markerAttributes);
}
//______________________________________________________________________________
@@ -75,7 +76,7 @@ void TQtMarker::SetPenAttributes(int type)
fMarkerType = type%packFactor;
fLineWidth = (type - fMarkerType)/packFactor;
if (type >= lineFactor) {
- // Set line style
+ // Set line style
fLineWidth -= lineFactor/packFactor;
fLineOption = true;
}
@@ -93,27 +94,27 @@ int TQtMarker::GetWidth() const { return fLineWidth;}
//______________________________________________________________________________
void TQtMarker::SetMarker(int n, TPoint *xy, int type)
{
-//*-* Did we have a chain ?
- fNumNode = n;
- SetPenAttributes(type);
- if (GetType() != kDot) {
- fChain.resize(n);
- TPoint *rootPoint = xy;
- for (int i=0;i<n;i++,rootPoint++)
- fChain.setPoint(i,rootPoint->fX,rootPoint->fY);
- }
+ //*-* Did we have a chain ?
+ fNumNode = n;
+ SetPenAttributes(type);
+ if (GetType() != kDot) {
+ fChain.resize(n);
+ TPoint *rootPoint = xy;
+ for (int i=0;i<n;i++,rootPoint++)
+ fChain.setPoint(i,rootPoint->fX,rootPoint->fY);
+ }
}
//______________________________________________________________________________
void TQtMarker::DrawPolyMarker(QPainter &p, int n, TPoint *xy)
{
- // Draw n markers with the current attributes at positions xy.
- // p : the external QPainter
+ // Draw n markers with the current attributes at positions xy.
+ // p : the external QPainter
// n : number of markers to draw
- // xy : x,y coordinates of markers
-
- /* Set marker Color */
- const QColor &mColor = gQt->ColorIndex(fCindex);
+ // xy : x,y coordinates of markers
+
+ /* Set marker Color */
+ const QColor &mColor = gQt->ColorIndex(fCindex);
p.save();
if (this->GetWidth()>0) p.setPen(QPen(mColor,this->GetWidth()));
@@ -124,7 +125,7 @@ void TQtMarker::DrawPolyMarker(QPainter &p, int n, TPoint *xy)
QPolygon qtPoints(n);
TPoint *rootPoint = xy;
for (int i=0;i<n;i++,rootPoint++)
- qtPoints.setPoint(i,rootPoint->fX,rootPoint->fY);
+ qtPoints.setPoint(i,rootPoint->fX,rootPoint->fY);
if (fLineOption) p.drawPolyline(qtPoints);
else p.drawPoints(qtPoints);
}
@@ -132,48 +133,48 @@ void TQtMarker::DrawPolyMarker(QPainter &p, int n, TPoint *xy)
int r = this->GetNumber()/2;
switch (this -> GetType())
{
- case 1:
- case 3:
- default:
- p.setBrush(mColor);
- break;
- case 0:
- case 2:
- p.setBrush(Qt::NoBrush);
- break;
- case 4:
- break;
- }
-
- for( int m = 0; m < n; m++ )
- {
- int i;
- switch( this->GetType() )
- {
- case 0: /* hollow circle */
- case 1: /* filled circle */
- p.drawEllipse(xy[m].fX-r, xy[m].fY-r, 2*r, 2*r);
- break;
- case 2: /* hollow polygon */
- case 3: /* filled polygon */
- {
- QPolygon mxy = this->GetNodes();
- mxy.translate(xy[m].fX,xy[m].fY);
- p.drawPolygon(mxy);
- break;
- }
- case 4: /* segmented line */
- {
- QPolygon mxy = this->GetNodes();
- mxy.translate(xy[m].fX,xy[m].fY);
- QVector<QLine> lines(this->GetNumber());
- for( i = 0; i < this->GetNumber(); i+=2 )
- lines.push_back(QLine(mxy.point(i),mxy.point(i+1)));
- p.drawLines(lines);
- break;
- }
- }
- }
- }
- p.restore();
+ case 1:
+ case 3:
+ default:
+ p.setBrush(mColor);
+ break;
+ case 0:
+ case 2:
+ p.setBrush(Qt::NoBrush);
+ break;
+ case 4:
+ break;
+ }
+
+ for( int m = 0; m < n; m++ )
+ {
+ int i;
+ switch( this->GetType() )
+ {
+ case 0: /* hollow circle */
+ case 1: /* filled circle */
+ p.drawEllipse(xy[m].fX-r, xy[m].fY-r, 2*r, 2*r);
+ break;
+ case 2: /* hollow polygon */
+ case 3: /* filled polygon */
+ {
+ QPolygon mxy = this->GetNodes();
+ mxy.translate(xy[m].fX,xy[m].fY);
+ p.drawPolygon(mxy);
+ break;
+ }
+ case 4: /* segmented line */
+ {
+ QPolygon mxy = this->GetNodes();
+ mxy.translate(xy[m].fX,xy[m].fY);
+ QVector<QLine> lines(this->GetNumber());
+ for( i = 0; i < this->GetNumber(); i+=2 )
+ lines.push_back(QLine(mxy.point(i),mxy.point(i+1)));
+ p.drawLines(lines);
+ break;
+ }
+ }
+ }
+ }
+ p.restore();
}
diff --git a/graf2d/qt/src/TQtPen.cxx b/graf2d/qt/src/TQtPen.cxx
index aa6b1fdad73..fd65a5c203b 100755
--- a/graf2d/qt/src/TQtPen.cxx
+++ b/graf2d/qt/src/TQtPen.cxx
@@ -30,30 +30,30 @@
//______________________________________________________________________________
TQtPen::TQtPen(): QPen(),TAttLine()
{
- // TQtPen default ctor
+ // TQtPen default ctor
}
//______________________________________________________________________________
TQtPen::TQtPen(const TAttLine &line) : QPen()
{
- // Copy ctor to copy ROOT TAttLine object
+ // Copy ctor to copy ROOT TAttLine object
SetLineAttributes(line);
}
//______________________________________________________________________________
TQtPen &TQtPen::operator=(const TAttLine &line)
{
- // Assigns the Qt pen attributes from ROOT TAttLine object
+ // Assigns the Qt pen attributes from ROOT TAttLine object
SetLineAttributes(line);
- return *this;
+ return *this;
}
//______________________________________________________________________________
void TQtPen::SetLineAttributes(const TAttLine &lineAttributes)
{
- // Maps the ROOT TAttLine attributes to QPen attributes
- SetLineColor(lineAttributes.GetLineColor());
- SetLineStyle(lineAttributes.GetLineStyle());
- SetLineWidth(lineAttributes.GetLineWidth());
+ // Maps the ROOT TAttLine attributes to QPen attributes
+ SetLineColor(lineAttributes.GetLineColor());
+ SetLineStyle(lineAttributes.GetLineStyle());
+ SetLineWidth(lineAttributes.GetLineWidth());
}
//______________________________________________________________________________
diff --git a/graf2d/qt/src/TQtSymbolCodec.cxx b/graf2d/qt/src/TQtSymbolCodec.cxx
index 7d101534a51..2c56a411bbc 100644
--- a/graf2d/qt/src/TQtSymbolCodec.cxx
+++ b/graf2d/qt/src/TQtSymbolCodec.cxx
@@ -192,7 +192,7 @@ int QSymbolCodec::heuristicContentMatch(const char* chars, int len) const
int score = 0;
for (int i=0; i<len; i++) {
if( c[i] > 64 && c[i] < 255 )
- // if ( symbol_to_unicode[c[i] - 0x80] != 0xFFFD)
+ // if ( symbol_to_unicode[c[i] - 0x80] != 0xFFFD)
score++;
else
return -1;
diff --git a/graf2d/qt/src/TQtWidget.cxx b/graf2d/qt/src/TQtWidget.cxx
index 4c6634ac1e6..c5822d4ddf0 100644
--- a/graf2d/qt/src/TQtWidget.cxx
+++ b/graf2d/qt/src/TQtWidget.cxx
@@ -557,17 +557,17 @@ void TQtWidget::mousePressEvent (QMouseEvent *e)
break;
}
case Qt::MidButton: rootButton = kButton2Down; break;
- default: break;
+ default: break;
};
if (rootButton != kNoEvent) {
e->accept();
- if (rootButton == kButton3Down) {
- bool lastvalue = c->TestBit(kNoContextMenu);
- c->SetBit(kNoContextMenu);
- c->HandleInput(rootButton, e->x(), e->y());
- c->SetBit(kNoContextMenu, lastvalue);
+ if (rootButton == kButton3Down) {
+ bool lastvalue = c->TestBit(kNoContextMenu);
+ c->SetBit(kNoContextMenu);
+ c->HandleInput(rootButton, e->x(), e->y());
+ c->SetBit(kNoContextMenu, lastvalue);
} else {
- c->HandleInput(rootButton, e->x(), e->y());
+ c->HandleInput(rootButton, e->x(), e->y());
}
EmitSignal(kMousePressEvent);
return;
diff --git a/graf2d/x11/inc/X11/extensions/render.h b/graf2d/x11/inc/X11/extensions/render.h
index 7e35bd66378..20d6150f4cb 100644
--- a/graf2d/x11/inc/X11/extensions/render.h
+++ b/graf2d/x11/inc/X11/extensions/render.h
@@ -28,180 +28,180 @@
#include <X11/Xdefs.h>
-typedef XID Glyph;
-typedef XID GlyphSet;
-typedef XID Picture;
-typedef XID PictFormat;
-
-#define RENDER_NAME "RENDER"
-#define RENDER_MAJOR 0
-#define RENDER_MINOR 11
-
-#define X_RenderQueryVersion 0
-#define X_RenderQueryPictFormats 1
-#define X_RenderQueryPictIndexValues 2 /* 0.7 */
-#define X_RenderQueryDithers 3
-#define X_RenderCreatePicture 4
-#define X_RenderChangePicture 5
+typedef XID Glyph;
+typedef XID GlyphSet;
+typedef XID Picture;
+typedef XID PictFormat;
+
+#define RENDER_NAME "RENDER"
+#define RENDER_MAJOR 0
+#define RENDER_MINOR 11
+
+#define X_RenderQueryVersion 0
+#define X_RenderQueryPictFormats 1
+#define X_RenderQueryPictIndexValues 2 /* 0.7 */
+#define X_RenderQueryDithers 3
+#define X_RenderCreatePicture 4
+#define X_RenderChangePicture 5
#define X_RenderSetPictureClipRectangles 6
-#define X_RenderFreePicture 7
-#define X_RenderComposite 8
-#define X_RenderScale 9
-#define X_RenderTrapezoids 10
-#define X_RenderTriangles 11
-#define X_RenderTriStrip 12
-#define X_RenderTriFan 13
-#define X_RenderColorTrapezoids 14
-#define X_RenderColorTriangles 15
-/* #define X_RenderTransform 16 */
-#define X_RenderCreateGlyphSet 17
-#define X_RenderReferenceGlyphSet 18
-#define X_RenderFreeGlyphSet 19
-#define X_RenderAddGlyphs 20
-#define X_RenderAddGlyphsFromPicture 21
-#define X_RenderFreeGlyphs 22
-#define X_RenderCompositeGlyphs8 23
-#define X_RenderCompositeGlyphs16 24
-#define X_RenderCompositeGlyphs32 25
-#define X_RenderFillRectangles 26
+#define X_RenderFreePicture 7
+#define X_RenderComposite 8
+#define X_RenderScale 9
+#define X_RenderTrapezoids 10
+#define X_RenderTriangles 11
+#define X_RenderTriStrip 12
+#define X_RenderTriFan 13
+#define X_RenderColorTrapezoids 14
+#define X_RenderColorTriangles 15
+/* #define X_RenderTransform 16 */
+#define X_RenderCreateGlyphSet 17
+#define X_RenderReferenceGlyphSet 18
+#define X_RenderFreeGlyphSet 19
+#define X_RenderAddGlyphs 20
+#define X_RenderAddGlyphsFromPicture 21
+#define X_RenderFreeGlyphs 22
+#define X_RenderCompositeGlyphs8 23
+#define X_RenderCompositeGlyphs16 24
+#define X_RenderCompositeGlyphs32 25
+#define X_RenderFillRectangles 26
/* 0.5 */
-#define X_RenderCreateCursor 27
+#define X_RenderCreateCursor 27
/* 0.6 */
-#define X_RenderSetPictureTransform 28
-#define X_RenderQueryFilters 29
-#define X_RenderSetPictureFilter 30
+#define X_RenderSetPictureTransform 28
+#define X_RenderQueryFilters 29
+#define X_RenderSetPictureFilter 30
/* 0.8 */
-#define X_RenderCreateAnimCursor 31
+#define X_RenderCreateAnimCursor 31
/* 0.9 */
-#define X_RenderAddTraps 32
+#define X_RenderAddTraps 32
/* 0.10 */
#define X_RenderCreateSolidFill 33
#define X_RenderCreateLinearGradient 34
#define X_RenderCreateRadialGradient 35
#define X_RenderCreateConicalGradient 36
-#define RenderNumberRequests (X_RenderCreateConicalGradient+1)
-
-#define BadPictFormat 0
-#define BadPicture 1
-#define BadPictOp 2
-#define BadGlyphSet 3
-#define BadGlyph 4
-#define RenderNumberErrors (BadGlyph+1)
-
-#define PictTypeIndexed 0
-#define PictTypeDirect 1
-
-#define PictOpMinimum 0
-#define PictOpClear 0
-#define PictOpSrc 1
-#define PictOpDst 2
-#define PictOpOver 3
-#define PictOpOverReverse 4
-#define PictOpIn 5
-#define PictOpInReverse 6
-#define PictOpOut 7
-#define PictOpOutReverse 8
-#define PictOpAtop 9
-#define PictOpAtopReverse 10
-#define PictOpXor 11
-#define PictOpAdd 12
-#define PictOpSaturate 13
-#define PictOpMaximum 13
+#define RenderNumberRequests (X_RenderCreateConicalGradient+1)
+
+#define BadPictFormat 0
+#define BadPicture 1
+#define BadPictOp 2
+#define BadGlyphSet 3
+#define BadGlyph 4
+#define RenderNumberErrors (BadGlyph+1)
+
+#define PictTypeIndexed 0
+#define PictTypeDirect 1
+
+#define PictOpMinimum 0
+#define PictOpClear 0
+#define PictOpSrc 1
+#define PictOpDst 2
+#define PictOpOver 3
+#define PictOpOverReverse 4
+#define PictOpIn 5
+#define PictOpInReverse 6
+#define PictOpOut 7
+#define PictOpOutReverse 8
+#define PictOpAtop 9
+#define PictOpAtopReverse 10
+#define PictOpXor 11
+#define PictOpAdd 12
+#define PictOpSaturate 13
+#define PictOpMaximum 13
/*
* Operators only available in version 0.2
*/
-#define PictOpDisjointMinimum 0x10
-#define PictOpDisjointClear 0x10
-#define PictOpDisjointSrc 0x11
-#define PictOpDisjointDst 0x12
-#define PictOpDisjointOver 0x13
-#define PictOpDisjointOverReverse 0x14
-#define PictOpDisjointIn 0x15
-#define PictOpDisjointInReverse 0x16
-#define PictOpDisjointOut 0x17
-#define PictOpDisjointOutReverse 0x18
-#define PictOpDisjointAtop 0x19
-#define PictOpDisjointAtopReverse 0x1a
-#define PictOpDisjointXor 0x1b
-#define PictOpDisjointMaximum 0x1b
-
-#define PictOpConjointMinimum 0x20
-#define PictOpConjointClear 0x20
-#define PictOpConjointSrc 0x21
-#define PictOpConjointDst 0x22
-#define PictOpConjointOver 0x23
-#define PictOpConjointOverReverse 0x24
-#define PictOpConjointIn 0x25
-#define PictOpConjointInReverse 0x26
-#define PictOpConjointOut 0x27
-#define PictOpConjointOutReverse 0x28
-#define PictOpConjointAtop 0x29
-#define PictOpConjointAtopReverse 0x2a
-#define PictOpConjointXor 0x2b
-#define PictOpConjointMaximum 0x2b
+#define PictOpDisjointMinimum 0x10
+#define PictOpDisjointClear 0x10
+#define PictOpDisjointSrc 0x11
+#define PictOpDisjointDst 0x12
+#define PictOpDisjointOver 0x13
+#define PictOpDisjointOverReverse 0x14
+#define PictOpDisjointIn 0x15
+#define PictOpDisjointInReverse 0x16
+#define PictOpDisjointOut 0x17
+#define PictOpDisjointOutReverse 0x18
+#define PictOpDisjointAtop 0x19
+#define PictOpDisjointAtopReverse 0x1a
+#define PictOpDisjointXor 0x1b
+#define PictOpDisjointMaximum 0x1b
+
+#define PictOpConjointMinimum 0x20
+#define PictOpConjointClear 0x20
+#define PictOpConjointSrc 0x21
+#define PictOpConjointDst 0x22
+#define PictOpConjointOver 0x23
+#define PictOpConjointOverReverse 0x24
+#define PictOpConjointIn 0x25
+#define PictOpConjointInReverse 0x26
+#define PictOpConjointOut 0x27
+#define PictOpConjointOutReverse 0x28
+#define PictOpConjointAtop 0x29
+#define PictOpConjointAtopReverse 0x2a
+#define PictOpConjointXor 0x2b
+#define PictOpConjointMaximum 0x2b
/*
* Operators only available in version 0.11
*/
-#define PictOpBlendMinimum 0x30
-#define PictOpMultiply 0x30
-#define PictOpScreen 0x31
-#define PictOpOverlay 0x32
-#define PictOpDarken 0x33
-#define PictOpLighten 0x34
-#define PictOpColorDodge 0x35
-#define PictOpColorBurn 0x36
-#define PictOpHardLight 0x37
-#define PictOpSoftLight 0x38
-#define PictOpDifference 0x39
-#define PictOpExclusion 0x3a
-#define PictOpHSLHue 0x3b
-#define PictOpHSLSaturation 0x3c
-#define PictOpHSLColor 0x3d
-#define PictOpHSLLuminosity 0x3e
-#define PictOpBlendMaximum 0x3e
-
-#define PolyEdgeSharp 0
-#define PolyEdgeSmooth 1
-
-#define PolyModePrecise 0
-#define PolyModeImprecise 1
-
-#define CPRepeat (1 << 0)
-#define CPAlphaMap (1 << 1)
-#define CPAlphaXOrigin (1 << 2)
-#define CPAlphaYOrigin (1 << 3)
-#define CPClipXOrigin (1 << 4)
-#define CPClipYOrigin (1 << 5)
-#define CPClipMask (1 << 6)
-#define CPGraphicsExposure (1 << 7)
-#define CPSubwindowMode (1 << 8)
-#define CPPolyEdge (1 << 9)
-#define CPPolyMode (1 << 10)
-#define CPDither (1 << 11)
-#define CPComponentAlpha (1 << 12)
-#define CPLastBit 12
+#define PictOpBlendMinimum 0x30
+#define PictOpMultiply 0x30
+#define PictOpScreen 0x31
+#define PictOpOverlay 0x32
+#define PictOpDarken 0x33
+#define PictOpLighten 0x34
+#define PictOpColorDodge 0x35
+#define PictOpColorBurn 0x36
+#define PictOpHardLight 0x37
+#define PictOpSoftLight 0x38
+#define PictOpDifference 0x39
+#define PictOpExclusion 0x3a
+#define PictOpHSLHue 0x3b
+#define PictOpHSLSaturation 0x3c
+#define PictOpHSLColor 0x3d
+#define PictOpHSLLuminosity 0x3e
+#define PictOpBlendMaximum 0x3e
+
+#define PolyEdgeSharp 0
+#define PolyEdgeSmooth 1
+
+#define PolyModePrecise 0
+#define PolyModeImprecise 1
+
+#define CPRepeat (1 << 0)
+#define CPAlphaMap (1 << 1)
+#define CPAlphaXOrigin (1 << 2)
+#define CPAlphaYOrigin (1 << 3)
+#define CPClipXOrigin (1 << 4)
+#define CPClipYOrigin (1 << 5)
+#define CPClipMask (1 << 6)
+#define CPGraphicsExposure (1 << 7)
+#define CPSubwindowMode (1 << 8)
+#define CPPolyEdge (1 << 9)
+#define CPPolyMode (1 << 10)
+#define CPDither (1 << 11)
+#define CPComponentAlpha (1 << 12)
+#define CPLastBit 12
/* Filters included in 0.6 */
-#define FilterNearest "nearest"
-#define FilterBilinear "bilinear"
+#define FilterNearest "nearest"
+#define FilterBilinear "bilinear"
/* Filters included in 0.10 */
-#define FilterConvolution "convolution"
+#define FilterConvolution "convolution"
-#define FilterFast "fast"
-#define FilterGood "good"
-#define FilterBest "best"
+#define FilterFast "fast"
+#define FilterGood "good"
+#define FilterBest "best"
-#define FilterAliasNone -1
+#define FilterAliasNone -1
/* Subpixel orders included in 0.6 */
-#define SubPixelUnknown 0
-#define SubPixelHorizontalRGB 1
-#define SubPixelHorizontalBGR 2
-#define SubPixelVerticalRGB 3
-#define SubPixelVerticalBGR 4
-#define SubPixelNone 5
+#define SubPixelUnknown 0
+#define SubPixelHorizontalRGB 1
+#define SubPixelHorizontalBGR 2
+#define SubPixelVerticalRGB 3
+#define SubPixelVerticalBGR 4
+#define SubPixelNone 5
/* Extended repeat attributes included in 0.10 */
#define RepeatNone 0
@@ -209,4 +209,4 @@ typedef XID PictFormat;
#define RepeatPad 2
#define RepeatReflect 3
-#endif /* _RENDER_H_ */
+#endif /* _RENDER_H_ */
diff --git a/graf2d/x11/inc/X11/extensions/shape.h b/graf2d/x11/inc/X11/extensions/shape.h
index 95a22869842..a56ade6d1b9 100644
--- a/graf2d/x11/inc/X11/extensions/shape.h
+++ b/graf2d/x11/inc/X11/extensions/shape.h
@@ -38,115 +38,115 @@ in this Software without prior written authorization from The Open Group.
#include <X11/Xutil.h>
typedef struct {
- int type; /* of event */
+ int type; /* of event */
unsigned long serial; /* # of last request processed by server */
- Bool send_event; /* true if this came frome a SendEvent request */
- Display *display; /* Display the event was read from */
- Window window; /* window of event */
- int kind; /* ShapeBounding or ShapeClip */
- int x, y; /* extents of new region */
+ Bool send_event; /* true if this came frome a SendEvent request */
+ Display *display; /* Display the event was read from */
+ Window window; /* window of event */
+ int kind; /* ShapeBounding or ShapeClip */
+ int x, y; /* extents of new region */
unsigned width, height;
- Time time; /* server timestamp when region changed */
- Bool shaped; /* true if the region exists */
+ Time time; /* server timestamp when region changed */
+ Bool shaped; /* true if the region exists */
} XShapeEvent;
_XFUNCPROTOBEGIN
extern Bool XShapeQueryExtension (
- Display* /* display */,
- int* /* event_base */,
- int* /* error_base */
+ Display* /* display */,
+ int* /* event_base */,
+ int* /* error_base */
);
extern Status XShapeQueryVersion (
- Display* /* display */,
- int* /* major_version */,
- int* /* minor_version */
+ Display* /* display */,
+ int* /* major_version */,
+ int* /* minor_version */
);
extern void XShapeCombineRegion (
- Display* /* display */,
- Window /* dest */,
- int /* dest_kind */,
- int /* x_off */,
- int /* y_off */,
- Region /* region */,
- int /* op */
+ Display* /* display */,
+ Window /* dest */,
+ int /* dest_kind */,
+ int /* x_off */,
+ int /* y_off */,
+ Region /* region */,
+ int /* op */
);
extern void XShapeCombineRectangles (
- Display* /* display */,
- Window /* dest */,
- int /* dest_kind */,
- int /* x_off */,
- int /* y_off */,
- XRectangle* /* rectangles */,
- int /* n_rects */,
- int /* op */,
- int /* ordering */
+ Display* /* display */,
+ Window /* dest */,
+ int /* dest_kind */,
+ int /* x_off */,
+ int /* y_off */,
+ XRectangle* /* rectangles */,
+ int /* n_rects */,
+ int /* op */,
+ int /* ordering */
);
extern void XShapeCombineMask (
- Display* /* display */,
- Window /* dest */,
- int /* dest_kind */,
- int /* x_off */,
- int /* y_off */,
- Pixmap /* src */,
- int /* op */
+ Display* /* display */,
+ Window /* dest */,
+ int /* dest_kind */,
+ int /* x_off */,
+ int /* y_off */,
+ Pixmap /* src */,
+ int /* op */
);
extern void XShapeCombineShape (
- Display* /* display */,
- Window /* dest */,
- int /* dest_kind */,
- int /* x_off */,
- int /* y_off */,
- Window /* src */,
- int /* src_kind */,
- int /* op */
+ Display* /* display */,
+ Window /* dest */,
+ int /* dest_kind */,
+ int /* x_off */,
+ int /* y_off */,
+ Window /* src */,
+ int /* src_kind */,
+ int /* op */
);
extern void XShapeOffsetShape (
- Display* /* display */,
- Window /* dest */,
- int /* dest_kind */,
- int /* x_off */,
- int /* y_off */
+ Display* /* display */,
+ Window /* dest */,
+ int /* dest_kind */,
+ int /* x_off */,
+ int /* y_off */
);
extern Status XShapeQueryExtents (
- Display* /* display */,
- Window /* window */,
- Bool* /* bounding_shaped */,
- int* /* x_bounding */,
- int* /* y_bounding */,
- unsigned int* /* w_bounding */,
- unsigned int* /* h_bounding */,
- Bool* /* clip_shaped */,
- int* /* x_clip */,
- int* /* y_clip */,
- unsigned int* /* w_clip */,
- unsigned int* /* h_clip */
+ Display* /* display */,
+ Window /* window */,
+ Bool* /* bounding_shaped */,
+ int* /* x_bounding */,
+ int* /* y_bounding */,
+ unsigned int* /* w_bounding */,
+ unsigned int* /* h_bounding */,
+ Bool* /* clip_shaped */,
+ int* /* x_clip */,
+ int* /* y_clip */,
+ unsigned int* /* w_clip */,
+ unsigned int* /* h_clip */
);
extern void XShapeSelectInput (
- Display* /* display */,
- Window /* window */,
- unsigned long /* mask */
+ Display* /* display */,
+ Window /* window */,
+ unsigned long /* mask */
);
extern unsigned long XShapeInputSelected (
- Display* /* display */,
- Window /* window */
+ Display* /* display */,
+ Window /* window */
);
extern XRectangle *XShapeGetRectangles (
- Display* /* display */,
- Window /* window */,
- int /* kind */,
- int* /* count */,
- int* /* ordering */
+ Display* /* display */,
+ Window /* window */,
+ int /* kind */,
+ int* /* count */,
+ int* /* ordering */
);
_XFUNCPROTOEND
diff --git a/graf2d/x11/inc/X11/extensions/shapeconst.h b/graf2d/x11/inc/X11/extensions/shapeconst.h
index 9088956f1b9..4233777b246 100644
--- a/graf2d/x11/inc/X11/extensions/shapeconst.h
+++ b/graf2d/x11/inc/X11/extensions/shapeconst.h
@@ -34,22 +34,22 @@ in this Software without prior written authorization from The Open Group.
#define SHAPENAME "SHAPE"
-#define SHAPE_MAJOR_VERSION 1 /* current version numbers */
-#define SHAPE_MINOR_VERSION 1
+#define SHAPE_MAJOR_VERSION 1 /* current version numbers */
+#define SHAPE_MINOR_VERSION 1
-#define ShapeSet 0
-#define ShapeUnion 1
-#define ShapeIntersect 2
-#define ShapeSubtract 3
-#define ShapeInvert 4
+#define ShapeSet 0
+#define ShapeUnion 1
+#define ShapeIntersect 2
+#define ShapeSubtract 3
+#define ShapeInvert 4
-#define ShapeBounding 0
-#define ShapeClip 1
-#define ShapeInput 2
+#define ShapeBounding 0
+#define ShapeClip 1
+#define ShapeInput 2
-#define ShapeNotifyMask (1L << 0)
-#define ShapeNotify 0
+#define ShapeNotifyMask (1L << 0)
+#define ShapeNotify 0
-#define ShapeNumberEvents (ShapeNotify + 1)
+#define ShapeNumberEvents (ShapeNotify + 1)
#endif /* _SHAPECONST_H_ */
diff --git a/graf3d/doc/v520/index.html b/graf3d/doc/v520/index.html
index e4d3fb2d546..7749937ac82 100644
--- a/graf3d/doc/v520/index.html
+++ b/graf3d/doc/v520/index.html
@@ -1,5 +1,5 @@
<!-- DOCTYPE HTML SYSTEM><html><head><title>graf3d</title></head><body -->
-
+
<br>
<hr>
<a name="graf3d"></a>
diff --git a/graf3d/doc/v522/index.html b/graf3d/doc/v522/index.html
index f5fe7a30257..5c14c3b3cce 100644
--- a/graf3d/doc/v522/index.html
+++ b/graf3d/doc/v522/index.html
@@ -1,5 +1,5 @@
<!-- DOCTYPE HTML SYSTEM><html><head><title>graf3d</title></head><body -->
-
+
<br>
<hr>
<a name="graf3d"></a>
diff --git a/graf3d/doc/v526/index.html b/graf3d/doc/v526/index.html
index 9ee04ab9031..739579547de 100644
--- a/graf3d/doc/v526/index.html
+++ b/graf3d/doc/v526/index.html
@@ -123,7 +123,7 @@ src="http://mtadel.home.cern.ch/mtadel/root/graf3d_eve_calorimeters_800.png"/>
<div class="image">
<a href="http://mtadel.home.cern.ch/mtadel/root/graf3d_eve_alice_vsd.png">
<img alt="Eve window showing ALICE VSD example with 3D / RPhi and
- RhoZ views of clusters and reconstructed tracks."
+ RhoZ views of clusters and reconstructed tracks."
src="http://mtadel.home.cern.ch/mtadel/root/graf3d_eve_alice_vsd_800.png"/>
</a>
<div>Screenshot of <tt>alice_vsd.C</tt> tutorial also showing the
diff --git a/graf3d/eve/doc/index.txt b/graf3d/eve/doc/index.txt
index 6924fd42688..13f80098d95 100644
--- a/graf3d/eve/doc/index.txt
+++ b/graf3d/eve/doc/index.txt
@@ -37,47 +37,47 @@ BEGIN_HTML
<ul>
<li> Base-classes for representation of visual objects that can
- be presented in list-tree views, object-editors and rendered
- via OpenGL (<tt>TEveElement</tt> and sub-classes).
+ be presented in list-tree views, object-editors and rendered
+ via OpenGL (<tt>TEveElement</tt> and sub-classes).
<li> Application manager class <tt>TEveManager</tt> for top-level
- management of elements, GUI components, geometries and events;
+ management of elements, GUI components, geometries and events;
<li> Classes for presentation of full TGeo geometries
- (<tt>TEveGeoNode</tt> and <tt>TEveGeoTopNode</tt>) as well as of
- simplifed geometries via extraction of shape-data
- (<tt>TEveGeoShape</tt>).
+ (<tt>TEveGeoNode</tt> and <tt>TEveGeoTopNode</tt>) as well as of
+ simplifed geometries via extraction of shape-data
+ (<tt>TEveGeoShape</tt>).
+
+ <p><img alt="CMS geometry." src="gif/eve-cmsgeo.png">
- <p><img alt="CMS geometry." src="gif/eve-cmsgeo.png">
-
<li> Classes for presentation of trajectories or tracks
- (<tt>TEveTrack</tt>, <tt>TEveTrackPropagator</tt>) and hits or
- clusters (<tt>TEvePointSet</tt>, <tt>TEvePointSetArray</tt>).
+ (<tt>TEveTrack</tt>, <tt>TEveTrackPropagator</tt>) and hits or
+ clusters (<tt>TEvePointSet</tt>, <tt>TEvePointSetArray</tt>).
- <p><img alt="A simulated ALICE pp@14TeV event in 3D." src="gif/eve-alice3d.png">
+ <p><img alt="A simulated ALICE pp@14TeV event in 3D." src="gif/eve-alice3d.png">
<li> Base-classes for presentation of raw-data or digits
- (<tt>TEveDigitSet</tt>, <tt>TEveQuadSet</tt> and
- <tt>TEveBoxSet</tt>). A collection of objects can be assigned
- common signal-to-color mapping (<tt>TEveRGBAPelette</tt>) and
- surrounding frame (<tt>TEveFrameBox</tt>).
+ (<tt>TEveDigitSet</tt>, <tt>TEveQuadSet</tt> and
+ <tt>TEveBoxSet</tt>). A collection of objects can be assigned
+ common signal-to-color mapping (<tt>TEveRGBAPelette</tt>) and
+ surrounding frame (<tt>TEveFrameBox</tt>).
- <p><img alt="Hexagonal and rectangular digits." src="gif/eve-quadset.png">
+ <p><img alt="Hexagonal and rectangular digits." src="gif/eve-quadset.png">
<li> Base-classes for 2D projections with dynamically controllable
- fish-eye magnification of the vertex region
- (<tt>TEveProjectionManager</tt> and
- <tt>TEveProjection</tt>). Tracks, points and geometries can be
- projected automatically. R-phi and Rho-z projections are
- currently supported.
+ fish-eye magnification of the vertex region
+ (<tt>TEveProjectionManager</tt> and
+ <tt>TEveProjection</tt>). Tracks, points and geometries can be
+ projected automatically. R-phi and Rho-z projections are
+ currently supported.
- <p><img alt="A r-phi projection with fish-eye transformation
- of a simulated ALICE pp@14TeV event." src="gif/eve-aliceproj.png">
+ <p><img alt="A r-phi projection with fish-eye transformation
+ of a simulated ALICE pp@14TeV event." src="gif/eve-aliceproj.png">
<li> <tt>TriangleSet</tt> class for presentation of generic
- triangle meshes.
+ triangle meshes.
- <p><img alt="3DS shuttle object." src="gif/eve-3ds.png">
+ <p><img alt="3DS shuttle object." src="gif/eve-3ds.png">
</ul>
END_HTML
diff --git a/graf3d/eve/inc/TEveParamList.h b/graf3d/eve/inc/TEveParamList.h
index 18643b9dbdc..a6cf63e56fe 100644
--- a/graf3d/eve/inc/TEveParamList.h
+++ b/graf3d/eve/inc/TEveParamList.h
@@ -36,7 +36,7 @@ public:
FloatConfig_t(TString name, Double_t value, Double_t min, Double_t max, Bool_t selector = kFALSE):
fValue(value), fMin(min), fMax(max), fName(name), fSelector(selector) {}
- FloatConfig_t(): fValue(0), fMin(0), fMax(0), fName(""), fSelector(kFALSE) {}
+ FloatConfig_t(): fValue(0), fMin(0), fMax(0), fName(""), fSelector(kFALSE) {}
};
typedef std::vector<FloatConfig_t> FloatConfigVec_t;
typedef FloatConfigVec_t::iterator FloatConfigVec_i;
diff --git a/graf3d/eve/inc/TEveProjections.h b/graf3d/eve/inc/TEveProjections.h
index e573c0107b7..21da2176949 100644
--- a/graf3d/eve/inc/TEveProjections.h
+++ b/graf3d/eve/inc/TEveProjections.h
@@ -219,7 +219,7 @@ public:
ClassDef(TEve3DProjection, 0); // 3D scaling "projection"
};
-// AMT: temporary workaround till root pactches are integrated in CMSSW
-#define TEVEPROJECTIONS_DISPLACE_ORIGIN_MODE
-
+// AMT: temporary workaround till root pactches are integrated in CMSSW
+#define TEVEPROJECTIONS_DISPLACE_ORIGIN_MODE
+
#endif
diff --git a/graf3d/eve/inc/TEveTrack.h b/graf3d/eve/inc/TEveTrack.h
index 90c77571910..272a930c264 100644
--- a/graf3d/eve/inc/TEveTrack.h
+++ b/graf3d/eve/inc/TEveTrack.h
@@ -135,8 +135,8 @@ public:
/******************************************************************************/
class TEveTrackList : public TEveElementList,
- public TAttMarker,
- public TAttLine
+ public TAttMarker,
+ public TAttLine
{
friend class TEveTrackListEditor;
diff --git a/graf3d/eve/src/TEveProjectionManager.cxx b/graf3d/eve/src/TEveProjectionManager.cxx
index 7faef4aba51..c237b28d6cf 100644
--- a/graf3d/eve/src/TEveProjectionManager.cxx
+++ b/graf3d/eve/src/TEveProjectionManager.cxx
@@ -120,7 +120,7 @@ void TEveProjectionManager::SetProjection(TEveProjection::EPType_e type)
fProjections[type] = new TEveRhoZProjection();
break;
}
- case TEveProjection::kPT_3D:
+ case TEveProjection::kPT_3D:
{
fProjections[type] = new TEve3DProjection();
break;
diff --git a/graf3d/eve/src/TEveTrackProjectedGL.cxx b/graf3d/eve/src/TEveTrackProjectedGL.cxx
index 6b62cb63815..c5b6a752e81 100644
--- a/graf3d/eve/src/TEveTrackProjectedGL.cxx
+++ b/graf3d/eve/src/TEveTrackProjectedGL.cxx
@@ -81,7 +81,7 @@ void TEveTrackProjectedGL::DirectDraw(TGLRnrCtx& rnrCtx) const
if (fM->fRnrPoints)
{
TGLUtil::RenderPolyMarkers(*fM, 0,
- fM->GetP(), fM->Size(),
+ fM->GetP(), fM->Size(),
rnrCtx.GetPickRadius(),
rnrCtx.Selection());
}
@@ -105,7 +105,7 @@ void TEveTrackProjectedGL::DirectDraw(TGLRnrCtx& rnrCtx) const
}
}
TGLUtil::RenderPolyMarkers(fM->fPropagator->RefPTBAtt(), 0,
- &pnts[0], nbptd,
+ &pnts[0], nbptd,
rnrCtx.GetPickRadius(),
rnrCtx.Selection());
}
diff --git a/graf3d/eve/src/TEveTrackPropagator.cxx b/graf3d/eve/src/TEveTrackPropagator.cxx
index 3b79b31ea73..43b83bb9fc0 100644
--- a/graf3d/eve/src/TEveTrackPropagator.cxx
+++ b/graf3d/eve/src/TEveTrackPropagator.cxx
@@ -474,8 +474,8 @@ void TEveTrackPropagator::Update(const TEveVector4D& v, const TEveVectorD& p,
using namespace TMath;
Float_t a = fgkB2C * fMagFieldObj->GetMaxFieldMagD() * Abs(fH.fCharge);
- if (a > kAMin)
- {
+ if (a > kAMin)
+ {
fH.fR = p.Mag() / a;
// get phi step, compare fDelta with MaxAng
@@ -494,11 +494,11 @@ void TEveTrackPropagator::Update(const TEveVector4D& v, const TEveVectorD& p,
fH.fPhiStep *= fH.fMaxStep / fH.fRKStep;
fH.fRKStep = fH.fMaxStep;
}
- }
- else
- {
+ }
+ else
+ {
fH.fRKStep = fH.fMaxStep;
- }
+ }
}
}
}
@@ -1240,27 +1240,27 @@ void TEveTrackPropagator::StepRungeKutta(Double_t step,
{
// Wrapper to step with method RungeKutta.
- /// ******************************************************************
- /// * *
- /// * Runge-Kutta method for tracking a particle through a magnetic *
- /// * field. Uses Nystroem algorithm (See Handbook Nat. Bur. of *
- /// * Standards, procedure 25.5.20) *
- /// * *
- /// * Input parameters *
- /// * CHARGE Particle charge *
- /// * STEP Step size *
- /// * VECT Initial co-ords,direction cosines,momentum *
- /// * Output parameters *
- /// * VOUT Output co-ords,direction cosines,momentum *
- /// * User routine called *
- /// * CALL GUFLD(X,F) *
- /// * *
- /// * ==>Called by : <USER>, GUSWIM *
- /// * Authors R.Brun, M.Hansroul ********* *
- /// * V.Perevoztchikov (CUT STEP implementation) *
- /// * *
- /// * *
- /// ******************************************************************
+ /// ******************************************************************
+ /// * *
+ /// * Runge-Kutta method for tracking a particle through a magnetic *
+ /// * field. Uses Nystroem algorithm (See Handbook Nat. Bur. of *
+ /// * Standards, procedure 25.5.20) *
+ /// * *
+ /// * Input parameters *
+ /// * CHARGE Particle charge *
+ /// * STEP Step size *
+ /// * VECT Initial co-ords,direction cosines,momentum *
+ /// * Output parameters *
+ /// * VOUT Output co-ords,direction cosines,momentum *
+ /// * User routine called *
+ /// * CALL GUFLD(X,F) *
+ /// * *
+ /// * ==>Called by : <USER>, GUSWIM *
+ /// * Authors R.Brun, M.Hansroul ********* *
+ /// * V.Perevoztchikov (CUT STEP implementation) *
+ /// * *
+ /// * *
+ /// ******************************************************************
Double_t h2, h4, f[4];
Double_t /* xyzt[3], */ a, b, c, ph,ph2;
diff --git a/graf3d/eve/src/TEveUtil.cxx b/graf3d/eve/src/TEveUtil.cxx
index 73b63a518c1..04aadd07abe 100644
--- a/graf3d/eve/src/TEveUtil.cxx
+++ b/graf3d/eve/src/TEveUtil.cxx
@@ -243,7 +243,7 @@ void TEveUtil::ColorFromIdx(Color_t ci, UChar_t col[4], Char_t transparency)
//______________________________________________________________________________
void TEveUtil::ColorFromIdx(Float_t f1, Color_t c1, Float_t f2, Color_t c2,
- UChar_t col[4], Bool_t alpha)
+ UChar_t col[4], Bool_t alpha)
{
// Fill col with weighted RGBA values corresponding to
// color-indices c1 and c2. If alpha is true, set alpha component
diff --git a/graf3d/ftgl/inc/FTFont.h b/graf3d/ftgl/inc/FTFont.h
index 1042385187e..38436528412 100755
--- a/graf3d/ftgl/inc/FTFont.h
+++ b/graf3d/ftgl/inc/FTFont.h
@@ -195,12 +195,12 @@ class FTGL_EXPORT FTFont
*/
float Advance( const char* string);
- /**
+ /**
* Prepare for rendering
*/
virtual void PreRender() { preRenderCalled = true; }
- /**
+ /**
* Cleanup after rendering
*/
virtual void PostRender() { preRenderCalled = false; }
@@ -216,8 +216,8 @@ class FTGL_EXPORT FTFont
* Render a string of characters
*
* @param string 'C' style string to be output.
- * @param w_max maximum width of text
- * @param w_fade width at which text starts to fade
+ * @param w_max maximum width of text
+ * @param w_fade width at which text starts to fade
*/
virtual void Render( const char* string, float w_max, float w_fade );
diff --git a/graf3d/ftgl/inc/FTGLBitmapFont.h b/graf3d/ftgl/inc/FTGLBitmapFont.h
index 4e71b90af9b..56e678501b7 100755
--- a/graf3d/ftgl/inc/FTGLBitmapFont.h
+++ b/graf3d/ftgl/inc/FTGLBitmapFont.h
@@ -36,12 +36,12 @@ class FTGL_EXPORT FTGLBitmapFont : public FTFont
*/
~FTGLBitmapFont();
- /**
+ /**
* Prepare for rendering
*/
virtual void PreRender();
- /**
+ /**
* Cleanup after rendering
*/
virtual void PostRender();
diff --git a/graf3d/ftgl/inc/FTGLExtrdFont.h b/graf3d/ftgl/inc/FTGLExtrdFont.h
index d2344619207..b4962b89024 100644
--- a/graf3d/ftgl/inc/FTGLExtrdFont.h
+++ b/graf3d/ftgl/inc/FTGLExtrdFont.h
@@ -10,8 +10,8 @@ class FTGlyph;
* FTGLExtrdFont is a specialisation of the FTFont class for handling
* extruded Polygon fonts
*
- * @see FTFont
- * @see FTGLPolygonFont
+ * @see FTFont
+ * @see FTGLPolygonFont
*/
class FTGL_EXPORT FTGLExtrdFont : public FTFont
{
@@ -35,23 +35,23 @@ class FTGL_EXPORT FTGLExtrdFont : public FTFont
* Destructor
*/
~FTGLExtrdFont();
-
+
/**
* Set the extrusion distance for the font.
*
* @param d The extrusion distance.
*/
void Depth( float d) { depth = d;}
-
+
private:
/**
* Construct a FTPolyGlyph.
*
* @param glyphIndex The glyph index NOT the char code.
- * @return An FTExtrdGlyph or <code>null</code> on failure.
+ * @return An FTExtrdGlyph or <code>null</code> on failure.
*/
inline virtual FTGlyph* MakeGlyph( unsigned int glyphIndex);
-
+
/**
* The extrusion distance for the font.
*/
@@ -59,5 +59,5 @@ class FTGL_EXPORT FTGLExtrdFont : public FTFont
};
-#endif // __FTGLExtrdFont__
+#endif // __FTGLExtrdFont__
diff --git a/graf3d/ftgl/inc/FTGLOutlineFont.h b/graf3d/ftgl/inc/FTGLOutlineFont.h
index 6690350e7e3..7ec4c2c8e0a 100755
--- a/graf3d/ftgl/inc/FTGLOutlineFont.h
+++ b/graf3d/ftgl/inc/FTGLOutlineFont.h
@@ -37,12 +37,12 @@ class FTGL_EXPORT FTGLOutlineFont : public FTFont
*/
~FTGLOutlineFont();
- /**
+ /**
* Prepare for rendering
*/
virtual void PreRender();
- /**
+ /**
* Cleanup after rendering
*/
virtual void PostRender();
diff --git a/graf3d/ftgl/inc/FTGLPixmapFont.h b/graf3d/ftgl/inc/FTGLPixmapFont.h
index 4705e948a9d..8a35ef90cce 100755
--- a/graf3d/ftgl/inc/FTGLPixmapFont.h
+++ b/graf3d/ftgl/inc/FTGLPixmapFont.h
@@ -38,12 +38,12 @@ class FTGL_EXPORT FTGLPixmapFont : public FTFont
*/
~FTGLPixmapFont();
- /**
+ /**
* Prepare for rendering
*/
virtual void PreRender();
- /**
+ /**
* Cleanup after rendering
*/
virtual void PostRender();
diff --git a/graf3d/ftgl/inc/FTGLTextureFont.h b/graf3d/ftgl/inc/FTGLTextureFont.h
index c0b1c7713c9..4bf4e57cf0f 100755
--- a/graf3d/ftgl/inc/FTGLTextureFont.h
+++ b/graf3d/ftgl/inc/FTGLTextureFont.h
@@ -46,12 +46,12 @@ class FTGL_EXPORT FTGLTextureFont : public FTFont
*/
virtual bool FaceSize( const unsigned int size, const unsigned int res = 72);
- /**
+ /**
* Prepare for rendering
*/
virtual void PreRender();
- /**
+ /**
* Cleanup after rendering
*/
virtual void PostRender();
diff --git a/graf3d/ftgl/inc/FTList.h b/graf3d/ftgl/inc/FTList.h
index 34992168103..9231a3570c1 100644
--- a/graf3d/ftgl/inc/FTList.h
+++ b/graf3d/ftgl/inc/FTList.h
@@ -88,11 +88,11 @@ class FTGL_EXPORT FTList
struct Node
{
Node()
- : next(NULL)
+ : next(NULL)
{}
Node( const value_type& item)
- : next(NULL)
+ : next(NULL)
{
payload = item;
}
diff --git a/graf3d/ftgl/inc/FTOutlineGlyph.h b/graf3d/ftgl/inc/FTOutlineGlyph.h
index 3e3578c3246..66d44a24906 100644
--- a/graf3d/ftgl/inc/FTOutlineGlyph.h
+++ b/graf3d/ftgl/inc/FTOutlineGlyph.h
@@ -1,5 +1,5 @@
-#ifndef __FTOutlineGlyph__
-#define __FTOutlineGlyph__
+#ifndef __FTOutlineGlyph__
+#define __FTOutlineGlyph__
#include <ft2build.h>
#include FT_FREETYPE_H
@@ -39,19 +39,19 @@ class FTGL_EXPORT FTOutlineGlyph : public FTGlyph
/**
* Renders this glyph at the current pen position.
*
- * @param pen The current pen position.
- * @return The advance distance for this glyph.
+ * @param pen The current pen position.
+ * @return The advance distance for this glyph.
*/
virtual const FTPoint& Render( const FTPoint& pen);
- private:
+ private:
/**
* OpenGL display list
*/
GLuint glList;
-
+
};
-#endif // __FTOutlineGlyph__
+#endif // __FTOutlineGlyph__
diff --git a/graf3d/ftgl/inc/FTVectoriser.h b/graf3d/ftgl/inc/FTVectoriser.h
index 1df6bd4209e..1af1e7011bc 100644
--- a/graf3d/ftgl/inc/FTVectoriser.h
+++ b/graf3d/ftgl/inc/FTVectoriser.h
@@ -24,7 +24,7 @@ class FTGL_EXPORT FTTesselation
* Default constructor
*/
FTTesselation( GLenum m)
- : meshType(m)
+ : meshType(m)
{
pointList.reserve( 128);
}
@@ -79,8 +79,8 @@ class FTGL_EXPORT FTTesselation
*/
class FTGL_EXPORT FTMesh
{
- typedef FTVector<FTTesselation*> TesselationVector;
- typedef FTList<FTPoint> PointList;
+ typedef FTVector<FTTesselation*> TesselationVector;
+ typedef FTList<FTPoint> PointList;
public:
/**
diff --git a/graf3d/ftgl/src/FTFont.cxx b/graf3d/ftgl/src/FTFont.cxx
index 241d06ba8de..70dbe70be9a 100644
--- a/graf3d/ftgl/src/FTFont.cxx
+++ b/graf3d/ftgl/src/FTFont.cxx
@@ -277,22 +277,22 @@ void FTFont::Render( const char* string, float w_max, float w_fade )
const unsigned char* c = (unsigned char*)string;
pen.X(0); pen.Y(0);
- while( *c)
- {
- if(CheckGlyph( *c))
- {
- pen = glyphList->Render( *c, *(c + 1), pen);
- w += pen.X();
- if(w > w_max)
- break;
- if(w > w_fade)
- {
- col[3] = alpha_fac * (w_max - w);
- glColor4fv(col);
- }
- }
- ++c;
- }
+ while( *c)
+ {
+ if(CheckGlyph( *c))
+ {
+ pen = glyphList->Render( *c, *(c + 1), pen);
+ w += pen.X();
+ if(w > w_max)
+ break;
+ if(w > w_fade)
+ {
+ col[3] = alpha_fac * (w_max - w);
+ glColor4fv(col);
+ }
+ }
+ ++c;
+ }
if (pre_post) PostRender();
}
diff --git a/graf3d/ftgl/src/FTVectoriser.cxx b/graf3d/ftgl/src/FTVectoriser.cxx
index 85f40921e12..daa0ee853ce 100644
--- a/graf3d/ftgl/src/FTVectoriser.cxx
+++ b/graf3d/ftgl/src/FTVectoriser.cxx
@@ -49,7 +49,7 @@ void CALLBACK ftglEnd( FTMesh* mesh)
FTMesh::FTMesh()
-: currentTesselation(0),
+: currentTesselation(0),
err(0)
{
tesselationList.reserve( 16);
diff --git a/graf3d/g3d/src/TSPHE.cxx b/graf3d/g3d/src/TSPHE.cxx
index 56e2a3b5fcf..33d4eb05c81 100644
--- a/graf3d/g3d/src/TSPHE.cxx
+++ b/graf3d/g3d/src/TSPHE.cxx
@@ -463,7 +463,7 @@ const TBuffer3D & TSPHE::GetBuffer3D(Int_t reqSections) const
buffer.fPols[indx++] = (2*k+ 3)*m+j;
buffer.fPols[indx++] = nz*2*m+(2*k+3)*n+j+1;
}
-
+
if (specialCase) {
buffer.fPols[indx++] = c;
buffer.fPols[indx++] = 4;
@@ -471,7 +471,7 @@ const TBuffer3D & TSPHE::GetBuffer3D(Int_t reqSections) const
buffer.fPols[indx++] = nz*2*m+(2*k+2)*n+j;
buffer.fPols[indx++] = (2*k+2)*m+j;
buffer.fPols[indx++] = nz*2*m+(2*k+2)*n;
-
+
buffer.fPols[indx++] = c+1;
buffer.fPols[indx++] = 4;
buffer.fPols[indx++] = (2*k+1)*m+j;
@@ -492,8 +492,8 @@ const TBuffer3D & TSPHE::GetBuffer3D(Int_t reqSections) const
buffer.fPols[indx++] = indx2+2*(k+1)*n;
buffer.fPols[indx++] = indx2+2*nz*n+2*k;
buffer.fPols[indx++] = indx2+(2*k+3)*n;
-
- buffer.fPols[indx++] = c+2;
+
+ buffer.fPols[indx++] = c+2;
buffer.fPols[indx++] = 4;
buffer.fPols[indx++] = k==0 ? indx2+n-1 : indx2+2*nz*n+2*(k-1)+1;
buffer.fPols[indx++] = indx2+(2*k+3)*n+n-1;
diff --git a/graf3d/gl/inc/TGLCamera.h b/graf3d/gl/inc/TGLCamera.h
index 6171e2f699e..581fc8c6056 100644
--- a/graf3d/gl/inc/TGLCamera.h
+++ b/graf3d/gl/inc/TGLCamera.h
@@ -89,7 +89,7 @@ protected:
// Set in Setup()
Double_t fDollyDefault; // default distnce from viewing centre
Double_t fDollyDistance; // unit distance for camera movement in fwd/bck direction
- Float_t fVAxisMinAngle; // minimal allowed angle between up and fCamTrans Z vector
+ Float_t fVAxisMinAngle; // minimal allowed angle between up and fCamTrans Z vector
// Internal cached matrices and frustum planes
mutable Bool_t fCacheDirty; //! cached items dirty?
diff --git a/graf3d/gl/inc/TGLViewerEditor.h b/graf3d/gl/inc/TGLViewerEditor.h
index c2edeec7d19..563aeafb0ad 100644
--- a/graf3d/gl/inc/TGLViewerEditor.h
+++ b/graf3d/gl/inc/TGLViewerEditor.h
@@ -105,7 +105,7 @@ private:
// Model
TGLViewer *fViewer;
- Bool_t fIsInPad;
+ Bool_t fIsInPad;
void ConnectSignals2Slots();
diff --git a/graf3d/gl/inc/TGLVoxelPainter.h b/graf3d/gl/inc/TGLVoxelPainter.h
index a64fe3f2153..d09c47322f8 100644
--- a/graf3d/gl/inc/TGLVoxelPainter.h
+++ b/graf3d/gl/inc/TGLVoxelPainter.h
@@ -63,7 +63,7 @@ private:
void SetVoxelColor(const Float_t *rgba)const;
Bool_t HasSections()const;
- void PreparePalette()const;
+ void PreparePalette()const;
TF1 *fTransferFunc;
diff --git a/graf3d/gl/src/TGLRotateManip.cxx b/graf3d/gl/src/TGLRotateManip.cxx
index 9f48e464fa2..6801f9e8ba0 100644
--- a/graf3d/gl/src/TGLRotateManip.cxx
+++ b/graf3d/gl/src/TGLRotateManip.cxx
@@ -190,9 +190,9 @@ Bool_t TGLRotateManip::HandleButton(const Event_t& event, const TGLCamera& camer
// Work out ring follow direction - if clicked on back or front of ring.
// If plane/eye angle very shallow force to front
- /* DISABLED - Force onto front always */
- fShallowFront = kTRUE;
- /*
+ /* DISABLED - Force onto front always */
+ fShallowFront = kTRUE;
+ /*
if ((planeEyeAngle > -shallowDelta/3.0) && (planeEyeAngle < shallowDelta/3.0) ||
Dot(fRingLine.Vector(), camera.FrustumPlane(TGLCamera::kNear).Norm()) < 0.0) {
fShallowFront = kTRUE;
diff --git a/graf3d/gl/src/TGLTF3Painter.cxx b/graf3d/gl/src/TGLTF3Painter.cxx
index 69c3c97ddf1..f782850574e 100644
--- a/graf3d/gl/src/TGLTF3Painter.cxx
+++ b/graf3d/gl/src/TGLTF3Painter.cxx
@@ -130,7 +130,7 @@ void TGLTF3Painter::Pan(Int_t px, Int_t py)
fBoxCut.MoveBox(px, py, fSelectedPart);
} else {
//MoveSection(px, py);
- }
+ }
} else {
//MoveSection(px, py);
}
@@ -518,7 +518,7 @@ void TGLIsoPainter::Pan(Int_t px, Int_t py)
fBoxCut.MoveBox(px, py, fSelectedPart);
} else {
//MoveSection(px, py);
- }
+ }
} else {
//MoveSection(px, py);
}
diff --git a/graf3d/gl/src/TGLViewer.cxx b/graf3d/gl/src/TGLViewer.cxx
index 9189ede41e3..105124b1a3a 100644
--- a/graf3d/gl/src/TGLViewer.cxx
+++ b/graf3d/gl/src/TGLViewer.cxx
@@ -560,7 +560,7 @@ void TGLViewer::DoDraw(Bool_t swap_buffers)
if (fGLDevice == -1 && (fViewport.Width() <= 1 || fViewport.Height() <= 1)) {
if (gDebug > 2) {
- Info("TGLViewer::DoDraw()", "zero surface area, draw skipped.");
+ Info("TGLViewer::DoDraw()", "zero surface area, draw skipped.");
}
return;
}
diff --git a/graf3d/gl/src/TX11GL.cxx b/graf3d/gl/src/TX11GL.cxx
index 42ce4a80cf7..c5cb8622b1e 100644
--- a/graf3d/gl/src/TX11GL.cxx
+++ b/graf3d/gl/src/TX11GL.cxx
@@ -465,7 +465,7 @@ void TX11GLManager::ReadGLBuffer(Int_t ctxInd)
ctx.fPixmapGC = XCreateGC(fPimpl->fDpy, ctx.fX11Pixmap, 0, 0);
if (ctx.fPixmapGC) {
// GL buffer read operation gives bottom-up order of pixels, but XImage
- // require top-down. So, change RGB lines first.
+ // require top-down. So, change RGB lines first.
char *dest = ctx.fXImage->data;
const UChar_t *src = &ctx.fBUBuffer[ctx.fW * 4 * (ctx.fH - 1)];
for (UInt_t i = 0, e = ctx.fH; i < e; ++i) {
diff --git a/graf3d/glew/src/glew.c b/graf3d/glew/src/glew.c
index 28aca830a88..a6acc74af0b 100644
--- a/graf3d/glew/src/glew.c
+++ b/graf3d/glew/src/glew.c
@@ -102,7 +102,7 @@ void* NSGLGetProcAddress (const GLubyte *name)
symbolName[0] = '_';
symbol = NULL;
/* if (NSIsSymbolNameDefined(symbolName))
- symbol = NSLookupAndBindSymbol(symbolName); */
+ symbol = NSLookupAndBindSymbol(symbolName); */
symbol = image ? NSLookupSymbolInImage(image, symbolName, NSLOOKUPSYMBOLINIMAGE_OPTION_BIND | NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR) : NULL;
free(symbolName);
return symbol ? NSAddressOfSymbol(symbol) : NULL;
@@ -199,12 +199,12 @@ static GLboolean _glewStrSame1 (GLubyte** a, GLuint* na, const GLubyte* b, GLuin
{
GLuint i=0;
while (i < nb && (*a)+i != NULL && b+i != NULL && (*a)[i] == b[i]) i++;
- if(i == nb)
- {
- *a = *a + nb;
- *na = *na - nb;
- return GL_TRUE;
- }
+ if(i == nb)
+ {
+ *a = *a + nb;
+ *na = *na - nb;
+ return GL_TRUE;
+ }
}
return GL_FALSE;
}
@@ -215,12 +215,12 @@ static GLboolean _glewStrSame2 (GLubyte** a, GLuint* na, const GLubyte* b, GLuin
{
GLuint i=0;
while (i < nb && (*a)+i != NULL && b+i != NULL && (*a)[i] == b[i]) i++;
- if(i == nb)
- {
- *a = *a + nb;
- *na = *na - nb;
- return GL_TRUE;
- }
+ if(i == nb)
+ {
+ *a = *a + nb;
+ *na = *na - nb;
+ return GL_TRUE;
+ }
}
return GL_FALSE;
}
@@ -6181,82 +6181,82 @@ GLboolean glewGetExtension (const char* name)
GLenum glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST)
{
const GLubyte* s;
- GLuint dot, major, minor;
- /* query opengl version */
- s = glGetString(GL_VERSION);
- dot = _glewStrCLen(s, '.');
- major = dot-1;
- minor = dot+1;
- if (dot == 0 || s[minor] == '\0')
- return GLEW_ERROR_NO_GL_VERSION;
- if (s[major] == '1' && s[minor] == '0')
- {
- return GLEW_ERROR_GL_VERSION_10_ONLY;
- }
- else
- {
- CONST_CAST(GLEW_VERSION_1_1) = GL_TRUE;
- if (s[major] >= '2')
- {
- CONST_CAST(GLEW_VERSION_1_2) = GL_TRUE;
- CONST_CAST(GLEW_VERSION_1_3) = GL_TRUE;
- CONST_CAST(GLEW_VERSION_1_4) = GL_TRUE;
- CONST_CAST(GLEW_VERSION_1_5) = GL_TRUE;
- CONST_CAST(GLEW_VERSION_2_0) = GL_TRUE;
- if (s[minor] >= '1')
- {
- CONST_CAST(GLEW_VERSION_2_1) = GL_TRUE;
+ GLuint dot, major, minor;
+ /* query opengl version */
+ s = glGetString(GL_VERSION);
+ dot = _glewStrCLen(s, '.');
+ major = dot-1;
+ minor = dot+1;
+ if (dot == 0 || s[minor] == '\0')
+ return GLEW_ERROR_NO_GL_VERSION;
+ if (s[major] == '1' && s[minor] == '0')
+ {
+ return GLEW_ERROR_GL_VERSION_10_ONLY;
+ }
+ else
+ {
+ CONST_CAST(GLEW_VERSION_1_1) = GL_TRUE;
+ if (s[major] >= '2')
+ {
+ CONST_CAST(GLEW_VERSION_1_2) = GL_TRUE;
+ CONST_CAST(GLEW_VERSION_1_3) = GL_TRUE;
+ CONST_CAST(GLEW_VERSION_1_4) = GL_TRUE;
+ CONST_CAST(GLEW_VERSION_1_5) = GL_TRUE;
+ CONST_CAST(GLEW_VERSION_2_0) = GL_TRUE;
+ if (s[minor] >= '1')
+ {
+ CONST_CAST(GLEW_VERSION_2_1) = GL_TRUE;
+ }
}
- }
- else
- {
- if (s[minor] >= '5')
- {
- CONST_CAST(GLEW_VERSION_1_2) = GL_TRUE;
- CONST_CAST(GLEW_VERSION_1_3) = GL_TRUE;
- CONST_CAST(GLEW_VERSION_1_4) = GL_TRUE;
- CONST_CAST(GLEW_VERSION_1_5) = GL_TRUE;
- CONST_CAST(GLEW_VERSION_2_0) = GL_FALSE;
- CONST_CAST(GLEW_VERSION_2_1) = GL_FALSE;
- }
- if (s[minor] == '4')
- {
- CONST_CAST(GLEW_VERSION_1_2) = GL_TRUE;
- CONST_CAST(GLEW_VERSION_1_3) = GL_TRUE;
- CONST_CAST(GLEW_VERSION_1_4) = GL_TRUE;
- CONST_CAST(GLEW_VERSION_1_5) = GL_FALSE;
- CONST_CAST(GLEW_VERSION_2_0) = GL_FALSE;
- CONST_CAST(GLEW_VERSION_2_1) = GL_FALSE;
- }
- if (s[minor] == '3')
- {
- CONST_CAST(GLEW_VERSION_1_2) = GL_TRUE;
- CONST_CAST(GLEW_VERSION_1_3) = GL_TRUE;
- CONST_CAST(GLEW_VERSION_1_4) = GL_FALSE;
- CONST_CAST(GLEW_VERSION_1_5) = GL_FALSE;
- CONST_CAST(GLEW_VERSION_2_0) = GL_FALSE;
- CONST_CAST(GLEW_VERSION_2_1) = GL_FALSE;
- }
- if (s[minor] == '2')
- {
- CONST_CAST(GLEW_VERSION_1_2) = GL_TRUE;
- CONST_CAST(GLEW_VERSION_1_3) = GL_FALSE;
- CONST_CAST(GLEW_VERSION_1_4) = GL_FALSE;
- CONST_CAST(GLEW_VERSION_1_5) = GL_FALSE;
- CONST_CAST(GLEW_VERSION_2_0) = GL_FALSE;
- CONST_CAST(GLEW_VERSION_2_1) = GL_FALSE;
- }
- if (s[minor] < '2')
- {
- CONST_CAST(GLEW_VERSION_1_2) = GL_FALSE;
- CONST_CAST(GLEW_VERSION_1_3) = GL_FALSE;
- CONST_CAST(GLEW_VERSION_1_4) = GL_FALSE;
- CONST_CAST(GLEW_VERSION_1_5) = GL_FALSE;
- CONST_CAST(GLEW_VERSION_2_0) = GL_FALSE;
- CONST_CAST(GLEW_VERSION_2_1) = GL_FALSE;
- }
- }
- }
+ else
+ {
+ if (s[minor] >= '5')
+ {
+ CONST_CAST(GLEW_VERSION_1_2) = GL_TRUE;
+ CONST_CAST(GLEW_VERSION_1_3) = GL_TRUE;
+ CONST_CAST(GLEW_VERSION_1_4) = GL_TRUE;
+ CONST_CAST(GLEW_VERSION_1_5) = GL_TRUE;
+ CONST_CAST(GLEW_VERSION_2_0) = GL_FALSE;
+ CONST_CAST(GLEW_VERSION_2_1) = GL_FALSE;
+ }
+ if (s[minor] == '4')
+ {
+ CONST_CAST(GLEW_VERSION_1_2) = GL_TRUE;
+ CONST_CAST(GLEW_VERSION_1_3) = GL_TRUE;
+ CONST_CAST(GLEW_VERSION_1_4) = GL_TRUE;
+ CONST_CAST(GLEW_VERSION_1_5) = GL_FALSE;
+ CONST_CAST(GLEW_VERSION_2_0) = GL_FALSE;
+ CONST_CAST(GLEW_VERSION_2_1) = GL_FALSE;
+ }
+ if (s[minor] == '3')
+ {
+ CONST_CAST(GLEW_VERSION_1_2) = GL_TRUE;
+ CONST_CAST(GLEW_VERSION_1_3) = GL_TRUE;
+ CONST_CAST(GLEW_VERSION_1_4) = GL_FALSE;
+ CONST_CAST(GLEW_VERSION_1_5) = GL_FALSE;
+ CONST_CAST(GLEW_VERSION_2_0) = GL_FALSE;
+ CONST_CAST(GLEW_VERSION_2_1) = GL_FALSE;
+ }
+ if (s[minor] == '2')
+ {
+ CONST_CAST(GLEW_VERSION_1_2) = GL_TRUE;
+ CONST_CAST(GLEW_VERSION_1_3) = GL_FALSE;
+ CONST_CAST(GLEW_VERSION_1_4) = GL_FALSE;
+ CONST_CAST(GLEW_VERSION_1_5) = GL_FALSE;
+ CONST_CAST(GLEW_VERSION_2_0) = GL_FALSE;
+ CONST_CAST(GLEW_VERSION_2_1) = GL_FALSE;
+ }
+ if (s[minor] < '2')
+ {
+ CONST_CAST(GLEW_VERSION_1_2) = GL_FALSE;
+ CONST_CAST(GLEW_VERSION_1_3) = GL_FALSE;
+ CONST_CAST(GLEW_VERSION_1_4) = GL_FALSE;
+ CONST_CAST(GLEW_VERSION_1_5) = GL_FALSE;
+ CONST_CAST(GLEW_VERSION_2_0) = GL_FALSE;
+ CONST_CAST(GLEW_VERSION_2_1) = GL_FALSE;
+ }
+ }
+ }
/* initialize extensions */
#ifdef GL_VERSION_1_2
if (glewExperimental || GLEW_VERSION_1_2) CONST_CAST(GLEW_VERSION_1_2) = !_glewInit_GL_VERSION_1_2(GLEW_CONTEXT_ARG_VAR_INIT);
diff --git a/graf3d/x3d/src/TViewerX3D.cxx b/graf3d/x3d/src/TViewerX3D.cxx
index fe71dabaecb..f4fd96bbf15 100644
--- a/graf3d/x3d/src/TViewerX3D.cxx
+++ b/graf3d/x3d/src/TViewerX3D.cxx
@@ -437,7 +437,7 @@ Int_t TViewerX3D::AddObject(const TBuffer3D & buffer, Bool_t * addChildren)
x3dBuff->polys = buffer.fPols;
FillX3DBuffer(x3dBuff);
delete [] x3dBuff->points;
- delete x3dBuff;
+ delete x3dBuff;
break;
}
default: {
@@ -509,7 +509,7 @@ void TViewerX3D::PaintPolyMarker(const TBuffer3D & buffer) const
FillX3DBuffer(x3dBuff);
delete [] x3dBuff->points;
delete [] x3dBuff->segs;
- delete x3dBuff;
+ delete x3dBuff;
break;
}
}
diff --git a/graf3d/x3d/src/x3d.c b/graf3d/x3d/src/x3d.c
index 2796636fd78..75b7c62b223 100644
--- a/graf3d/x3d/src/x3d.c
+++ b/graf3d/x3d/src/x3d.c
@@ -1677,25 +1677,25 @@ register float PX, PY, QX, QY, dx, dy;
switch(Pclip){
- case 1 : /* 00001 */
+ case 1 : /* 00001 */
clipWithTop(PX, PY, dx, dy, V)
if((PX < -H) || (PX > H))
return 0;
break;
- case 2 : /* 00010 */
+ case 2 : /* 00010 */
clipWithBottom(PX, PY, dx, dy, V)
if((PX < -H) || (PX > H))
return 0;
break;
- case 4 : /* 00100 */
+ case 4 : /* 00100 */
clipWithLeftSide(PX, PY, dx, dy, H)
if((PY < -V) || (PY > V))
return 0;
break;
- case 5 : /* 00101 */
+ case 5 : /* 00101 */
clipWithTop(PX, PY, dx, dy, V)
if((PX < -H) || (PX > H)){
clipWithLeftSide(PX, PY, dx, dy, H)
@@ -1704,7 +1704,7 @@ register float PX, PY, QX, QY, dx, dy;
}
break;
- case 6 : /* 00110 */
+ case 6 : /* 00110 */
clipWithBottom(PX, PY, dx, dy, V)
if((PX < -H) || (PX > H)){
clipWithLeftSide(PX, PY, dx, dy, H)
@@ -1713,13 +1713,13 @@ register float PX, PY, QX, QY, dx, dy;
}
break;
- case 8 : /* 01000 */
+ case 8 : /* 01000 */
clipWithRightSide(PX, PY, dx, dy, H)
if((PY < -V) || (PY > V))
return 0;
break;
- case 9 : /* 01001 */
+ case 9 : /* 01001 */
clipWithTop(PX, PY, dx, dy, V)
if((PX < -H) || (PX > H)){
clipWithRightSide(PX, PY, dx, dy, H)
@@ -1728,7 +1728,7 @@ register float PX, PY, QX, QY, dx, dy;
}
break;
- case 10 : /* 01010 */
+ case 10 : /* 01010 */
clipWithBottom(PX, PY, dx, dy, V)
if((PX < -H) || (PX > H)){
clipWithRightSide(PX, PY, dx, dy, H)
@@ -1743,59 +1743,59 @@ register float PX, PY, QX, QY, dx, dy;
switch(Qclip){
- case 1 : /* 00001 */
+ case 1 : /* 00001 */
clipWithTop(QX, QY, dx, dy, V)
break;
- case 2 : /* 00010 */
+ case 2 : /* 00010 */
clipWithBottom(QX, QY, dx, dy, V)
break;
- case 4 : /* 00100 */
+ case 4 : /* 00100 */
clipWithLeftSide(QX, QY, dx, dy, H)
break;
- case 5 : /* 00101 */
+ case 5 : /* 00101 */
clipWithTop(QX, QY, dx, dy, V)
if(QX < -H)
clipWithLeftSide(QX, QY, dx, dy, H)
break;
- case 6 : /* 00110 */
+ case 6 : /* 00110 */
clipWithBottom(QX, QY, dx, dy, V)
if(QX < -H)
clipWithLeftSide(QX, QY, dx, dy, H)
break;
- case 8 : /* 01000 */
+ case 8 : /* 01000 */
clipWithRightSide(QX, QY, dx, dy, H)
break;
- case 9 : /* 01001 */
+ case 9 : /* 01001 */
clipWithTop(QX, QY, dx, dy, V)
if(QX > H)
clipWithRightSide(QX, QY, dx, dy, H)
break;
- case 10 : /* 01010 */
+ case 10 : /* 01010 */
clipWithBottom(QX, QY, dx, dy, V)
if(QX > H)
clipWithRightSide(QX, QY, dx, dy, H)
break;
- case 21 : /* 10101 */
+ case 21 : /* 10101 */
clipWithTop(QX, QY, dx, dy, V)
if(QX < -H)
clipWithLeftSide(QX, QY, dx, dy, H)
break;
- case 22 : /* 10110 */
+ case 22 : /* 10110 */
clipWithBottom(QX, QY, dx, dy, V)
if(QX < -H)
clipWithLeftSide(QX, QY, dx, dy, H)
break;
- case 23 : /* 10111 */
+ case 23 : /* 10111 */
if(QY < PY)
clipWithTop(QX, QY, dx, dy, V)
else
@@ -1804,19 +1804,19 @@ register float PX, PY, QX, QY, dx, dy;
clipWithLeftSide(QX, QY, dx, dy, H)
break;
- case 25 : /* 11001 */
+ case 25 : /* 11001 */
clipWithTop(QX, QY, dx, dy, V)
if(QX > H)
clipWithRightSide(QX, QY, dx, dy, H)
break;
- case 26 : /* 11010 */
+ case 26 : /* 11010 */
clipWithBottom(QX, QY, dx, dy, V)
if(QX > H)
clipWithRightSide(QX, QY, dx, dy, H)
break;
- case 27 : /* 11011 */
+ case 27 : /* 11011 */
if(QY < PY)
clipWithTop(QX, QY, dx, dy, V)
else
@@ -1825,7 +1825,7 @@ register float PX, PY, QX, QY, dx, dy;
clipWithRightSide(QX, QY, dx, dy, H)
break;
- case 29 : /* 11101 */
+ case 29 : /* 11101 */
if(QX < PX)
clipWithRightSide(QX, QY, dx, dy, H)
else
@@ -1834,7 +1834,7 @@ register float PX, PY, QX, QY, dx, dy;
clipWithTop(QX, QY, dx, dy, V)
break;
- case 30 : /* 11110 */
+ case 30 : /* 11110 */
if(QX < PX)
clipWithRightSide(QX, QY, dx, dy, H)
else
@@ -1843,7 +1843,7 @@ register float PX, PY, QX, QY, dx, dy;
clipWithBottom(QX, QY, dx, dy, V)
break;
- case 31 : /* 11111 */
+ case 31 : /* 11111 */
if(QX < PX)
clipWithRightSide(QX, QY, dx, dy, H)
else
@@ -3144,7 +3144,7 @@ Window parent;
* Print help
*/
if (!strcmp(string, "help")) {
- puts("**** x3d QUICK HELP **************************************\n");
+ puts("**** x3d QUICK HELP **************************************\n");
puts(" QUIT q Q MOVE OBJECT DOWN u U" );
puts(" TOGGLE CONTROLS STYLE o O MOVE OBJECT UP i I" );
puts(" TOGGLE STEREO DISPLAY s S MOVE OBJECT RIGHT h H" );
@@ -3155,25 +3155,25 @@ Window parent;
puts(" ROTATE ABOUT Y y Y b B AUTOROTATE ABOUT Y 4 5 6" );
puts(" ROTATE ABOUT Z z Z c C AUTOROTATE ABOUT Z 7 8 9\n");
puts(" ADJUST FOCUS [ ] { } HIDDEN LINE MODE e E" );
- puts(" WIREFRAME MODE w W HIDDEN SURFACE MODE r R\n");
+ puts(" WIREFRAME MODE w W HIDDEN SURFACE MODE r R\n");
puts(" POINTER MOVEMENT WITH LEFT BUTTON :\n");
puts(" ROTATE OBJECT ABOUT X Vertical" );
puts(" ROTATE OBJECT ABOUT Z Horizontal\n");
return 0L;
- }
- else if ((indx = (char *) strstr(string, "hull:")) != NULL) {
- strcpy (filename, indx + 5);
- if (strlen(filename)) export = 1;
+ }
+ else if ((indx = (char *) strstr(string, "hull:")) != NULL) {
+ strcpy (filename, indx + 5);
+ if (strlen(filename)) export = 1;
}
- else if ((indx = (char *) strstr(string, "java:")) != NULL) {
- strcpy (filename, indx + 5);
- if (strlen(filename)) export = 2;
+ else if ((indx = (char *) strstr(string, "java:")) != NULL) {
+ strcpy (filename, indx + 5);
+ if (strlen(filename)) export = 2;
}
- else if (string) {
- strcat(title, "/");
- strcat(title, string);
- }
+ else if (string) {
+ strcat(title, "/");
+ strcat(title, string);
+ }
switch( export ) {
case 1: /* hull */
@@ -3220,16 +3220,16 @@ Window parent;
xMin = yMin = zMin = 999999;
xMax = yMax = zMax = -999999;
- for (i = 0; i < gSize3D.numPoints; i++) {
- xMin = xMin <= points[i].x ? xMin : points[i].x;
- xMax = xMax >= points[i].x ? xMax : points[i].x;
+ for (i = 0; i < gSize3D.numPoints; i++) {
+ xMin = xMin <= points[i].x ? xMin : points[i].x;
+ xMax = xMax >= points[i].x ? xMax : points[i].x;
- yMin = yMin <= points[i].y ? yMin : points[i].y;
- yMax = yMax >= points[i].y ? yMax : points[i].y;
+ yMin = yMin <= points[i].y ? yMin : points[i].y;
+ yMax = yMax >= points[i].y ? yMax : points[i].y;
- zMin = zMin <= points[i].z ? zMin : points[i].z;
- zMax = zMax >= points[i].z ? zMax : points[i].z;
- }
+ zMin = zMin <= points[i].z ? zMin : points[i].z;
+ zMax = zMax >= points[i].z ? zMax : points[i].z;
+ }
/*
* Compute the range & center of the object
@@ -3245,15 +3245,15 @@ Window parent;
/*
* Compute the correctionFactor, rescale & put the object in the center
*/
- correctionFactor = 6000.0 / (xRange > zRange ? xRange : zRange);
+ correctionFactor = 6000.0 / (xRange > zRange ? xRange : zRange);
- for (i = 0; i < gSize3D.numPoints; i++) {
- points[i].x = (points[i].x - xCenter) * correctionFactor;
- points[i].y = (points[i].y - yCenter) * correctionFactor;
- points[i].z = (points[i].z - zCenter) * correctionFactor;
- }
+ for (i = 0; i < gSize3D.numPoints; i++) {
+ points[i].x = (points[i].x - xCenter) * correctionFactor;
+ points[i].y = (points[i].y - yCenter) * correctionFactor;
+ points[i].z = (points[i].z - zCenter) * correctionFactor;
+ }
- deltaMove = (float) (xRange >= zRange ? xRange : zRange) / 20.0 * correctionFactor;
+ deltaMove = (float) (xRange >= zRange ? xRange : zRange) / 20.0 * correctionFactor;
/*
* Calculate the bounding cube
diff --git a/gui/doc/v530/index.html b/gui/doc/v530/index.html
index 1b37c25725c..3afc8c7d39c 100644
--- a/gui/doc/v530/index.html
+++ b/gui/doc/v530/index.html
@@ -41,7 +41,7 @@
<h4>TGMenu</h4>
<ul>
-<li> Add a new (modern) way of displaying the popup menus (flat frame with gray border). This can be selected/changed via the "Gui.Style" entry in the system.rootrc file (modern being the default)
+<li> Add a new (modern) way of displaying the popup menus (flat frame with gray border). This can be selected/changed via the "Gui.Style" entry in the system.rootrc file (modern being the default)
</li>
</ul>
diff --git a/gui/fitpanel/src/TFitEditor.cxx b/gui/fitpanel/src/TFitEditor.cxx
index 55549dd0a77..957862cd9e5 100644
--- a/gui/fitpanel/src/TFitEditor.cxx
+++ b/gui/fitpanel/src/TFitEditor.cxx
@@ -1317,11 +1317,11 @@ void TFitEditor::UpdateGUI()
Int_t ixmax = fXaxis->GetLast();
if (ixmin > 1 || ixmax < ixrange) {
- fSliderX->SetRange(ixmin,ixmax);
- fSliderX->SetPosition(ixmin, ixmax);
+ fSliderX->SetRange(ixmin,ixmax);
+ fSliderX->SetPosition(ixmin, ixmax);
} else {
- fSliderX->SetRange(1,ixrange);
- fSliderX->SetPosition(ixmin,ixmax);
+ fSliderX->SetRange(1,ixrange);
+ fSliderX->SetPosition(ixmin,ixmax);
}
fSliderX->SetScale(5);
@@ -1369,11 +1369,11 @@ void TFitEditor::UpdateGUI()
}
if (iymin > 1 || iymax < iyrange) {
- fSliderY->SetRange(iymin,iymax);
- fSliderY->SetPosition(iymin, iymax);
+ fSliderY->SetRange(iymin,iymax);
+ fSliderY->SetPosition(iymin, iymax);
} else {
- fSliderY->SetRange(1,iyrange);
- fSliderY->SetPosition(iymin,iymax);
+ fSliderY->SetRange(1,iyrange);
+ fSliderY->SetPosition(iymin,iymax);
}
fSliderY->SetScale(5);
@@ -1418,11 +1418,11 @@ void TFitEditor::UpdateGUI()
}
if (izmin > 1 || izmax < izrange) {
- fSliderZ->SetRange(izmin,izmax);
- fSliderZ->SetPosition(izmin, izmax);
+ fSliderZ->SetRange(izmin,izmax);
+ fSliderZ->SetPosition(izmin, izmax);
} else {
- fSliderZ->SetRange(1,izrange);
- fSliderZ->SetPosition(izmin,izmax);
+ fSliderZ->SetRange(1,izrange);
+ fSliderZ->SetPosition(izmin,izmax);
}
fSliderZ->SetScale(5);
diff --git a/gui/ged/inc/TGedFrame.h b/gui/ged/inc/TGedFrame.h
index 8d6cfb89693..013058c07a0 100644
--- a/gui/ged/inc/TGedFrame.h
+++ b/gui/ged/inc/TGedFrame.h
@@ -99,7 +99,7 @@ private:
protected:
TGLabel *fLabel; //label of attribute frame
TGCompositeFrame *f1, *f2; //container frames
- TGToolTip *fTip; //tool tip associated with button
+ TGToolTip *fTip; //tool tip associated with button
public:
TGedNameFrame(const TGWindow *p =0 ,
diff --git a/gui/ged/inc/TH1Editor.h b/gui/ged/inc/TH1Editor.h
index 914e1e598cc..377f135be4e 100644
--- a/gui/ged/inc/TH1Editor.h
+++ b/gui/ged/inc/TH1Editor.h
@@ -52,9 +52,9 @@ protected:
TGRadioButton *fDim0; // 3D-Plot RadioButton
TGLayoutHints *fDimlh; // layout hints for 2D-Plot RadioButton
TGLayoutHints *fDim0lh; // layout hints for 3D-Plot RadioButton
- TGComboBox *fTypeCombo; // histogram type combo box
- TGComboBox *fCoordsCombo; // Coordinate System combo box
- TGComboBox *fErrorCombo; // Error combo box
+ TGComboBox *fTypeCombo; // histogram type combo box
+ TGComboBox *fCoordsCombo; // Coordinate System combo box
+ TGComboBox *fErrorCombo; // Error combo box
TGCheckButton *fHistOnOff; // Draw a simple histogram with default options
TGCheckButton *fAddMarker; // Draw a Marker on top of each bin
TGCheckButton *fAddB; // Draw a Bar Chart
diff --git a/gui/ged/src/TH1Editor.cxx b/gui/ged/src/TH1Editor.cxx
index 8a8795ef3b0..d7caad44f11 100644
--- a/gui/ged/src/TH1Editor.cxx
+++ b/gui/ged/src/TH1Editor.cxx
@@ -948,7 +948,7 @@ void TH1Editor::DoAddMarker(Bool_t on)
dum.Remove(strstr(dum.Data(),"P")-dum.Data(),1);
if (str.Contains("POL")) str = dum + "POL";
if (str.Contains("SPH")) str = dum + "SPH";
- if (str.Contains("PSR")) str = dum + "PSR";
+ if (str.Contains("PSR")) str = dum + "PSR";
} else if (str.Contains("P")) str.Remove(str.First("P"),1);
if ((str=="HIST") || (str=="") ||
(fAddB->GetState()==kButtonDown) ||
@@ -1077,7 +1077,7 @@ void TH1Editor::DoAddBar(Bool_t on)
case(kPER_40): {
str += "BAR4";
break;
- }
+ }
}
ShowFrame(f10);
ShowFrame(f11);
@@ -1134,7 +1134,7 @@ void TH1Editor::DoAddSimple(Bool_t on)
} else if (fAddSimple->GetState()==kButtonUp) {
if (str.Contains("HIST")) {
str.Remove(strstr(str.Data(),"HIST")-str.Data(),4);
- fAddMarker->SetState(kButtonUp);
+ fAddMarker->SetState(kButtonUp);
fMake=kTRUE;
}
}
@@ -1210,7 +1210,7 @@ void TH1Editor::DoHistSimple()
HideFrame(f10);
HideFrame(f11);
HideFrame(f12);
- }
+ }
}
if (fAddBar->GetState() == kButtonDisabled){
ShowFrame(f10);
@@ -1227,7 +1227,7 @@ void TH1Editor::DoHistSimple()
if (fErrorCombo->GetSelected()!=kERRORS_NO) {
fAddCombo->RemoveEntries(kADD_SIMPLE,kADD_FILL);
lb = fAddCombo->GetListBox();
- lb->Resize(lb->GetWidth(),19);
+ lb->Resize(lb->GetWidth(),19);
Disconnect(fAddCombo);
fAddCombo->Select(kADD_NONE);
fAddCombo->Connect("Selected(Int_t)", "TH1Editor", this, "DoHistChanges()");
@@ -1239,7 +1239,7 @@ void TH1Editor::DoHistSimple()
if (((TGLBContainer*)((TGListBox*)fAddCombo->GetListBox())->GetContainer())->GetPos(kADD_FILL)==-1) {
((TGListBox*)fAddCombo->GetListBox())->AddEntry("Fill Area",kADD_FILL);
lb = fAddCombo->GetListBox();
- lb->Resize(lb->GetWidth(),76);
+ lb->Resize(lb->GetWidth(),76);
}
}
if (fAddSimple->GetState()==kButtonDown) str+="HIST";
@@ -1339,19 +1339,19 @@ void TH1Editor::DoHistChanges()
fAddSimple->SetState(kButtonUp);
fAddCombo->RemoveEntries(kADD_SIMPLE,kADD_FILL);
lb = fAddCombo->GetListBox();
- lb->Resize(lb->GetWidth(),19);
+ lb->Resize(lb->GetWidth(),19);
Disconnect(fAddCombo);
fAddCombo->Select(kADD_NONE);
fAddCombo->Connect("Selected(Int_t)", "TH1Editor", this, "DoHistChanges()");
if (fAddBar->GetState()==kButtonDown) {
- ShowFrame(f10);
+ ShowFrame(f10);
ShowFrame(f11);
ShowFrame(f12);
} else {
HideFrame(f10);
HideFrame(f11);
HideFrame(f12);
- }
+ }
} else {
Bool_t on = fMake;
fMake=kFALSE;
@@ -1370,7 +1370,7 @@ void TH1Editor::DoHistChanges()
if (((TGLBContainer*)((TGListBox*)fAddCombo->GetListBox())->GetContainer())->GetPos(kADD_FILL)==-1) {
((TGListBox*)fAddCombo->GetListBox())->AddEntry("Fill Area",kADD_FILL);
lb = fAddCombo->GetListBox();
- lb->Resize(lb->GetWidth(),76);
+ lb->Resize(lb->GetWidth(),76);
}
fMake=on;
}
@@ -2402,7 +2402,7 @@ void TH1Editor::ChangeErrorCombo(Int_t i)
if (!((fErrorCombo->GetSelected()== kERRORS_NO) || (fErrorCombo->GetSelected()== kERRORS_SIMPLE)))
fErrorCombo->Select(kERRORS_NO);
TGListBox* lb = fErrorCombo->GetListBox();
- lb->Resize(lb->GetWidth(),36);
+ lb->Resize(lb->GetWidth(),36);
break;
}
case 1: {
@@ -2412,7 +2412,7 @@ void TH1Editor::ChangeErrorCombo(Int_t i)
fErrorCombo->AddEntry("Fill", kERRORS_FILL);
fErrorCombo->AddEntry("Contour", kERRORS_CONTOUR);
TGListBox* lb = fErrorCombo->GetListBox();
- lb->Resize(lb->GetWidth(),100);
+ lb->Resize(lb->GetWidth(),100);
}
break;
}
diff --git a/gui/gui/inc/TGFont.h b/gui/gui/inc/TGFont.h
index 9f93cbfe712..31a3d30340c 100644
--- a/gui/gui/inc/TGFont.h
+++ b/gui/gui/inc/TGFont.h
@@ -123,10 +123,10 @@ class TGTextLayout : public TObject {
friend class TGFont;
protected:
- const TGFont *fFont; // The font used when laying out the text.
- const char *fString; // The string that was layed out.
- Int_t fWidth; // The maximum width of all lines in the text layout.
- Int_t fNumChunks; // Number of chunks actually used in following array.
+ const TGFont *fFont; // The font used when laying out the text.
+ const char *fString; // The string that was layed out.
+ Int_t fWidth; // The maximum width of all lines in the text layout.
+ Int_t fNumChunks; // Number of chunks actually used in following array.
LayoutChunk_t *fChunks; // Array of chunks. The actual size will be maxChunks.
TGTextLayout(const TGTextLayout &tlayout); // not implemented
@@ -182,7 +182,7 @@ protected:
SetRefCount(1);
for (Int_t i=0; i<256; i++) {
fWidths[i] = 0;
- fTypes[i] = ' ';
+ fTypes[i] = ' ';
}
}
diff --git a/gui/gui/src/TGScrollBar.cxx b/gui/gui/src/TGScrollBar.cxx
index adb6c86c007..3d559942a68 100644
--- a/gui/gui/src/TGScrollBar.cxx
+++ b/gui/gui/src/TGScrollBar.cxx
@@ -62,7 +62,7 @@ ClassImp(TGVScrollBar)
class TSBRepeatTimer : public TTimer {
private:
TGScrollBar *fScrollBar; // scroll bar
- Int_t fSmallInc; // step
+ Int_t fSmallInc; // step
public:
TSBRepeatTimer(TGScrollBar *s, Long_t ms, Int_t inc) : TTimer(ms, kTRUE)
{ fScrollBar = s; fSmallInc = inc; }
diff --git a/gui/qtgsi/inc/TQRootCanvas.h b/gui/qtgsi/inc/TQRootCanvas.h
index 10cb9822989..b12a6d382e1 100644
--- a/gui/qtgsi/inc/TQRootCanvas.h
+++ b/gui/qtgsi/inc/TQRootCanvas.h
@@ -21,7 +21,7 @@
// @short Graphic Qt Widget based Canvas
//
// @authors Denis Bertini <d.bertini@gsi.de>
-// M. AL-Turany <m.al-turany@gsi.de>
+// M. AL-Turany <m.al-turany@gsi.de>
//version 2.0
//////////////////////////////////////////////////////////////////////
diff --git a/gui/qtgsi/inc/TQRootDialog.h b/gui/qtgsi/inc/TQRootDialog.h
index 40613fb3a72..44dabafd587 100644
--- a/gui/qtgsi/inc/TQRootDialog.h
+++ b/gui/qtgsi/inc/TQRootDialog.h
@@ -20,7 +20,7 @@
// member function. It is called by the TQCanvasMenu class
// @see TQCanvasMenu, QList, QVBox, TMethod, TCanvas
// @authors Denis Bertini <d.bertini@gsi.de>
-// M. AL-Turany <m.al-turany@gsi.de>
+// M. AL-Turany <m.al-turany@gsi.de>
////////////////////////////////////////////////////////////////////////////
#ifndef __CINT__
diff --git a/gui/qtgsi/src/TQRootCanvas.cxx b/gui/qtgsi/src/TQRootCanvas.cxx
index db7168d588b..724d0ae3097 100644
--- a/gui/qtgsi/src/TQRootCanvas.cxx
+++ b/gui/qtgsi/src/TQRootCanvas.cxx
@@ -320,13 +320,13 @@ void TQRootCanvas::dropEvent( QDropEvent *Event )
}
}
else
- std::cout << "object " <<
+ std::cout << "object " <<
#if (QT_VERSION > 0x039999) // Added by cholm@nbi.dk - for Qt 4
- str.data()
+ str.data()
#else
- str
+ str
#endif
- << " not found by ROOT" << std::endl;
+ << " not found by ROOT" << std::endl;
}
}
diff --git a/gui/qtgsi/test/example1/qtroot.h b/gui/qtgsi/test/example1/qtroot.h
index a9b1343587e..4e0af1ce29f 100644
--- a/gui/qtgsi/test/example1/qtroot.h
+++ b/gui/qtgsi/test/example1/qtroot.h
@@ -41,127 +41,127 @@ class QResizeEvent;
class QPaintEvent;
/**
-*
-* Main Qt&Root Application Window:
-*
-* Simple Example how to use a QMainWindow class
-* embedding a ROOT Canvas attached as its Central Widget.
-*
-*
-* @short Simple example using
-* QMainWindow together with an QRootCanvas
-*
-*
-* Services:
-* Simple example
-* @li Creates a Menu for file actions (save, browse, close, ect...)
-* @li Creates a Toolbar with actions managed by QAction class
-* @li Creates a QRootCanvas and stick it as central Widget in QMainWindows
-* @li Actions ( execute(), clear()) are defined as slots managed by this
-* QMainApplication. This slots functions acts on the ROOT Objects
-* directly ( histograms, ntuples, ect...)
-*
-* @see QRootCanvas, QMainWindow, QPopupMenu, QAction, QString
-*
-* @authors Denis Bertini <d.bertini@gsi.de>
-* @version 2.0
-*
-*/
+ *
+ * Main Qt&Root Application Window:
+ *
+ * Simple Example how to use a QMainWindow class
+ * embedding a ROOT Canvas attached as its Central Widget.
+ *
+ *
+ * @short Simple example using
+ * QMainWindow together with an QRootCanvas
+ *
+ *
+ * Services:
+ * Simple example
+ * @li Creates a Menu for file actions (save, browse, close, ect...)
+ * @li Creates a Toolbar with actions managed by QAction class
+ * @li Creates a QRootCanvas and stick it as central Widget in QMainWindows
+ * @li Actions ( execute(), clear()) are defined as slots managed by this
+ * QMainApplication. This slots functions acts on the ROOT Objects
+ * directly ( histograms, ntuples, ect...)
+ *
+ * @see QRootCanvas, QMainWindow, QPopupMenu, QAction, QString
+ *
+ * @authors Denis Bertini <d.bertini@gsi.de>
+ * @version 2.0
+ *
+ */
class ApplicationWindow: public Q3MainWindow
{
- Q_OBJECT
+ Q_OBJECT
public:
- ApplicationWindow();
- ~ApplicationWindow();
+ ApplicationWindow();
+ ~ApplicationWindow();
protected:
- void closeEvent( QCloseEvent* ce);
-
-protected slots:
- void myclose(){
- close();
- }
+ void closeEvent( QCloseEvent* ce);
+
+ protected slots:
+ void myclose(){
+ close();
+ }
/**
- New incoming functionality documentation
- */
- void newDoc();
+ New incoming functionality documentation
+ */
+ void newDoc();
/**
- IO Loading:
- @li ascii data files (Qt or ROOT streamers)
- @li Root binary files(ROOT streamer)
- @ etc...
- */
-
- void load();
+ IO Loading:
+ @li ascii data files (Qt or ROOT streamers)
+ @li Root binary files(ROOT streamer)
+ @ etc...
+ */
+
+ void load();
/**
- IO Loading function:
+ IO Loading function:
- @li ascii data files (Qt or ROOT streamers)
- @li Root binary files(ROOT streamer)
- @ etc...
- */
- void load( const char *fileName );
+ @li ascii data files (Qt or ROOT streamers)
+ @li Root binary files(ROOT streamer)
+ @ etc...
+ */
+ void load( const char *fileName );
/**
- Saving results function:
+ Saving results function:
- @li ascii data files
- @li histograms, ntuples, Objects using
- @li ROOT based IO (Root format)
- @li Qt Based IO (Qt format)?
+ @li ascii data files
+ @li histograms, ntuples, Objects using
+ @li ROOT based IO (Root format)
+ @li Qt Based IO (Qt format)?
- @ etc...
- */
+ @ etc...
+ */
- void save();
+ void save();
+ /**
+ saving pictures, in different supported formats
+ */
+ void saveAs();
+ /**
+ print results in a specified format
+ */
+ void print();
+ /**
+ online help about Qt&Root Main Application
+ */
+ void about();
/**
- saving pictures, in different supported formats
- */
- void saveAs();
- /**
- print results in a specified format
- */
- void print();
- /**
- online help about Qt&Root Main Application
- */
- void about();
- /**
- online help about this Qt based Application
- */
- void aboutQt();
- /**
- Main slot action upon ROOT classes
- @li histograms
- @li ntuples
- */
- void execute();
-
- /**
- Main slot to reinitialize the objects
- @li histograms
- @li ntuples
- */
-
- void clear_histo();
- void closeQtRoot(){
+ online help about this Qt based Application
+ */
+ void aboutQt();
+ /**
+ Main slot action upon ROOT classes
+ @li histograms
+ @li ntuples
+ */
+ void execute();
+
+ /**
+ Main slot to reinitialize the objects
+ @li histograms
+ @li ntuples
+ */
+
+ void clear_histo();
+ void closeQtRoot(){
qDebug("QtRoot: closing qt wins \n");
- close();
+ close();
qDebug("QtRoot: exiting root \n");
- gSystem->Exit(0);
- }
+ gSystem->Exit(0);
+ }
private:
- QString filename;
- QPrinter *printer;
- TQRootCanvas *aCanvas,*aCanvas2;
- TH1F* histo;
- TF1 *sqroot;
- TFormula *form1;
- TPad* pad1,*pad2;
- QTabWidget* tab;
- QWidget* central;
+ QString filename;
+ QPrinter *printer;
+ TQRootCanvas *aCanvas,*aCanvas2;
+ TH1F* histo;
+ TF1 *sqroot;
+ TFormula *form1;
+ TPad* pad1,*pad2;
+ QTabWidget* tab;
+ QWidget* central;
};
#endif
diff --git a/gui/qtgsi/test/example2/qtrootexample.pro b/gui/qtgsi/test/example2/qtrootexample.pro
index 45b89a34dd2..64396cc5ff2 100644
--- a/gui/qtgsi/test/example2/qtrootexample.pro
+++ b/gui/qtgsi/test/example2/qtrootexample.pro
@@ -2,12 +2,12 @@
QT += qt3support
CONFIG += uic3
-SOURCES += main.cpp
-FORMS = qtrootexample1.ui
-IMAGES = images/qtroot_canvas.png images/h1_t.png images/h2_t.png
-TEMPLATE =app
-CONFIG += qt warn_on thread
-INCLUDEPATH += $(ROOTSYS)/include
-LIBS += -L$(ROOTSYS)/lib -lCore -lRIO -lNet -lMathCore -lCint -lHist -lGraf -lGraf3d -lGpad -lGui -lTree -lRint -lPostscript -lMatrix -lPhysics -lThread -lQtGSI -lnsl -lm -ldl -rdynamic $(SYSLIBS)
-DBFILE = qtrootexample.db
-LANGUAGE = C++
+SOURCES += main.cpp
+FORMS = qtrootexample1.ui
+IMAGES = images/qtroot_canvas.png images/h1_t.png images/h2_t.png
+TEMPLATE =app
+CONFIG += qt warn_on thread
+INCLUDEPATH += $(ROOTSYS)/include
+LIBS += -L$(ROOTSYS)/lib -lCore -lRIO -lNet -lMathCore -lCint -lHist -lGraf -lGraf3d -lGpad -lGui -lTree -lRint -lPostscript -lMatrix -lPhysics -lThread -lQtGSI -lnsl -lm -ldl -rdynamic $(SYSLIBS)
+DBFILE = qtrootexample.db
+LANGUAGE = C++
diff --git a/hist/doc/v522/index.html b/hist/doc/v522/index.html
index c9d5164723f..d878967b584 100644
--- a/hist/doc/v522/index.html
+++ b/hist/doc/v522/index.html
@@ -20,11 +20,11 @@ Modify implementation of the Fit function in the histograms and data classes to
<h4>TBackCompFitter</h4>
New class providing a backward compatible implementation of the
- <tt>TVirtualFitter</tt> using the new fitting class. It is wrapping the functionality of the <tt>ROOT::Math::Fitter</tt> and it
- can be used to retrieve the fit information (result and
- configuration) via the
- TVirtualFitter API from <tt>FitConfig</tt> and <tt>FitResult</tt>. A static instance of this class
- is created after calling the histograms and graph Fit methods in order to retrieve the full fit information after having fit. This instace will be deleted only when the next fit is executed.
+ <tt>TVirtualFitter</tt> using the new fitting class. It is wrapping the functionality of the <tt>ROOT::Math::Fitter</tt> and it
+ can be used to retrieve the fit information (result and
+ configuration) via the
+ TVirtualFitter API from <tt>FitConfig</tt> and <tt>FitResult</tt>. A static instance of this class
+ is created after calling the histograms and graph Fit methods in order to retrieve the full fit information after having fit. This instace will be deleted only when the next fit is executed.
This gives full backward compatibility functionality in fitting.
This class in addition to the TVirtualFitter provides the following functionality:
<ul>
diff --git a/hist/hist/inc/TConfidenceLevel.h b/hist/hist/inc/TConfidenceLevel.h
index e8fd8905173..8946df2dd13 100644
--- a/hist/hist/inc/TConfidenceLevel.h
+++ b/hist/hist/inc/TConfidenceLevel.h
@@ -76,7 +76,7 @@ class TConfidenceLevel : public TObject {
static const Double_t fgMCL5S1S;
static const Double_t fgMCL3S2S;
static const Double_t fgMCL5S2S;
- ClassDef(TConfidenceLevel, 1) // output for TLimit functions
+ ClassDef(TConfidenceLevel, 1) // output for TLimit functions
};
#endif
diff --git a/hist/hist/inc/TEfficiency.h b/hist/hist/inc/TEfficiency.h
index 1da2213837b..de133410045 100644
--- a/hist/hist/inc/TEfficiency.h
+++ b/hist/hist/inc/TEfficiency.h
@@ -37,16 +37,16 @@ class TEfficiency: public TNamed, public TAttLine, public TAttFill, public TAttM
public:
//enumaration type for different statistic options for calculating confidence intervals
//kF* ... frequentist methods; kB* ... bayesian methods
- enum EStatOption {
- kFCP = 0, //Clopper-Pearson interval (recommended by PDG)
- kFNormal, //normal approximation
- kFWilson, //Wilson interval
- kFAC, //Agresti-Coull interval
- kFFC, //Feldman-Cousins interval
- kBJeffrey, //Jeffrey interval (Prior ~ Beta(0.5,0.5)
- kBUniform, //Prior ~ Uniform = Beta(1,1)
- kBBayesian //user specified Prior ~ Beta(fBeta_alpha,fBeta_beta)
- };
+ enum EStatOption {
+ kFCP = 0, //Clopper-Pearson interval (recommended by PDG)
+ kFNormal, //normal approximation
+ kFWilson, //Wilson interval
+ kFAC, //Agresti-Coull interval
+ kFFC, //Feldman-Cousins interval
+ kBJeffrey, //Jeffrey interval (Prior ~ Beta(0.5,0.5)
+ kBUniform, //Prior ~ Uniform = Beta(1,1)
+ kBBayesian //user specified Prior ~ Beta(fBeta_alpha,fBeta_beta)
+ };
protected:
@@ -66,7 +66,7 @@ protected:
Double_t fWeight; //weight for all events (default = 1)
enum{
- kIsBayesian = BIT(14), //bayesian statistics are used
+ kIsBayesian = BIT(14), //bayesian statistics are used
kPosteriorMode = BIT(15), //use posterior mean for best estimate (Bayesian statistics)
kShortestInterval = BIT(16), // use shortest interval
kUseBinPrior = BIT(17), // use a different prior for each bin
@@ -81,20 +81,20 @@ public:
TEfficiency();
TEfficiency(const TH1& passed,const TH1& total);
TEfficiency(const char* name,const char* title,Int_t nbins,
- const Double_t* xbins);
+ const Double_t* xbins);
TEfficiency(const char* name,const char* title,Int_t nbins,Double_t xlow,
- Double_t xup);
+ Double_t xup);
TEfficiency(const char* name,const char* title,Int_t nbinsx,
- Double_t xlow,Double_t xup,Int_t nbinsy,Double_t ylow,
- Double_t yup);
+ Double_t xlow,Double_t xup,Int_t nbinsy,Double_t ylow,
+ Double_t yup);
TEfficiency(const char* name,const char* title,Int_t nbinsx,
- const Double_t* xbins,Int_t nbinsy,const Double_t* ybins);
+ const Double_t* xbins,Int_t nbinsy,const Double_t* ybins);
TEfficiency(const char* name,const char* title,Int_t nbinsx,
- Double_t xlow,Double_t xup,Int_t nbinsy,Double_t ylow,
- Double_t yup,Int_t nbinsz,Double_t zlow,Double_t zup);
+ Double_t xlow,Double_t xup,Int_t nbinsy,Double_t ylow,
+ Double_t yup,Int_t nbinsz,Double_t zlow,Double_t zup);
TEfficiency(const char* name,const char* title,Int_t nbinsx,
- const Double_t* xbins,Int_t nbinsy,const Double_t* ybins,
- Int_t nbinsz,const Double_t* zbins);
+ const Double_t* xbins,Int_t nbinsy,const Double_t* ybins,
+ Int_t nbinsz,const Double_t* zbins);
TEfficiency(const TEfficiency& heff);
~TEfficiency();
@@ -152,7 +152,7 @@ public:
Bool_t SetBins(Int_t nx, Double_t xmin, Double_t xmax, Int_t ny, Double_t ymin, Double_t ymax,
Int_t nz, Double_t zmin, Double_t zmax);
Bool_t SetBins(Int_t nx, const Double_t *xBins, Int_t ny, const Double_t * yBins, Int_t nz,
- const Double_t *zBins);
+ const Double_t *zBins);
void SetTitle(const char* title);
Bool_t SetTotalEvents(Int_t bin,Int_t events);
@@ -170,8 +170,8 @@ public:
static Bool_t CheckConsistency(const TH1& pass,const TH1& total,Option_t* opt="");
static Bool_t CheckEntries(const TH1& pass,const TH1& total,Option_t* opt="");
static Double_t Combine(Double_t& up,Double_t& low,Int_t n,const Int_t* pass,const Int_t* total,
- Double_t alpha,Double_t beta,Double_t level=0.683,
- const Double_t* w=0,Option_t* opt="");
+ Double_t alpha,Double_t beta,Double_t level=0.683,
+ const Double_t* w=0,Option_t* opt="");
static TGraphAsymmErrors* Combine(TCollection* pList,Option_t* opt="",Int_t n=0,const Double_t* w=0);
//calculating boundaries of confidence intervals
diff --git a/hist/hist/inc/TF2.h b/hist/hist/inc/TF2.h
index 32744bbd28f..377d2099c00 100644
--- a/hist/hist/inc/TF2.h
+++ b/hist/hist/inc/TF2.h
@@ -54,7 +54,7 @@ public:
template <class PtrObj, typename MemFn>
TF2(const char *name, const PtrObj& p, MemFn memFn, Double_t xmin, Double_t xmax, Double_t ymin, Double_t ymax, Int_t npar, const char * c1, const char * c2) :
TF1(name,p,memFn,xmin,xmax,npar,c1,c2),
- fYmin(ymin), fYmax(ymax), fNpy(30), fContour(0)
+ fYmin(ymin), fYmax(ymax), fNpy(30), fContour(0)
{
fNpx = 30;
fNdim = 2;
@@ -64,7 +64,7 @@ public:
template <typename Func>
TF2(const char *name, Func f, Double_t xmin, Double_t xmax, Double_t ymin, Double_t ymax, Int_t npar, const char * tmp ) :
TF1(name,f,xmin,xmax,npar,tmp),
- fYmin(ymin), fYmax(ymax), fNpy(30), fContour(0)
+ fYmin(ymin), fYmax(ymax), fNpy(30), fContour(0)
{
fNpx = 30;
fNdim = 2;
diff --git a/hist/hist/inc/TH1.h b/hist/hist/inc/TH1.h
index b4f2edf60b0..82fbd481f6c 100644
--- a/hist/hist/inc/TH1.h
+++ b/hist/hist/inc/TH1.h
@@ -358,7 +358,7 @@ public:
virtual void SetBins(Int_t nx, Double_t xmin, Double_t xmax, Int_t ny, Double_t ymin, Double_t ymax,
Int_t nz, Double_t zmin, Double_t zmax);
virtual void SetBins(Int_t nx, const Double_t *xBins, Int_t ny, const Double_t * yBins, Int_t nz,
- const Double_t *zBins);
+ const Double_t *zBins);
virtual void SetBinsLength(Int_t = -1) { } //redefined in derived classes
virtual void SetBinErrorOption(EBinErrorOpt type) { fBinStatErrOpt = type; }
virtual void SetBuffer(Int_t buffersize, Option_t *option="");
diff --git a/hist/hist/inc/TH1K.h b/hist/hist/inc/TH1K.h
index d43464ff9d7..018ba4583de 100644
--- a/hist/hist/inc/TH1K.h
+++ b/hist/hist/inc/TH1K.h
@@ -29,10 +29,10 @@ class TH1K : public TH1, public TArrayF {
private:
void Sort();
protected:
- Int_t fReady; //!
+ Int_t fReady; //!
Int_t fNIn;
- Int_t fKOrd; //!
- Int_t fKCur; //!
+ Int_t fKOrd; //!
+ Int_t fKCur; //!
public:
TH1K();
TH1K(const char *name,const char *title,Int_t nbinsx,Double_t xlow,Double_t xup,Int_t k=0);
diff --git a/hist/hist/inc/TProfile3D.h b/hist/hist/inc/TProfile3D.h
index 86031f3e1d9..c348f0b29b8 100644
--- a/hist/hist/inc/TProfile3D.h
+++ b/hist/hist/inc/TProfile3D.h
@@ -140,7 +140,7 @@ public:
Int_t nbinsy, Double_t ymin, Double_t ymax,
Int_t nbinsz, Double_t zmin, Double_t zmax);
virtual void SetBins(Int_t nx, const Double_t *xBins, Int_t ny, const Double_t * yBins, Int_t nz,
- const Double_t *zBins);
+ const Double_t *zBins);
virtual void SetBinsLength(Int_t n=-1);
virtual void SetBuffer(Int_t buffersize, Option_t *opt="");
virtual void SetErrorOption(Option_t *option=""); // *MENU*
diff --git a/hist/hist/inc/TSpline.h b/hist/hist/inc/TSpline.h
index 85629bebacd..9870a09b7ce 100644
--- a/hist/hist/inc/TSpline.h
+++ b/hist/hist/inc/TSpline.h
@@ -136,10 +136,10 @@ private:
};
inline TSplinePoly3::TSplinePoly3(TSplinePoly3 const &other)
-:
- TSplinePoly(other), fB(0), fC(0), fD(0)
+ :
+ TSplinePoly(other), fB(0), fC(0), fD(0)
{
- CopyPoly(other);
+ CopyPoly(other);
}
//______________________________________________________________________________
@@ -302,7 +302,7 @@ public:
virtual void SavePrimitive(std::ostream &out, Option_t *option = "");
virtual void SetPoint(Int_t i, Double_t x, Double_t y);
virtual void SetPointCoeff(Int_t i, Double_t b, Double_t c, Double_t d,
- Double_t e, Double_t f);
+ Double_t e, Double_t f);
static void Test();
ClassDef (TSpline5,2) // Class to create quintic natural splines
diff --git a/hist/hist/inc/TUnfold.h b/hist/hist/inc/TUnfold.h
index 978a9086965..112a9b27d39 100644
--- a/hist/hist/inc/TUnfold.h
+++ b/hist/hist/inc/TUnfold.h
@@ -208,7 +208,7 @@ public:
virtual Double_t DoUnfold(Double_t tau); // Unfold with given choice of tau
virtual Int_t ScanLcurve(Int_t nPoint,Double_t tauMin,
Double_t tauMax,TGraph **lCurve,
- TSpline **logTauX=0,TSpline **logTauY=0); // scan the L curve using successive calls to DoUnfold(Double_t) at various tau
+ TSpline **logTauX=0,TSpline **logTauY=0); // scan the L curve using successive calls to DoUnfold(Double_t) at various tau
void GetProbabilityMatrix(TH2 *A,EHistMap histmap) const; // get the matrix A of probabilities
void GetNormalisationVector(TH1 *s,const Int_t *binMap=0) const; // get the vector of normalisation factors, equivalent to the initial bias vector
diff --git a/hist/hist/inc/TUnfoldBinning.h b/hist/hist/inc/TUnfoldBinning.h
index de7f1d7f3dd..94739dfddb0 100644
--- a/hist/hist/inc/TUnfoldBinning.h
+++ b/hist/hist/inc/TUnfoldBinning.h
@@ -111,14 +111,14 @@ class TUnfoldBinning : public TNamed {
virtual Double_t GetBinFactor(Int_t iBin) const; // return user factor
void GetBinUnderflowOverflowStatus(Int_t iBin,Int_t *uStatus,Int_t *oStatus) const; // return bit map indicating underflow and overflow status
void GetBinNeighbours(Int_t globalBin,Int_t axis,
- Int_t *prev,Double_t *distPrev,
- Int_t *next,Double_t *distNext) const; // get neighbour bins along an axis
+ Int_t *prev,Double_t *distPrev,
+ Int_t *next,Double_t *distNext) const; // get neighbour bins along an axis
/********************* access by bin number, given an axis steering ******/
enum { MAXDIM=32 };
const TUnfoldBinning *GetBinLocation(Int_t binTHxx,const char *axisSteering,
Int_t axisBins[MAXDIM]) const; // locate a given THxx bin for a given axis steering
void DecodeAxisSteering(const char *axisSteering,const char *options,
- Int_t *isOptionGiven) const; // decode axis steering options
+ Int_t *isOptionGiven) const; // decode axis steering options
/********************** access distribution properties *************/
inline Int_t GetDistributionNumberOfBins(void) const { return fDistributionSize; } // number of bins in the distribution possibly including under/overflow
inline Int_t GetDistributionDimension(void) const { return fAxisList->GetEntriesFast(); } // query dimension of this node's distribution
diff --git a/hist/hist/inc/TUnfoldDensity.h b/hist/hist/inc/TUnfoldDensity.h
index 16215f0bfa7..0aa853ca282 100644
--- a/hist/hist/inc/TUnfoldDensity.h
+++ b/hist/hist/inc/TUnfoldDensity.h
@@ -73,19 +73,19 @@ class TUnfoldDensity : public TUnfoldSys {
public:
TUnfoldDensity(const TH2 *hist_A, EHistMap histmap,
- ERegMode regmode = kRegModeCurvature,
- EConstraint constraint=kEConstraintArea,
- EDensityMode densityMode=kDensityModeBinWidthAndUser,
- const TUnfoldBinning *outputBins=0,
- const TUnfoldBinning *inputBins=0,
- const char *regularisationDistribution=0,
- const char *regularisationAxisSteering="*[UOB]"); // constructor for using the histogram classes. Default regularisation is on the curvature of the bin-width normalized density, excluding underflow and overflow bins
+ ERegMode regmode = kRegModeCurvature,
+ EConstraint constraint=kEConstraintArea,
+ EDensityMode densityMode=kDensityModeBinWidthAndUser,
+ const TUnfoldBinning *outputBins=0,
+ const TUnfoldBinning *inputBins=0,
+ const char *regularisationDistribution=0,
+ const char *regularisationAxisSteering="*[UOB]"); // constructor for using the histogram classes. Default regularisation is on the curvature of the bin-width normalized density, excluding underflow and overflow bins
virtual ~ TUnfoldDensity(void); // delete data members
void RegularizeDistribution(ERegMode regmode,EDensityMode densityMode,
- const char *distribution,
- const char *axisSteering); // regularize distribution(s) of the output binning scheme
+ const char *distribution,
+ const char *axisSteering); // regularize distribution(s) of the output binning scheme
enum EScanTauMode { // scan mode of correlation scan
@@ -104,10 +104,10 @@ class TUnfoldDensity : public TUnfoldSys {
TH1 *GetOutput(const char *histogramName,
const char *histogramTitle=0,const char *distributionName=0,
- const char *projectionMode=0,Bool_t useAxisBinning=kTRUE) const; // get unfolding result
+ const char *projectionMode=0,Bool_t useAxisBinning=kTRUE) const; // get unfolding result
TH1 *GetBias(const char *histogramName,
const char *histogramTitle=0,const char *distributionName=0,
- const char *projectionMode=0,Bool_t useAxisBinning=kTRUE) const; // get bias
+ const char *projectionMode=0,Bool_t useAxisBinning=kTRUE) const; // get bias
TH1 *GetFoldedOutput(const char *histogramName,
const char *histogramTitle=0,
const char *distributionName=0,
@@ -125,52 +125,52 @@ class TUnfoldDensity : public TUnfoldSys {
const char *histogramName,
const char *histogramTitle=0,
const char *distributionName=0,
- const char *projectionMode=0,Bool_t useAxisBinning=kTRUE); // get systematic shifts from one systematic source
+ const char *projectionMode=0,Bool_t useAxisBinning=kTRUE); // get systematic shifts from one systematic source
TH1 *GetDeltaSysBackgroundScale(const char *bgrSource,
const char *histogramName,
const char *histogramTitle=0,
const char *distributionName=0,
- const char *projectionMode=0,Bool_t useAxisBinning=kTRUE); // get correlated uncertainty induced by the scale uncertainty of a background source
+ const char *projectionMode=0,Bool_t useAxisBinning=kTRUE); // get correlated uncertainty induced by the scale uncertainty of a background source
TH1 *GetDeltaSysTau(const char *histogramName,
const char *histogramTitle=0,
const char *distributionName=0,
- const char *projectionMode=0,Bool_t useAxisBinning=kTRUE); // get correlated uncertainty from varying tau
+ const char *projectionMode=0,Bool_t useAxisBinning=kTRUE); // get correlated uncertainty from varying tau
TH2 *GetEmatrixSysUncorr(const char *histogramName,
- const char *histogramTitle=0,
- const char *distributionName=0,
- const char *projectionMode=0,Bool_t useAxisBinning=kTRUE); // get error matrix contribution from uncorrelated errors on the matrix A
+ const char *histogramTitle=0,
+ const char *distributionName=0,
+ const char *projectionMode=0,Bool_t useAxisBinning=kTRUE); // get error matrix contribution from uncorrelated errors on the matrix A
TH2 *GetEmatrixSysBackgroundUncorr(const char *bgrSource,
- const char *histogramName,
- const char *histogramTitle=0,
- const char *distributionName=0,
- const char *projectionMode=0,Bool_t useAxisBinning=kTRUE); // get error matrix from uncorrelated error of one background source
+ const char *histogramName,
+ const char *histogramTitle=0,
+ const char *distributionName=0,
+ const char *projectionMode=0,Bool_t useAxisBinning=kTRUE); // get error matrix from uncorrelated error of one background source
TH2 *GetEmatrixInput(const char *histogramName,
const char *histogramTitle=0,
- const char *distributionName=0,
- const char *projectionMode=0,Bool_t useAxisBinning=kTRUE); // get error contribution from input vector
+ const char *distributionName=0,
+ const char *projectionMode=0,Bool_t useAxisBinning=kTRUE); // get error contribution from input vector
TH2 *GetEmatrixTotal(const char *histogramName,
- const char *histogramTitle=0,
- const char *distributionName=0,
- const char *projectionMode=0,Bool_t useAxisBinning=kTRUE); // get total error including systematic,statistical,background,tau errors
+ const char *histogramTitle=0,
+ const char *distributionName=0,
+ const char *projectionMode=0,Bool_t useAxisBinning=kTRUE); // get total error including systematic,statistical,background,tau errors
TH1 *GetRhoIstatbgr(const char *histogramName,const char *histogramTitle=0,
const char *distributionName=0,
- const char *projectionMode=0,Bool_t useAxisBinning=kTRUE,
+ const char *projectionMode=0,Bool_t useAxisBinning=kTRUE,
TH2 **ematInv=0); // get global correlation coefficients, stat+bgr errors only (from TUnfold)
TH1 *GetRhoItotal(const char *histogramName,const char *histogramTitle=0,
const char *distributionName=0,
- const char *projectionMode=0,Bool_t useAxisBinning=kTRUE,
+ const char *projectionMode=0,Bool_t useAxisBinning=kTRUE,
TH2 **ematInv=0); // get global correlation coefficients, including systematic errors (from TUnfoldSys)
TH2 *GetRhoIJtotal(const char *histogramName,
- const char *histogramTitle=0,
- const char *distributionName=0,
- const char *projectionMode=0,Bool_t useAxisBinning=kTRUE); // get correlation coefficients
+ const char *histogramTitle=0,
+ const char *distributionName=0,
+ const char *projectionMode=0,Bool_t useAxisBinning=kTRUE); // get correlation coefficients
TH2 *GetL(const char *histogramName,
const char *histogramTitle=0,
Bool_t useAxisBinning=kTRUE); // get regularisation matrix
TH1 *GetLxMinusBias(const char *histogramName,const char *histogramTitle=0); // get vector L(x-bias) of regularisation conditions
TH2 *GetProbabilityMatrix(const char *histogramName,
- const char *histogramTitle=0,Bool_t useAxisBinning=kTRUE) const; // get matrix of probabilities
+ const char *histogramTitle=0,Bool_t useAxisBinning=kTRUE) const; // get matrix of probabilities
const TUnfoldBinning *GetInputBinning(const char *distributionName=0) const; // find binning scheme for input bins
const TUnfoldBinning *GetOutputBinning(const char *distributionName=0) const; // find binning scheme for output bins
diff --git a/hist/hist/src/TEfficiency.cxx b/hist/hist/src/TEfficiency.cxx
index 086b16c2d05..d00a06ef2ca 100644
--- a/hist/hist/src/TEfficiency.cxx
+++ b/hist/hist/src/TEfficiency.cxx
@@ -41,7 +41,7 @@ const Double_t kDefWeight = 1;
ClassImp(TEfficiency)
//______________________________________________________________________________
-/*****************************************************************************
+/*****************************************************************************
Begin_Html
<center><h2>TEfficiency - a class to handle efficiency
histograms</h2></center>
@@ -53,55 +53,55 @@ histograms</h2></center>
<ol><li><a href="#compare">Coverage probabilities for different methods</a></li></ol>
<li><a href="#cm">Merging and combining TEfficiency objects</a></li>
<ol>
- <li><a href="#merge">When should I use merging?</a></li>
- <li><a href="#comb">When should I use combining?</a></li>
+ <li><a href="#merge">When should I use merging?</a></li>
+ <li><a href="#comb">When should I use combining?</a></li>
</ol>
-<li><a href="#other">Further operations</a>
+ <li><a href="#other">Further operations</a>
<ol>
- <li><a href="#histo">Information about the internal histograms</a></li>
- <li><a href="#fit">Fitting</a></li>
- <li><a href="#draw">Draw a TEfficiency object</a></li>
+ <li><a href="#histo">Information about the internal histograms</a></li>
+ <li><a href="#fit">Fitting</a></li>
+ <li><a href="#draw">Draw a TEfficiency object</a></li>
</ol>
-<li><a href="#class">TEfficiency class</a></li>
-</ol>
-
-<h3><a name="over">I. Overview</a></h3>
-This class handles the calculation of efficiencies and their uncertainties. It
-provides several statistical methods for calculating frequentist and bayesian
-confidence intervals as well as a function for combining several efficiencies.
-<br />
-Efficiencies have a lot of applications and meanings but in principle they can
-be described by the fraction of good/passed events k out of sample containing
-N events. One is usually interested in the dependency of the efficiency on other
-(binned) variables. The number of passed and total events is therefore stored
-internally in two histograms (<a href="http://root.cern.ch/root/html/TEfficiency.html#TEfficiency:fTotalHistogram">fTotalHistogram</a> and
-<a href="http://root.cern.ch/root/html/TEfficiency.html#TEfficiency:fPassedHistogram">fPassedHistogram</a>). Then the
-efficiency as well as its upper and lower error an be calculated for each bin
-individually.<br />
-As the efficiency can be regarded as a parameter of a binomial distribution, the
-number of pass ed and total events must always be integer numbers. Therefore a
-filling with weights is not possible however you can assign a global weight to each
-TEfficiency object (<a href="http://root.cern.ch/root/html/TEfficiency.html#TEfficiency:SetWeight">SetWeight</a>). It is necessary to create one TEfficiency object
-for each weight if you investigate a process involving different weights. This
-procedure needs more effort but enables you to re-use the filled object in cases
-where you want to change one or more weights. This would not be possible if all
-events with different weights were filled in the same histogram.
-
-<h3><a name="create">II. Creating a TEfficiency object</a></h3>
-If you start a new analysis, it is highly recommended to use the TEfficiency class
-from the beginning. You can then use one of the constructors for fixed or
-variable bin size and your desired dimension. These constructors append the
-created TEfficiency object to the current directory. So it will be written
-automatically to a file during the next <a href="http://root.cern.ch/root/html/TFile.html#TFile:Write">TFile::Write</a> command.
-<div class="code"><pre>
-<b>Example:</b>
-create a twodimensional TEfficiency object with
-- name = "eff"
-- title = "my efficiency"
-- axistitles: x, y and LaTeX formated epsilon as label for Z axis
-- 10 bins with constant bin width (= 1) along X axis starting at 0 (lower edge
+ <li><a href="#class">TEfficiency class</a></li>
+ </ol>
+
+ <h3><a name="over">I. Overview</a></h3>
+ This class handles the calculation of efficiencies and their uncertainties. It
+ provides several statistical methods for calculating frequentist and bayesian
+ confidence intervals as well as a function for combining several efficiencies.
+ <br />
+ Efficiencies have a lot of applications and meanings but in principle they can
+ be described by the fraction of good/passed events k out of sample containing
+ N events. One is usually interested in the dependency of the efficiency on other
+ (binned) variables. The number of passed and total events is therefore stored
+ internally in two histograms (<a href="http://root.cern.ch/root/html/TEfficiency.html#TEfficiency:fTotalHistogram">fTotalHistogram</a> and
+ <a href="http://root.cern.ch/root/html/TEfficiency.html#TEfficiency:fPassedHistogram">fPassedHistogram</a>). Then the
+ efficiency as well as its upper and lower error an be calculated for each bin
+ individually.<br />
+ As the efficiency can be regarded as a parameter of a binomial distribution, the
+ number of pass ed and total events must always be integer numbers. Therefore a
+ filling with weights is not possible however you can assign a global weight to each
+ TEfficiency object (<a href="http://root.cern.ch/root/html/TEfficiency.html#TEfficiency:SetWeight">SetWeight</a>). It is necessary to create one TEfficiency object
+ for each weight if you investigate a process involving different weights. This
+ procedure needs more effort but enables you to re-use the filled object in cases
+ where you want to change one or more weights. This would not be possible if all
+ events with different weights were filled in the same histogram.
+
+ <h3><a name="create">II. Creating a TEfficiency object</a></h3>
+ If you start a new analysis, it is highly recommended to use the TEfficiency class
+ from the beginning. You can then use one of the constructors for fixed or
+ variable bin size and your desired dimension. These constructors append the
+ created TEfficiency object to the current directory. So it will be written
+ automatically to a file during the next <a href="http://root.cern.ch/root/html/TFile.html#TFile:Write">TFile::Write</a> command.
+ <div class="code"><pre>
+ <b>Example:</b>
+ create a twodimensional TEfficiency object with
+ - name = "eff"
+ - title = "my efficiency"
+ - axistitles: x, y and LaTeX formated epsilon as label for Z axis
+ - 10 bins with constant bin width (= 1) along X axis starting at 0 (lower edge
from first bin) upto 10 (upper edge of last bin)
-- 20 bins with constant bin width (= 0.5) along Y axis starting at -5 (lower
+ - 20 bins with constant bin width (= 0.5) along Y axis starting at -5 (lower
edge from first bin) upto 5 (upper edge of last bin)
TEfficiency* pEff = new TEfficiency("eff","my efficiency;x;y;#epsilon",10,0,10,20,-5,5);
</pre></div><div class="clear" />
@@ -678,22 +678,22 @@ End_Html
//______________________________________________________________________________
TEfficiency::TEfficiency():
- fBeta_alpha(kDefBetaAlpha),
- fBeta_beta(kDefBetaBeta),
- fBoundary(0),
- fConfLevel(kDefConfLevel),
- fDirectory(0),
- fFunctions(0),
- fPaintGraph(0),
- fPaintHisto(0),
- fPassedHistogram(0),
- fTotalHistogram(0),
- fWeight(kDefWeight)
+fBeta_alpha(kDefBetaAlpha),
+fBeta_beta(kDefBetaBeta),
+fBoundary(0),
+fConfLevel(kDefConfLevel),
+fDirectory(0),
+fFunctions(0),
+fPaintGraph(0),
+fPaintHisto(0),
+fPassedHistogram(0),
+fTotalHistogram(0),
+fWeight(kDefWeight)
{
//default constructor
//
//should not be used explicitly
-
+
SetStatisticOption(kDefStatOpt);
// create 2 dummy histograms
@@ -703,14 +703,14 @@ TEfficiency::TEfficiency():
//______________________________________________________________________________
TEfficiency::TEfficiency(const TH1& passed,const TH1& total):
- fBeta_alpha(kDefBetaAlpha),
- fBeta_beta(kDefBetaBeta),
- fConfLevel(kDefConfLevel),
- fDirectory(0),
- fFunctions(0),
- fPaintGraph(0),
- fPaintHisto(0),
- fWeight(kDefWeight)
+fBeta_alpha(kDefBetaAlpha),
+fBeta_beta(kDefBetaBeta),
+fConfLevel(kDefConfLevel),
+fDirectory(0),
+fFunctions(0),
+fPaintGraph(0),
+fPaintHisto(0),
+fWeight(kDefWeight)
{
//constructor using two existing histograms as input
//
@@ -731,23 +731,23 @@ TEfficiency::TEfficiency(const TH1& passed,const TH1& total):
// explicitly to disk by calling Write().
//check consistency of histograms
- if(CheckConsistency(passed,total,"w")) {
- Bool_t bStatus = TH1::AddDirectoryStatus();
- TH1::AddDirectory(kFALSE);
- fTotalHistogram = (TH1*)total.Clone();
- fPassedHistogram = (TH1*)passed.Clone();
- TH1::AddDirectory(bStatus);
-
- TString newName = total.GetName();
- newName += TString("_clone");
- SetName(newName);
-
- // are the histograms filled with weights?
- if(!CheckEntries(passed,total))
- {
- Info("TEfficiency","given histograms are filled with weights");
- SetUseWeightedEvents();
- }
+ if(CheckConsistency(passed,total,"w")) {
+ Bool_t bStatus = TH1::AddDirectoryStatus();
+ TH1::AddDirectory(kFALSE);
+ fTotalHistogram = (TH1*)total.Clone();
+ fPassedHistogram = (TH1*)passed.Clone();
+ TH1::AddDirectory(bStatus);
+
+ TString newName = total.GetName();
+ newName += TString("_clone");
+ SetName(newName);
+
+ // are the histograms filled with weights?
+ if(!CheckEntries(passed,total))
+ {
+ Info("TEfficiency","given histograms are filled with weights");
+ SetUseWeightedEvents();
+ }
}
else {
Error("TEfficiency(const TH1&,const TH1&)","histograms are not consistent -> results are useless");
@@ -758,7 +758,7 @@ TEfficiency::TEfficiency(const TH1& passed,const TH1& total):
fTotalHistogram = new TH1D("h1_total","h1 (total)",10,0,10);
fPassedHistogram = new TH1D("h1_passed","h1 (passed)",10,0,10);
TH1::AddDirectory(bStatus);
- }
+ }
SetBit(kPosteriorMode,false);
SetBit(kShortestInterval,false);
@@ -769,15 +769,15 @@ TEfficiency::TEfficiency(const TH1& passed,const TH1& total):
//______________________________________________________________________________
TEfficiency::TEfficiency(const char* name,const char* title,Int_t nbins,
- const Double_t* xbins):
- fBeta_alpha(kDefBetaAlpha),
- fBeta_beta(kDefBetaBeta),
- fConfLevel(kDefConfLevel),
- fDirectory(0),
- fFunctions(0),
- fPaintGraph(0),
- fPaintHisto(0),
- fWeight(kDefWeight)
+ const Double_t* xbins):
+fBeta_alpha(kDefBetaAlpha),
+fBeta_beta(kDefBetaBeta),
+fConfLevel(kDefConfLevel),
+fDirectory(0),
+fFunctions(0),
+fPaintGraph(0),
+fPaintHisto(0),
+fWeight(kDefWeight)
{
//create 1-dimensional TEfficiency object with variable bin size
//
@@ -806,15 +806,15 @@ TEfficiency::TEfficiency(const char* name,const char* title,Int_t nbins,
//______________________________________________________________________________
TEfficiency::TEfficiency(const char* name,const char* title,Int_t nbinsx,
- Double_t xlow,Double_t xup):
- fBeta_alpha(kDefBetaAlpha),
- fBeta_beta(kDefBetaBeta),
- fConfLevel(kDefConfLevel),
- fDirectory(0),
- fFunctions(0),
- fPaintGraph(0),
- fPaintHisto(0),
- fWeight(kDefWeight)
+ Double_t xlow,Double_t xup):
+fBeta_alpha(kDefBetaAlpha),
+fBeta_beta(kDefBetaBeta),
+fConfLevel(kDefConfLevel),
+fDirectory(0),
+fFunctions(0),
+fPaintGraph(0),
+fPaintHisto(0),
+fWeight(kDefWeight)
{
//create 1-dimensional TEfficiency object with fixed bins isze
//
@@ -843,16 +843,16 @@ TEfficiency::TEfficiency(const char* name,const char* title,Int_t nbinsx,
//______________________________________________________________________________
TEfficiency::TEfficiency(const char* name,const char* title,Int_t nbinsx,
- Double_t xlow,Double_t xup,Int_t nbinsy,
- Double_t ylow,Double_t yup):
- fBeta_alpha(kDefBetaAlpha),
- fBeta_beta(kDefBetaBeta),
- fConfLevel(kDefConfLevel),
- fDirectory(0),
- fFunctions(0),
- fPaintGraph(0),
- fPaintHisto(0),
- fWeight(kDefWeight)
+ Double_t xlow,Double_t xup,Int_t nbinsy,
+ Double_t ylow,Double_t yup):
+fBeta_alpha(kDefBetaAlpha),
+fBeta_beta(kDefBetaBeta),
+fConfLevel(kDefConfLevel),
+fDirectory(0),
+fFunctions(0),
+fPaintGraph(0),
+fPaintHisto(0),
+fWeight(kDefWeight)
{
//create 2-dimensional TEfficiency object with fixed bin size
//
@@ -884,16 +884,16 @@ TEfficiency::TEfficiency(const char* name,const char* title,Int_t nbinsx,
//______________________________________________________________________________
TEfficiency::TEfficiency(const char* name,const char* title,Int_t nbinsx,
- const Double_t* xbins,Int_t nbinsy,
- const Double_t* ybins):
- fBeta_alpha(kDefBetaAlpha),
- fBeta_beta(kDefBetaBeta),
- fConfLevel(kDefConfLevel),
- fDirectory(0),
- fFunctions(0),
- fPaintGraph(0),
- fPaintHisto(0),
- fWeight(kDefWeight)
+ const Double_t* xbins,Int_t nbinsy,
+ const Double_t* ybins):
+fBeta_alpha(kDefBetaAlpha),
+fBeta_beta(kDefBetaBeta),
+fConfLevel(kDefConfLevel),
+fDirectory(0),
+fFunctions(0),
+fPaintGraph(0),
+fPaintHisto(0),
+fWeight(kDefWeight)
{
//create 2-dimensional TEfficiency object with variable bin size
//
@@ -925,17 +925,17 @@ TEfficiency::TEfficiency(const char* name,const char* title,Int_t nbinsx,
//______________________________________________________________________________
TEfficiency::TEfficiency(const char* name,const char* title,Int_t nbinsx,
- Double_t xlow,Double_t xup,Int_t nbinsy,
- Double_t ylow,Double_t yup,Int_t nbinsz,
- Double_t zlow,Double_t zup):
- fBeta_alpha(kDefBetaAlpha),
- fBeta_beta(kDefBetaBeta),
- fConfLevel(kDefConfLevel),
- fDirectory(0),
- fFunctions(0),
- fPaintGraph(0),
- fPaintHisto(0),
- fWeight(kDefWeight)
+ Double_t xlow,Double_t xup,Int_t nbinsy,
+ Double_t ylow,Double_t yup,Int_t nbinsz,
+ Double_t zlow,Double_t zup):
+fBeta_alpha(kDefBetaAlpha),
+fBeta_beta(kDefBetaBeta),
+fConfLevel(kDefConfLevel),
+fDirectory(0),
+fFunctions(0),
+fPaintGraph(0),
+fPaintHisto(0),
+fWeight(kDefWeight)
{
//create 3-dimensional TEfficiency object with fixed bin size
//
@@ -970,17 +970,17 @@ TEfficiency::TEfficiency(const char* name,const char* title,Int_t nbinsx,
//______________________________________________________________________________
TEfficiency::TEfficiency(const char* name,const char* title,Int_t nbinsx,
- const Double_t* xbins,Int_t nbinsy,
- const Double_t* ybins,Int_t nbinsz,
- const Double_t* zbins):
- fBeta_alpha(kDefBetaAlpha),
- fBeta_beta(kDefBetaBeta),
- fConfLevel(kDefConfLevel),
- fDirectory(0),
- fFunctions(0),
- fPaintGraph(0),
- fPaintHisto(0),
- fWeight(kDefWeight)
+ const Double_t* xbins,Int_t nbinsy,
+ const Double_t* ybins,Int_t nbinsz,
+ const Double_t* zbins):
+fBeta_alpha(kDefBetaAlpha),
+fBeta_beta(kDefBetaBeta),
+fConfLevel(kDefConfLevel),
+fDirectory(0),
+fFunctions(0),
+fPaintGraph(0),
+fPaintHisto(0),
+fWeight(kDefWeight)
{
//create 3-dimensional TEfficiency object with variable bin size
//
@@ -1015,19 +1015,19 @@ TEfficiency::TEfficiency(const char* name,const char* title,Int_t nbinsx,
//______________________________________________________________________________
TEfficiency::TEfficiency(const TEfficiency& rEff):
- TNamed(),
- TAttLine(),
- TAttFill(),
- TAttMarker(),
- fBeta_alpha(rEff.fBeta_alpha),
- fBeta_beta(rEff.fBeta_beta),
- fBeta_bin_params(rEff.fBeta_bin_params),
- fConfLevel(rEff.fConfLevel),
- fDirectory(0),
- fFunctions(0),
- fPaintGraph(0),
- fPaintHisto(0),
- fWeight(rEff.fWeight)
+TNamed(),
+TAttLine(),
+TAttFill(),
+TAttMarker(),
+fBeta_alpha(rEff.fBeta_alpha),
+fBeta_beta(rEff.fBeta_beta),
+fBeta_bin_params(rEff.fBeta_bin_params),
+fConfLevel(rEff.fConfLevel),
+fDirectory(0),
+fFunctions(0),
+fPaintGraph(0),
+fPaintHisto(0),
+fWeight(rEff.fWeight)
{
//copy constructor
//
@@ -1058,11 +1058,11 @@ TEfficiency::TEfficiency(const TEfficiency& rEff):
TString title = "[copy] ";
title += rEff.GetTitle();
SetTitle(title);
-
+
SetStatisticOption(rEff.GetStatisticOption());
SetDirectory(0);
-
+
//copy style
rEff.TAttLine::Copy(*this);
rEff.TAttFill::Copy(*this);
@@ -1075,7 +1075,7 @@ TEfficiency::~TEfficiency()
//default destructor
//delete all function in fFunctions
- // use same logic as in TH1 destructor
+ // use same logic as in TH1 destructor
// (see TH1::~TH1 code in TH1.cxx)
if(fFunctions) {
fFunctions->SetBit(kInvalidObject);
@@ -1094,7 +1094,7 @@ TEfficiency::~TEfficiency()
if(fDirectory)
fDirectory->Remove(this);
-
+
delete fTotalHistogram;
delete fPassedHistogram;
delete fPaintGraph;
@@ -1120,7 +1120,7 @@ Double_t TEfficiency::AgrestiCoull(Int_t total,Int_t passed,Double_t level,Bool_
// #Delta = #kappa * #sqrt{#frac{mode * (1 - mode)}{total + #kappa^{2}}}
// return = max(0,mode - #Delta) or min(1,mode + #Delta)
//End_Latex
-
+
Double_t alpha = (1.0 - level)/2;
Double_t kappa = ROOT::Math::normal_quantile(1 - alpha,1);
@@ -1134,8 +1134,8 @@ Double_t TEfficiency::AgrestiCoull(Int_t total,Int_t passed,Double_t level,Bool_
}
//______________________________________________________________________________
-Double_t TEfficiency::FeldmanCousins(Int_t total,Int_t passed,Double_t level,Bool_t bUpper)
-{
+Double_t TEfficiency::FeldmanCousins(Int_t total,Int_t passed,Double_t level,Bool_t bUpper)
+{
//calculates the boundaries for the frequentist Feldman-Cousins interval
//
//Input: - total : number of total events
@@ -1145,12 +1145,12 @@ Double_t TEfficiency::FeldmanCousins(Int_t total,Int_t passed,Double_t level,Boo
// false - lower boundary is returned
//
//
- Double_t lower = 0;
+ Double_t lower = 0;
Double_t upper = 1;
- if (!FeldmanCousinsInterval(total,passed,level, lower, upper)) {
+ if (!FeldmanCousinsInterval(total,passed,level, lower, upper)) {
::Error("FeldmanCousins","Error running FC method - return 0 or 1");
}
- return (bUpper) ? upper : lower;
+ return (bUpper) ? upper : lower;
}
Bool_t TEfficiency::FeldmanCousinsInterval(Int_t total,Int_t passed,Double_t level,Double_t & lower, Double_t & upper)
{
@@ -1159,19 +1159,19 @@ Bool_t TEfficiency::FeldmanCousinsInterval(Int_t total,Int_t passed,Double_t lev
//Input: - total : number of total events
// - passed: 0 <= number of passed events <= total
// - level : confidence level
- //Output:
+ //Output:
// - lower : lower boundary returned on exit
// - upper : lower boundary returned on exit
//
- //Return a flag with the status of the calculation
- //
- // Calculation:
- // The Feldman-Cousins is a frequentist method where the interval is estimated using a Neyman construction where the ordering
- // is based on the likelihood ratio:
+ //Return a flag with the status of the calculation
+ //
+ // Calculation:
+ // The Feldman-Cousins is a frequentist method where the interval is estimated using a Neyman construction where the ordering
+ // is based on the likelihood ratio:
//Begin_Latex(separator='=',align='rl')
// LR = #frac{Binomial(k | N, #epsilon)}{Binomial(k | N, #hat{#epsilon} ) }
//End_Latex
- //See G. J. Feldman and R. D. Cousins, Phys. Rev. D57 (1998) 3873
+ //See G. J. Feldman and R. D. Cousins, Phys. Rev. D57 (1998) 3873
// and R. D. Cousins, K. E. Hymes, J. Tucker, Nuclear Instruments and Methods in Physics Research A 612 (2010) 388
//
// Implemented using classes developed by Jordan Tucker and Luca Lista
@@ -1199,9 +1199,9 @@ Double_t TEfficiency::Bayesian(Int_t total,Int_t passed,Double_t level,Double_t
// - bUpper: true - upper boundary is returned
// false - lower boundary is returned
//
- //Note: In the case central confidence interval is calculated.
- // when passed = 0 (or passed = total) the lower (or upper)
- // interval values will be larger than 0 (or smaller than 1).
+ //Note: In the case central confidence interval is calculated.
+ // when passed = 0 (or passed = total) the lower (or upper)
+ // interval values will be larger than 0 (or smaller than 1).
//
//Calculation:
//
@@ -1216,26 +1216,26 @@ Double_t TEfficiency::Bayesian(Int_t total,Int_t passed,Double_t level,Double_t
//Begin_Latex Prior(#varepsilon) = #frac{1}{B(#alpha,#beta)} #varepsilon ^{#alpha - 1} (1 - #varepsilon)^{#beta - 1}End_Latex
//The posterior probability is therefore again given by a beta distribution:
//Begin_Latex P(#varepsilon |k,N) #propto #varepsilon ^{k + #alpha - 1} (1 - #varepsilon)^{N - k + #beta - 1} End_Latex
- //In case of central intervals
+ //In case of central intervals
//the lower boundary for the equal-tailed confidence interval is given by the
//inverse cumulative (= quantile) function for the quantile Begin_Latex #frac{1 - level}{2} End_Latex.
//The upper boundary for the equal-tailed confidence interval is given by the
//inverse cumulative (= quantile) function for the quantile Begin_Latex #frac{1 + level}{2} End_Latex.
//Hence it is the solution Begin_Latex #varepsilon End_Latex of the following equation:
//Begin_Latex I_{#varepsilon}(k + #alpha,N - k + #beta) = #frac{1}{norm} #int_{0}^{#varepsilon} dt t^{k + #alpha - 1} (1 - t)^{N - k + #beta - 1} = #frac{1 #pm level}{2} End_Latex
- // In the case of shortest interval the minimum interval aorund the mode is found by minimizing the length of all intervals whith the
+ // In the case of shortest interval the minimum interval aorund the mode is found by minimizing the length of all intervals whith the
// given probability content. See TEfficiency::BetaShortestInterval
Double_t a = double(passed)+alpha;
Double_t b = double(total-passed)+beta;
- if (bShortest) {
- double lower = 0;
+ if (bShortest) {
+ double lower = 0;
double upper = 1;
BetaShortestInterval(level,a,b,lower,upper);
- return (bUpper) ? upper : lower;
+ return (bUpper) ? upper : lower;
}
- else
+ else
return BetaCentralInterval(level, a, b, bUpper);
}
//______________________________________________________________________________
@@ -1245,43 +1245,43 @@ Double_t TEfficiency::BetaCentralInterval(Double_t level,Double_t a,Double_t b,B
//
//Input: - level : confidence level
// - a : parameter > 0 for the beta distribution (for a posterior is passed + prior_alpha
- // - b : parameter > 0 for the beta distribution (for a posterior is (total-passed) + prior_beta
+ // - b : parameter > 0 for the beta distribution (for a posterior is (total-passed) + prior_beta
// - bUpper: true - upper boundary is returned
// false - lower boundary is returned
//
if(bUpper) {
if((a > 0) && (b > 0))
- return ROOT::Math::beta_quantile((1+level)/2,a,b);
- else {
+ return ROOT::Math::beta_quantile((1+level)/2,a,b);
+ else {
gROOT->Error("TEfficiency::BayesianCentral","Invalid input parameters - return 1");
- return 1;
+ return 1;
}
}
else {
if((a > 0) && (b > 0))
- return ROOT::Math::beta_quantile((1-level)/2,a,b);
+ return ROOT::Math::beta_quantile((1-level)/2,a,b);
else {
gROOT->Error("TEfficiency::BayesianCentral","Invalid input parameters - return 0");
- return 0;
+ return 0;
}
}
}
-struct Beta_interval_length {
- Beta_interval_length(Double_t level,Double_t alpha,Double_t beta ) :
- fCL(level), fAlpha(alpha), fBeta(beta)
+struct Beta_interval_length {
+ Beta_interval_length(Double_t level,Double_t alpha,Double_t beta ) :
+ fCL(level), fAlpha(alpha), fBeta(beta)
{}
- Double_t LowerMax() {
- // max allowed value of lower given the interval size
+ Double_t LowerMax() {
+ // max allowed value of lower given the interval size
return ROOT::Math::beta_quantile_c(fCL, fAlpha,fBeta);
}
Double_t operator() (double lower) const {
// return length of interval
- Double_t plow = ROOT::Math::beta_cdf(lower, fAlpha, fBeta);
- Double_t pup = plow + fCL;
+ Double_t plow = ROOT::Math::beta_cdf(lower, fAlpha, fBeta);
+ Double_t pup = plow + fCL;
double upper = ROOT::Math::beta_quantile(pup, fAlpha,fBeta);
return upper-lower;
}
@@ -1298,29 +1298,29 @@ Bool_t TEfficiency::BetaShortestInterval(Double_t level,Double_t a,Double_t b, D
//
//Input: - level : confidence level
// - a : parameter > 0 for the beta distribution (for a posterior is passed + prior_alpha
- // - b : parameter > 0 for the beta distribution (for a posterior is (total-passed) + prior_beta
+ // - b : parameter > 0 for the beta distribution (for a posterior is (total-passed) + prior_beta
// - bUpper: true - upper boundary is returned
// false - lower boundary is returned
//
//
- //The lower/upper boundary are then obtained by finding the shortest interval of the beta distribbution
- // contained the desired probability level.
+ //The lower/upper boundary are then obtained by finding the shortest interval of the beta distribbution
+ // contained the desired probability level.
// The length of all possible intervals is minimized in order to find the shortest one
if (a <= 0 || b <= 0) {
- lower = 0; upper = 1;
+ lower = 0; upper = 1;
gROOT->Error("TEfficiency::BayesianShortest","Invalid input parameters - return [0,1]");
- return kFALSE;
+ return kFALSE;
}
// treat here special cases when mode == 0 or 1
double mode = BetaMode(a,b);
- if (mode == 0.0) {
- lower = 0;
+ if (mode == 0.0) {
+ lower = 0;
upper = ROOT::Math::beta_quantile(level, a, b);
return kTRUE;
- }
- if (mode == 1.0) {
+ }
+ if (mode == 1.0) {
lower = ROOT::Math::beta_quantile_c(level, a, b);
upper = 1.0;
return kTRUE;
@@ -1328,7 +1328,7 @@ Bool_t TEfficiency::BetaShortestInterval(Double_t level,Double_t a,Double_t b, D
// special case when the shortest interval is undefined return the central interval
// can happen for a posterior when passed=total=0
//
- if ( a==b && a<=1.0) {
+ if ( a==b && a<=1.0) {
lower = BetaCentralInterval(level,a,b,kFALSE);
upper = BetaCentralInterval(level,a,b,kTRUE);
return kTRUE;
@@ -1343,8 +1343,8 @@ Bool_t TEfficiency::BetaShortestInterval(Double_t level,Double_t a,Double_t b, D
minim.SetFunction(func, 0, intervalLength.LowerMax() );
minim.SetNpx(2); // no need to bracket with many iterations. Just do few times to estimate some better points
bool ret = minim.Minimize(100, 1.E-10,1.E-10);
- if (!ret) {
- gROOT->Error("TEfficiency::BayesianShortes","Error finding the shortest interval");
+ if (!ret) {
+ gROOT->Error("TEfficiency::BayesianShortes","Error finding the shortest interval");
return kFALSE;
}
lower = minim.XMinimum();
@@ -1358,16 +1358,16 @@ Double_t TEfficiency::BetaMean(Double_t a,Double_t b)
// compute the mean (average) of the beta distribution
//
//Input: a : parameter > 0 for the beta distribution (for a posterior is passed + prior_alpha
- // b : parameter > 0 for the beta distribution (for a posterior is (total-passed) + prior_beta
+ // b : parameter > 0 for the beta distribution (for a posterior is (total-passed) + prior_beta
//
- if (a <= 0 || b <= 0 ) {
+ if (a <= 0 || b <= 0 ) {
gROOT->Error("TEfficiency::BayesianMean","Invalid input parameters - return 0");
return 0;
}
Double_t mean = a / (a + b);
- return mean;
+ return mean;
}
//______________________________________________________________________________
@@ -1376,27 +1376,27 @@ Double_t TEfficiency::BetaMode(Double_t a,Double_t b)
// compute the mode of the beta distribution
//
//Input: a : parameter > 0 for the beta distribution (for a posterior is passed + prior_alpha
- // b : parameter > 0 for the beta distribution (for a posterior is (total-passed) + prior_beta
+ // b : parameter > 0 for the beta distribution (for a posterior is (total-passed) + prior_beta
//
// note the mode is defined for a Beta(a,b) only if (a,b)>1 (a = passed+alpha; b = total-passed+beta)
- // return then the following in case (a,b) < 1:
+ // return then the following in case (a,b) < 1:
// if (a==b) return 0.5 (it is really undefined)
// if (a < b) return 0;
// if (a > b) return 1;
- if (a <= 0 || b <= 0 ) {
+ if (a <= 0 || b <= 0 ) {
gROOT->Error("TEfficiency::BayesianMode","Invalid input parameters - return 0");
return 0;
}
if ( a <= 1 || b <= 1) {
if ( a < b) return 0;
- if ( a > b) return 1;
+ if ( a > b) return 1;
if (a == b) return 0.5; // cannot do otherwise
}
-
+
// since a and b are > 1 here denominator cannot be 0 or < 0
Double_t mode = (a - 1.0) / (a + b -2.0);
- return mode;
+ return mode;
}
//______________________________________________________________________________
void TEfficiency::Build(const char* name,const char* title)
@@ -1407,7 +1407,7 @@ void TEfficiency::Build(const char* name,const char* title)
// - set the statistic option to the default (kFCP)
// - appends this object to the current directory
// SetDirectory(gDirectory)
-
+
SetName(name);
SetTitle(title);
@@ -1417,7 +1417,7 @@ void TEfficiency::Build(const char* name,const char* title)
SetBit(kPosteriorMode,false);
SetBit(kShortestInterval,false);
SetBit(kUseWeights,false);
-
+
//set normalisation factors to 0, otherwise the += may not work properly
fPassedHistogram->SetNormFactor(0);
fTotalHistogram->SetNormFactor(0);
@@ -1429,36 +1429,36 @@ Bool_t TEfficiency::CheckBinning(const TH1& pass,const TH1& total)
//checks binning for each axis
//
//It is assumed that the passed histograms have the same dimension.
-
+
TAxis* ax1 = 0;
TAxis* ax2 = 0;
-
+
//check binning along axis
for(Int_t j = 0; j < pass.GetDimension(); ++j) {
switch(j) {
- case 0:
- ax1 = pass.GetXaxis();
- ax2 = total.GetXaxis();
- break;
- case 1:
- ax1 = pass.GetYaxis();
- ax2 = total.GetYaxis();
- break;
- case 2:
- ax1 = pass.GetZaxis();
- ax2 = total.GetZaxis();
- break;
+ case 0:
+ ax1 = pass.GetXaxis();
+ ax2 = total.GetXaxis();
+ break;
+ case 1:
+ ax1 = pass.GetYaxis();
+ ax2 = total.GetYaxis();
+ break;
+ case 2:
+ ax1 = pass.GetZaxis();
+ ax2 = total.GetZaxis();
+ break;
}
-
+
if(ax1->GetNbins() != ax2->GetNbins()) {
gROOT->Info("TEfficiency::CheckBinning","Histograms are not consistent: they have different number of bins");
- return false;
+ return false;
}
for(Int_t i = 1; i <= ax1->GetNbins() + 1; ++i)
if(!TMath::AreEqualRel(ax1->GetBinLowEdge(i), ax2->GetBinLowEdge(i), 1.E-15)) {
gROOT->Info("TEfficiency::CheckBinning","Histograms are not consistent: they have different bin edges");
- return false;
+ return false;
}
if(!TMath::AreEqualRel(ax1->GetXmax(), ax2->GetXmax(), 1.E-15)) {
@@ -1484,12 +1484,12 @@ Bool_t TEfficiency::CheckConsistency(const TH1& pass,const TH1& total,Option_t*
//
//Option: - w: The check for unit weights is skipped and therefore histograms
// filled with weights are accepted.
-
+
if(pass.GetDimension() != total.GetDimension()) {
gROOT->Error("TEfficiency::CheckConsistency","passed TEfficiency objects have different dimensions");
return false;
}
-
+
if(!CheckBinning(pass,total)) {
gROOT->Error("TEfficiency::CheckConsistency","passed TEfficiency objects have different binning");
return false;
@@ -1523,7 +1523,7 @@ Bool_t TEfficiency::CheckEntries(const TH1& pass,const TH1& total,Option_t* opt)
option.ToLower();
//check for unit weights
- if(!option.Contains("w")) {
+ if(!option.Contains("w")) {
Double_t statpass[TH1::kNstat];
Double_t stattotal[TH1::kNstat];
@@ -1532,12 +1532,12 @@ Bool_t TEfficiency::CheckEntries(const TH1& pass,const TH1& total,Option_t* opt)
//require: sum of weights == sum of weights^2
if((TMath::Abs(statpass[0]-statpass[1]) > 1e-5) ||
- (TMath::Abs(stattotal[0]-stattotal[1]) > 1e-5)) {
+ (TMath::Abs(stattotal[0]-stattotal[1]) > 1e-5)) {
gROOT->Info("TEfficiency::CheckEntries","Histograms are filled with weights");
- return false;
+ return false;
}
}
-
+
//check: pass <= total
Int_t nbinsx, nbinsy, nbinsz, nbins;
@@ -1546,16 +1546,16 @@ Bool_t TEfficiency::CheckEntries(const TH1& pass,const TH1& total,Option_t* opt)
nbinsz = pass.GetNbinsZ();
switch(pass.GetDimension()) {
- case 1: nbins = nbinsx + 2; break;
- case 2: nbins = (nbinsx + 2) * (nbinsy + 2); break;
- case 3: nbins = (nbinsx + 2) * (nbinsy + 2) * (nbinsz + 2); break;
- default: nbins = 0;
+ case 1: nbins = nbinsx + 2; break;
+ case 2: nbins = (nbinsx + 2) * (nbinsy + 2); break;
+ case 3: nbins = (nbinsx + 2) * (nbinsy + 2) * (nbinsz + 2); break;
+ default: nbins = 0;
}
-
+
for(Int_t i = 0; i < nbins; ++i) {
if(pass.GetBinContent(i) > total.GetBinContent(i)) {
gROOT->Info("TEfficiency::CheckEntries","Histograms are not consistent: passed bin content > total bin content");
- return false;
+ return false;
}
}
@@ -1564,46 +1564,46 @@ Bool_t TEfficiency::CheckEntries(const TH1& pass,const TH1& total,Option_t* opt)
//______________________________________________________________________________
TGraphAsymmErrors * TEfficiency::CreateGraph(Option_t * opt) const
-{
+{
// Create the graph used be painted (for dim=1 TEfficiency)
- // The return object is managed by the caller
-
- if (GetDimension() != 1) {
+ // The return object is managed by the caller
+
+ if (GetDimension() != 1) {
Error("CreatePaintingGraph","Call this function only for dimension == 1");
- return 0;
+ return 0;
}
Int_t npoints = fTotalHistogram->GetNbinsX();
- TGraphAsymmErrors * graph = new TGraphAsymmErrors(npoints);
+ TGraphAsymmErrors * graph = new TGraphAsymmErrors(npoints);
graph->SetName("eff_graph");
- FillGraph(graph,opt);
+ FillGraph(graph,opt);
return graph;
}
-
+
//______________________________________________________________________________
void TEfficiency::FillGraph(TGraphAsymmErrors * graph, Option_t * opt) const
-{
+{
// Fill the graph to be painted with information from TEfficiency
// Internal metyhod called by TEfficiency::Paint or TEfficiency::CreateGraph
TString option = opt;
option.ToLower();
- Bool_t plot0Bins = false;
- if (option.Contains("e0") ) plot0Bins = true;
-
+ Bool_t plot0Bins = false;
+ if (option.Contains("e0") ) plot0Bins = true;
+
Double_t x,y,xlow,xup,ylow,yup;
- //point i corresponds to bin i+1 in histogram
+ //point i corresponds to bin i+1 in histogram
// point j is point graph index
// LM: cannot use TGraph::SetPoint because it deletes the underlying
- // histogram each time (see TGraph::SetPoint)
+ // histogram each time (see TGraph::SetPoint)
// so use it only when extra points are added to the graph
Int_t j = 0;
double * px = graph->GetX();
- double * py = graph->GetY();
+ double * py = graph->GetY();
double * exl = graph->GetEXlow();
double * exh = graph->GetEXhigh();
double * eyl = graph->GetEYlow();
@@ -1617,26 +1617,26 @@ void TEfficiency::FillGraph(TGraphAsymmErrors * graph, Option_t * opt) const
xup = fTotalHistogram->GetBinWidth(i+1) - xlow;
ylow = GetEfficiencyErrorLow(i+1);
yup = GetEfficiencyErrorUp(i+1);
- // in the case the graph already existed and extra points have been added
- if (j >= graph->GetN() ) {
+ // in the case the graph already existed and extra points have been added
+ if (j >= graph->GetN() ) {
graph->SetPoint(j,x,y);
graph->SetPointError(j,xlow,xup,ylow,yup);
}
- else {
+ else {
px[j] = x;
py[j] = y;
exl[j] = xlow;
- exh[j] = xup;
- eyl[j] = ylow;
+ exh[j] = xup;
+ eyl[j] = ylow;
eyh[j] = yup;
}
j++;
}
-
- // tell the graph the effective number of points
+
+ // tell the graph the effective number of points
graph->Set(j);
- //refresh title before painting if changed
- TString oldTitle = graph->GetTitle();
+ //refresh title before painting if changed
+ TString oldTitle = graph->GetTitle();
TString newTitle = GetTitle();
if (oldTitle != newTitle ) {
graph->SetTitle(newTitle);
@@ -1656,18 +1656,18 @@ void TEfficiency::FillGraph(TGraphAsymmErrors * graph, Option_t * opt) const
// this method forces the graph to compute correctly the axis
// according to the given points
graph->GetHistogram();
-
+
}
//______________________________________________________________________________
TH2 * TEfficiency::CreateHistogram(Option_t *) const
-{
+{
// Create the histogram used to be painted (for dim=2 TEfficiency)
- // The return object is managed by the caller
-
- if (GetDimension() != 2) {
+ // The return object is managed by the caller
+
+ if (GetDimension() != 2) {
Error("CreatePaintingistogram","Call this function only for dimension == 2");
- return 0;
+ return 0;
}
Int_t nbinsx = fTotalHistogram->GetNbinsX();
@@ -1676,36 +1676,36 @@ TH2 * TEfficiency::CreateHistogram(Option_t *) const
TAxis * yaxis = fTotalHistogram->GetYaxis();
TH2 * hist = 0;
- if (xaxis->IsVariableBinSize() && yaxis->IsVariableBinSize() )
+ if (xaxis->IsVariableBinSize() && yaxis->IsVariableBinSize() )
hist = new TH2F("eff_histo",GetTitle(),nbinsx,xaxis->GetXbins()->GetArray(),
- nbinsy,yaxis->GetXbins()->GetArray());
+ nbinsy,yaxis->GetXbins()->GetArray());
else if (xaxis->IsVariableBinSize() && ! yaxis->IsVariableBinSize() )
hist = new TH2F("eff_histo",GetTitle(),nbinsx,xaxis->GetXbins()->GetArray(),
- nbinsy,yaxis->GetXmin(), yaxis->GetXmax());
+ nbinsy,yaxis->GetXmin(), yaxis->GetXmax());
else if (!xaxis->IsVariableBinSize() && yaxis->IsVariableBinSize() )
hist = new TH2F("eff_histo",GetTitle(),nbinsx,xaxis->GetXmin(), xaxis->GetXmax(),
- nbinsy,yaxis->GetXbins()->GetArray());
- else
+ nbinsy,yaxis->GetXbins()->GetArray());
+ else
hist = new TH2F("eff_histo",GetTitle(),nbinsx,xaxis->GetXmin(), xaxis->GetXmax(),
- nbinsy,yaxis->GetXmin(), yaxis->GetXmax());
-
+ nbinsy,yaxis->GetXmin(), yaxis->GetXmax());
+
hist->SetDirectory(0);
FillHistogram(hist);
-
- return hist;
+
+ return hist;
}
//______________________________________________________________________________
void TEfficiency::FillHistogram(TH2 * hist ) const
-{
+{
// Fill the 2d histogram to be painted with information from TEfficiency 2D
// Internal metyhod called by TEfficiency::Paint or TEfficiency::CreatePaintingGraph
//refresh title before each painting
hist->SetTitle(GetTitle());
-
+
// set the axis labels
TString xlabel = fTotalHistogram->GetXaxis()->GetTitle();
TString ylabel = fTotalHistogram->GetYaxis()->GetTitle();
@@ -1721,13 +1721,13 @@ void TEfficiency::FillHistogram(TH2 * hist ) const
hist->SetBinContent(bin,GetEfficiency(bin));
}
}
-
+
//copying style information
TAttLine::Copy(*hist);
TAttFill::Copy(*hist);
TAttMarker::Copy(*hist);
hist->SetStats(0);
-
+
return;
}
@@ -1774,7 +1774,7 @@ Double_t TEfficiency::ClopperPearson(Int_t total,Int_t passed,Double_t level,Boo
//
//Note: The connection between the binomial distribution and the regularized
// incomplete beta function Begin_Latex I_{#varepsilon}(#alpha,#beta)End_Latex has been used.
-
+
Double_t alpha = (1.0 - level) / 2;
if(bUpper)
return ((passed == total) ? 1.0 : ROOT::Math::beta_quantile(1 - alpha,passed + 1,total-passed));
@@ -1783,9 +1783,9 @@ Double_t TEfficiency::ClopperPearson(Int_t total,Int_t passed,Double_t level,Boo
}
//______________________________________________________________________________
Double_t TEfficiency::Combine(Double_t& up,Double_t& low,Int_t n,
- const Int_t* pass,const Int_t* total,
- Double_t alpha, Double_t beta,
- Double_t level,const Double_t* w,Option_t* opt)
+ const Int_t* pass,const Int_t* total,
+ Double_t alpha, Double_t beta,
+ Double_t level,const Double_t* w,Option_t* opt)
{
//calculates the combined efficiency and its uncertainties
//
@@ -1802,8 +1802,8 @@ Double_t TEfficiency::Combine(Double_t& up,Double_t& low,Int_t n,
//- beta : shape parameters for the beta distribution as prior
//- level : desired confidence level
//- w : weights for each sample; if not given, all samples get the weight 1
- // The weights do not need to be normalized, since they are internally renormalized
- // to the number of effective entries.
+ // The weights do not need to be normalized, since they are internally renormalized
+ // to the number of effective entries.
//- options:
//
// + mode : The mode is returned instead of the mean of the posterior as best value
@@ -1814,12 +1814,12 @@ Double_t TEfficiency::Combine(Double_t& up,Double_t& low,Int_t n,
//Begin_Html
//Calculation:
//<ol>
- //<li>The combined posterior distributions is calculated from the Bayes theorem assuming a common prior Beta distribution.
- // It is easy to proof that the combined posterior is then:</li>
+ //<li>The combined posterior distributions is calculated from the Bayes theorem assuming a common prior Beta distribution.
+ // It is easy to proof that the combined posterior is then:</li>
//Begin_Latex(separator='=',align='rl')
- //P_{comb}(#epsilon |{w_{i}}; {k_{i}}; {N_{i}}) = B(#epsilon, #sum_{i}{ w_{i} k_{i}} + #alpha, #sum_{i}{ w_{i}(n_{i}-k_{i})}+#beta)
- //w_{i} = weight for each sample renormalized to the effective entries
- //w^{'}_{i} = w_{i} #frac{ #sum_{i} {w_{i} } } { #sum_{i} {w_{i}^{2} } }
+ //P_{comb}(#epsilon |{w_{i}}; {k_{i}}; {N_{i}}) = B(#epsilon, #sum_{i}{ w_{i} k_{i}} + #alpha, #sum_{i}{ w_{i}(n_{i}-k_{i})}+#beta)
+ //w_{i} = weight for each sample renormalized to the effective entries
+ //w^{'}_{i} = w_{i} #frac{ #sum_{i} {w_{i} } } { #sum_{i} {w_{i}^{2} } }
//End_Latex
//Begin_Html
//<li>The estimated efficiency is the mode (or the mean) of the obtained posterior distribution </li>
@@ -1867,9 +1867,9 @@ Double_t TEfficiency::Combine(Double_t& up,Double_t& low,Int_t n,
// const1->SetLineWidth(1);
// const2->SetLineWidth(1);
// TGraph* gr = (TGraph*)comb->DrawIntegral();
- // gr->SetTitle("cumulative function of combined posterior with boundaries for cl = 95%;#epsilon;CDF");
+ // gr->SetTitle("cumulative function of combined posterior with boundaries for cl = 95%;#epsilon;CDF");
// const1->Draw("same");
- // const2->Draw("same");
+ // const2->Draw("same");
//
// c1->cd(0);
// return c1;
@@ -1879,60 +1879,60 @@ Double_t TEfficiency::Combine(Double_t& up,Double_t& low,Int_t n,
TString option(opt);
option.ToLower();
- //LM: new formula for combination
+ //LM: new formula for combination
// works only if alpha beta are the same always
- // the weights are normalized to w(i) -> N_eff w(i)/ Sum w(i)
- // i.e. w(i) -> Sum (w(i) / Sum (w(i)^2) * w(i)
- // norm = Sum (w(i) / Sum (w(i)^2)
- double ntot = 0;
- double ktot = 0;
+ // the weights are normalized to w(i) -> N_eff w(i)/ Sum w(i)
+ // i.e. w(i) -> Sum (w(i) / Sum (w(i)^2) * w(i)
+ // norm = Sum (w(i) / Sum (w(i)^2)
+ double ntot = 0;
+ double ktot = 0;
double sumw = 0;
double sumw2 = 0;
- for (int i = 0; i < n ; ++i) {
+ for (int i = 0; i < n ; ++i) {
if(pass[i] > total[i]) {
- ::Error("TEfficiency::Combine","total events = %i < passed events %i",total[i],pass[i]);
- ::Info("TEfficiency::Combine","stop combining");
- return -1;
+ ::Error("TEfficiency::Combine","total events = %i < passed events %i",total[i],pass[i]);
+ ::Info("TEfficiency::Combine","stop combining");
+ return -1;
}
- ntot += w[i] * total[i];
- ktot += w[i] * pass[i];
- sumw += w[i];
- sumw2 += w[i]*w[i];
+ ntot += w[i] * total[i];
+ ktot += w[i] * pass[i];
+ sumw += w[i];
+ sumw2 += w[i]*w[i];
//mean += w[i] * (pass[i] + alpha[i])/(total[i] + alpha[i] + beta[i]);
- }
+ }
double norm = sumw/sumw2;
ntot *= norm;
- ktot *= norm;
+ ktot *= norm;
if(ktot > ntot) {
::Error("TEfficiency::Combine","total = %f < passed %f",ntot,ktot);
::Info("TEfficiency::Combine","stop combining");
return -1;
}
- double a = ktot + alpha;
- double b = ntot - ktot + beta;
+ double a = ktot + alpha;
+ double b = ntot - ktot + beta;
- double mean = a/(a+b);
+ double mean = a/(a+b);
double mode = BetaMode(a,b);
- Bool_t shortestInterval = option.Contains("sh") || ( option.Contains("mode") && !option.Contains("cent") );
+ Bool_t shortestInterval = option.Contains("sh") || ( option.Contains("mode") && !option.Contains("cent") );
- if (shortestInterval)
- BetaShortestInterval(level, a, b, low, up);
+ if (shortestInterval)
+ BetaShortestInterval(level, a, b, low, up);
else {
- low = BetaCentralInterval(level, a, b, false);
- up = BetaCentralInterval(level, a, b, true);
+ low = BetaCentralInterval(level, a, b, false);
+ up = BetaCentralInterval(level, a, b, true);
}
- if (option.Contains("mode")) return mode;
- return mean;
+ if (option.Contains("mode")) return mode;
+ return mean;
}
//______________________________________________________________________________
TGraphAsymmErrors* TEfficiency::Combine(TCollection* pList,Option_t* option,
- Int_t n,const Double_t* w)
+ Int_t n,const Double_t* w)
{
//combines a list of 1-dimensional TEfficiency objects
//
@@ -1945,17 +1945,17 @@ TGraphAsymmErrors* TEfficiency::Combine(TCollection* pList,Option_t* option,
//Input:
//- pList : list containing TEfficiency objects which should be combined
// only one-dimensional efficiencies are taken into account
- //- options
+ //- options
// + s : strict combining; only TEfficiency objects with the same beta
// prior and the flag kIsBayesian == true are combined
- // If not specified the prior parameter of the first TEfficiency object is used
+ // If not specified the prior parameter of the first TEfficiency object is used
// + v : verbose mode; print information about combining
// + cl=x : set confidence level (0 < cl < 1). If not specified, the
// confidence level of the first TEfficiency object is used.
// + mode Use mode of combined posterior as estimated value for the efficiency
// + shortest: compute shortest interval (done by default if mode option is set)
// + central: compute central interval (done by default if mode option is NOT set)
- //
+ //
//- n : number of weights (has to be the number of one-dimensional
// TEfficiency objects in pList)
// If no weights are passed, the internal weights GetWeight() of
@@ -1965,7 +1965,7 @@ TGraphAsymmErrors* TEfficiency::Combine(TCollection* pList,Option_t* option,
// The weights do not have to be normalised.
//
//For each bin the calculation is done by the Combine(double&, double& ...) method.
-
+
TString opt = option;
opt.ToLower();
@@ -1973,17 +1973,17 @@ TGraphAsymmErrors* TEfficiency::Combine(TCollection* pList,Option_t* option,
Double_t alpha = -1;
Double_t beta = -1;
Double_t level = 0;
-
+
//flags for combining
Bool_t bStrict = false;
Bool_t bOutput = false;
Bool_t bWeights = false;
//list of all information needed to weight and combine efficiencies
- std::vector<TH1*> vTotal; vTotal.reserve(n);
- std::vector<TH1*> vPassed; vPassed.reserve(n);
+ std::vector<TH1*> vTotal; vTotal.reserve(n);
+ std::vector<TH1*> vPassed; vPassed.reserve(n);
std::vector<Double_t> vWeights; vWeights.reserve(n);
-// std::vector<Double_t> vAlpha;
-// std::vector<Double_t> vBeta;
+ // std::vector<Double_t> vAlpha;
+ // std::vector<Double_t> vBeta;
if(opt.Contains("s")) {
opt.ReplaceAll("s","");
@@ -1996,10 +1996,10 @@ TGraphAsymmErrors* TEfficiency::Combine(TCollection* pList,Option_t* option,
}
if(opt.Contains("cl=")) {
- Ssiz_t pos = opt.Index("cl=") + 3;
+ Ssiz_t pos = opt.Index("cl=") + 3;
level = atof( opt(pos,opt.Length() ).Data() );
if((level <= 0) || (level >= 1))
- level = 0;
+ level = 0;
opt.ReplaceAll("cl=","");
}
@@ -2007,16 +2007,16 @@ TGraphAsymmErrors* TEfficiency::Combine(TCollection* pList,Option_t* option,
if(n && w) {
bWeights = true;
for(Int_t k = 0; k < n; ++k) {
- if(w[k] > 0)
- vWeights.push_back(w[k]);
- else {
- gROOT->Error("TEfficiency::Combine","invalid custom weight found w = %.2lf",w[k]);
- gROOT->Info("TEfficiency::Combine","stop combining");
- return 0;
- }
+ if(w[k] > 0)
+ vWeights.push_back(w[k]);
+ else {
+ gROOT->Error("TEfficiency::Combine","invalid custom weight found w = %.2lf",w[k]);
+ gROOT->Info("TEfficiency::Combine","stop combining");
+ return 0;
+ }
}
}
-
+
TIter next(pList);
TObject* obj = 0;
TEfficiency* pEff = 0;
@@ -2024,39 +2024,39 @@ TGraphAsymmErrors* TEfficiency::Combine(TCollection* pList,Option_t* option,
pEff = dynamic_cast<TEfficiency*>(obj);
//is object a TEfficiency object?
if(pEff) {
- if(pEff->GetDimension() > 1)
- continue;
- if(!level) level = pEff->GetConfidenceLevel();
+ if(pEff->GetDimension() > 1)
+ continue;
+ if(!level) level = pEff->GetConfidenceLevel();
if(alpha<1) alpha = pEff->GetBetaAlpha();
if(beta<1) beta = pEff->GetBetaBeta();
-
- //if strict combining, check priors, confidence level and statistic
- if(bStrict) {
+
+ //if strict combining, check priors, confidence level and statistic
+ if(bStrict) {
if(alpha != pEff->GetBetaAlpha())
- continue;
- if(beta != pEff->GetBetaBeta())
- continue;
- if(!pEff->UsesBayesianStat())
- continue;
- }
-
- vTotal.push_back(pEff->fTotalHistogram);
- vPassed.push_back(pEff->fPassedHistogram);
-
- //no weights given -> use weights of TEfficiency objects
- if(!bWeights)
- vWeights.push_back(pEff->fWeight);
-
- //strict combining -> using global prior
-// if(bStrict) {
-// vAlpha.push_back(alpha);
-// vBeta.push_back(beta);
-// }
-// else {
-// vAlpha.push_back(pEff->GetBetaAlpha());
-// vBeta.push_back(pEff->GetBetaBeta());
-// }
+ continue;
+ if(beta != pEff->GetBetaBeta())
+ continue;
+ if(!pEff->UsesBayesianStat())
+ continue;
+ }
+
+ vTotal.push_back(pEff->fTotalHistogram);
+ vPassed.push_back(pEff->fPassedHistogram);
+
+ //no weights given -> use weights of TEfficiency objects
+ if(!bWeights)
+ vWeights.push_back(pEff->fWeight);
+
+ //strict combining -> using global prior
+ // if(bStrict) {
+ // vAlpha.push_back(alpha);
+ // vBeta.push_back(beta);
+ // }
+ // else {
+ // vAlpha.push_back(pEff->GetBetaAlpha());
+ // vBeta.push_back(pEff->GetBetaBeta());
+ // }
}
}
@@ -2078,7 +2078,7 @@ TGraphAsymmErrors* TEfficiency::Combine(TCollection* pList,Option_t* option,
//check binning of all histograms
for(UInt_t i=0; i<vTotal.size(); ++i) {
if (!TEfficiency::CheckBinning(*vTotal.at(0),*vTotal.at(i)) )
- gROOT->Warning("TEfficiency::Combine","histograms have not the same binning -> results may be useless");
+ gROOT->Warning("TEfficiency::Combine","histograms have not the same binning -> results may be useless");
if(vTotal.at(i)->GetNbinsX() < nbins_max) nbins_max = vTotal.at(i)->GetNbinsX();
}
@@ -2086,12 +2086,12 @@ TGraphAsymmErrors* TEfficiency::Combine(TCollection* pList,Option_t* option,
if(bOutput) {
gROOT->Info("TEfficiency::Combine","combining %i TEfficiency objects",(Int_t)vTotal.size());
if(bWeights)
- gROOT->Info("TEfficiency::Combine","using custom weights");
+ gROOT->Info("TEfficiency::Combine","using custom weights");
if(bStrict) {
- gROOT->Info("TEfficiency::Combine","using the following prior probability for the efficiency: P(e) ~ Beta(e,%.3lf,%.3lf)",alpha,beta);
+ gROOT->Info("TEfficiency::Combine","using the following prior probability for the efficiency: P(e) ~ Beta(e,%.3lf,%.3lf)",alpha,beta);
}
else
- gROOT->Info("TEfficiency::Combine","using individual priors of each TEfficiency object");
+ gROOT->Info("TEfficiency::Combine","using individual priors of each TEfficiency object");
gROOT->Info("TEfficiency::Combine","confidence level = %.2lf",level);
}
@@ -2099,16 +2099,16 @@ TGraphAsymmErrors* TEfficiency::Combine(TCollection* pList,Option_t* option,
std::vector<Double_t> x(nbins_max);
std::vector<Double_t> xlow(nbins_max);
std::vector<Double_t> xhigh(nbins_max);
- std::vector<Double_t> eff(nbins_max);
+ std::vector<Double_t> eff(nbins_max);
std::vector<Double_t> efflow(nbins_max);
std::vector<Double_t> effhigh(nbins_max);
//parameters for combining:
//number of objects
Int_t num = vTotal.size();
- std::vector<Int_t> pass(num);
- std::vector<Int_t> total(num);
-
+ std::vector<Int_t> pass(num);
+ std::vector<Int_t> total(num);
+
//loop over all bins
Double_t low = 0;
Double_t up = 0;
@@ -2119,17 +2119,17 @@ TGraphAsymmErrors* TEfficiency::Combine(TCollection* pList,Option_t* option,
xhigh[i-1] = vTotal.at(0)->GetBinWidth(i) - xlow[i-1];
for(Int_t j = 0; j < num; ++j) {
- pass[j] = (Int_t)(vPassed.at(j)->GetBinContent(i) + 0.5);
- total[j] = (Int_t)(vTotal.at(j)->GetBinContent(i) + 0.5);
+ pass[j] = (Int_t)(vPassed.at(j)->GetBinContent(i) + 0.5);
+ total[j] = (Int_t)(vTotal.at(j)->GetBinContent(i) + 0.5);
}
-
+
//fill efficiency and errors
eff[i-1] = Combine(up,low,num,&pass[0],&total[0],alpha,beta,level,&vWeights[0],opt.Data());
//did an error occured ?
if(eff[i-1] == -1) {
- gROOT->Error("TEfficiency::Combine","error occured during combining");
- gROOT->Info("TEfficiency::Combine","stop combining");
- return 0;
+ gROOT->Error("TEfficiency::Combine","error occured during combining");
+ gROOT->Info("TEfficiency::Combine","stop combining");
+ return 0;
}
efflow[i-1]= eff[i-1] - low;
effhigh[i-1]= up - eff[i-1];
@@ -2149,7 +2149,7 @@ Int_t TEfficiency::DistancetoPrimitive(Int_t px, Int_t py)
// The distance is computed in pixels units.
//
// Forward the call to the painted graph
-
+
if (fPaintGraph) return fPaintGraph->DistancetoPrimitive(px,py);
if (fPaintHisto) return fPaintHisto->DistancetoPrimitive(px,py);
return 0;
@@ -2162,30 +2162,30 @@ void TEfficiency::Draw(Option_t* opt)
//draws the current TEfficiency object
//
//options:
- //- 1-dimensional case: same options as TGraphAsymmErrors::Draw()
+ //- 1-dimensional case: same options as TGraphAsymmErrors::Draw()
// but as default "AP" is used
//- 2-dimensional case: same options as TH2::Draw()
//- 3-dimensional case: not yet supported
//
- // specific TEfficiency drawing options:
+ // specific TEfficiency drawing options:
// - E0 - plot bins where the total number of passed events is zero
// (the error interval will be [0,1] )
-
+
//check options
TString option = opt;
option.ToLower();
// use by default "AP"
- if (option.IsNull() ) option = "ap";
+ if (option.IsNull() ) option = "ap";
if(gPad && !option.Contains("same"))
gPad->Clear();
- else {
+ else {
// add always "a" if not present
- if (!option.Contains("a") ) option += "a";
+ if (!option.Contains("a") ) option += "a";
}
// add always p to the option
- if (!option.Contains("p") ) option += "p";
+ if (!option.Contains("p") ) option += "p";
AppendPad(option.Data());
@@ -2220,21 +2220,21 @@ void TEfficiency::Fill(Bool_t bPassed,Double_t x,Double_t y,Double_t z)
// z - z value (use default=0 for 2-D or 1-D efficiencies)
switch(GetDimension()) {
- case 1:
- fTotalHistogram->Fill(x);
- if(bPassed)
- fPassedHistogram->Fill(x);
- break;
- case 2:
- ((TH2*)(fTotalHistogram))->Fill(x,y);
- if(bPassed)
- ((TH2*)(fPassedHistogram))->Fill(x,y);
- break;
- case 3:
- ((TH3*)(fTotalHistogram))->Fill(x,y,z);
- if(bPassed)
- ((TH3*)(fPassedHistogram))->Fill(x,y,z);
- break;
+ case 1:
+ fTotalHistogram->Fill(x);
+ if(bPassed)
+ fPassedHistogram->Fill(x);
+ break;
+ case 2:
+ ((TH2*)(fTotalHistogram))->Fill(x,y);
+ if(bPassed)
+ ((TH2*)(fPassedHistogram))->Fill(x,y);
+ break;
+ case 3:
+ ((TH3*)(fTotalHistogram))->Fill(x,y,z);
+ if(bPassed)
+ ((TH3*)(fPassedHistogram))->Fill(x,y,z);
+ break;
}
}
@@ -2253,28 +2253,28 @@ void TEfficiency::FillWeighted(Bool_t bPassed,Double_t weight,Double_t x,Double_
//
//Note: - this function will call SetUseWeightedEvents if it was not called by the user before
- if(!TestBit(kUseWeights))
- {
- Info("FillWeighted","call SetUseWeightedEvents() manually to ensure correct storage of sum of weights squared");
- SetUseWeightedEvents();
- }
-
- switch(GetDimension()) {
- case 1:
- fTotalHistogram->Fill(x,weight);
- if(bPassed)
- fPassedHistogram->Fill(x,weight);
- break;
- case 2:
- ((TH2*)(fTotalHistogram))->Fill(x,y,weight);
- if(bPassed)
- ((TH2*)(fPassedHistogram))->Fill(x,y,weight);
- break;
- case 3:
- ((TH3*)(fTotalHistogram))->Fill(x,y,z,weight);
- if(bPassed)
- ((TH3*)(fPassedHistogram))->Fill(x,y,z,weight);
- break;
+ if(!TestBit(kUseWeights))
+ {
+ Info("FillWeighted","call SetUseWeightedEvents() manually to ensure correct storage of sum of weights squared");
+ SetUseWeightedEvents();
+ }
+
+ switch(GetDimension()) {
+ case 1:
+ fTotalHistogram->Fill(x,weight);
+ if(bPassed)
+ fPassedHistogram->Fill(x,weight);
+ break;
+ case 2:
+ ((TH2*)(fTotalHistogram))->Fill(x,y,weight);
+ if(bPassed)
+ ((TH2*)(fPassedHistogram))->Fill(x,y,weight);
+ break;
+ case 3:
+ ((TH3*)(fTotalHistogram))->Fill(x,y,z,weight);
+ if(bPassed)
+ ((TH3*)(fPassedHistogram))->Fill(x,y,z,weight);
+ break;
}
}
@@ -2286,14 +2286,14 @@ Int_t TEfficiency::FindFixBin(Double_t x,Double_t y,Double_t z) const
//Note: - values which belong to dimensions higher than the current dimension
// of the TEfficiency object are ignored (i.e. for 1-dimensional
// efficiencies only the x-value is considered)
-
+
Int_t nx = fTotalHistogram->GetXaxis()->FindFixBin(x);
Int_t ny = 0;
Int_t nz = 0;
-
+
switch(GetDimension()) {
- case 3: nz = fTotalHistogram->GetZaxis()->FindFixBin(z);
- case 2: ny = fTotalHistogram->GetYaxis()->FindFixBin(y);break;
+ case 3: nz = fTotalHistogram->GetZaxis()->FindFixBin(z);
+ case 2: ny = fTotalHistogram->GetYaxis()->FindFixBin(y);break;
}
return GetGlobalBin(nx,ny,nz);
@@ -2319,31 +2319,31 @@ Int_t TEfficiency::Fit(TF1* f1,Option_t* opt)
option.ReplaceAll("+","");
bDeleteOld = false;
}
-
+
TBinomialEfficiencyFitter Fitter(fPassedHistogram,fTotalHistogram);
-
+
Int_t result = Fitter.Fit(f1,option.Data());
//create copy which is appended to the list
TF1* pFunc = new TF1(*f1);
-
+
if(bDeleteOld) {
TIter next(fFunctions);
TObject* obj = 0;
while((obj = next())) {
- if(obj->InheritsFrom(TF1::Class())) {
- fFunctions->Remove(obj);
- delete obj;
- }
- }
+ if(obj->InheritsFrom(TF1::Class())) {
+ fFunctions->Remove(obj);
+ delete obj;
+ }
+ }
}
// create list if necessary
if(!fFunctions)
- fFunctions = new TList();
-
+ fFunctions = new TList();
+
fFunctions->Add(pFunc);
-
+
return result;
}
@@ -2370,7 +2370,7 @@ TH1* TEfficiency::GetCopyPassedHisto() const
//</pre></div>
//<div class="clear"></div>
//End_Html
-
+
Bool_t bStatus = TH1::AddDirectoryStatus();
TH1::AddDirectory(kFALSE);
TH1* tmp = (TH1*)(fPassedHistogram->Clone());
@@ -2402,7 +2402,7 @@ TH1* TEfficiency::GetCopyTotalHisto() const
//</pre></div>
//<div class="clear"></div>
//End_Html
-
+
Bool_t bStatus = TH1::AddDirectoryStatus();
TH1::AddDirectory(kFALSE);
TH1* tmp = (TH1*)(fTotalHistogram->Clone());
@@ -2430,49 +2430,49 @@ Double_t TEfficiency::GetEfficiency(Int_t bin) const
// for bayesian ones the expectation value of the resulting posterior
// distribution is returned:
// Begin_Latex #hat{#varepsilon} = #frac{passed + #alpha}{total + #alpha + #beta} End_Latex
- // If the bit kPosteriorMode is set (or the method TEfficiency::UsePosteriorMode() has been called ) the
- // mode (most probable value) of the posterior is returned:
+ // If the bit kPosteriorMode is set (or the method TEfficiency::UsePosteriorMode() has been called ) the
+ // mode (most probable value) of the posterior is returned:
// Begin_Latex #hat{#varepsilon} = #frac{passed + #alpha -1}{total + #alpha + #beta -2} End_Latex
- //
+ //
// - If the denominator is equal to 0, an efficiency of 0 is returned.
- // - When Begin_Latex passed + #alpha < 1 End_Latex or Begin_Latex total - passed + #beta < 1 End_latex the above
- // formula for the mode is not valid. In these cases values the estimated efficiency is 0 or 1.
+ // - When Begin_Latex passed + #alpha < 1 End_Latex or Begin_Latex total - passed + #beta < 1 End_latex the above
+ // formula for the mode is not valid. In these cases values the estimated efficiency is 0 or 1.
Double_t total = fTotalHistogram->GetBinContent(bin);
Double_t passed = fPassedHistogram->GetBinContent(bin);
-
- if(TestBit(kIsBayesian)) {
+
+ if(TestBit(kIsBayesian)) {
// parameters for the beta prior distribution
- Double_t alpha = TestBit(kUseBinPrior) ? GetBetaAlpha(bin) : GetBetaAlpha();
+ Double_t alpha = TestBit(kUseBinPrior) ? GetBetaAlpha(bin) : GetBetaAlpha();
Double_t beta = TestBit(kUseBinPrior) ? GetBetaBeta(bin) : GetBetaBeta();
Double_t aa,bb;
if(TestBit(kUseWeights))
{
- Double_t tw = fTotalHistogram->GetBinContent(bin);
- Double_t tw2 = fTotalHistogram->GetSumw2()->At(bin);
- Double_t pw = fPassedHistogram->GetBinContent(bin);
+ Double_t tw = fTotalHistogram->GetBinContent(bin);
+ Double_t tw2 = fTotalHistogram->GetSumw2()->At(bin);
+ Double_t pw = fPassedHistogram->GetBinContent(bin);
- if (tw2 <= 0 ) return pw/tw;
+ if (tw2 <= 0 ) return pw/tw;
- // tw/tw2 renormalize the weights
- double norm = tw/tw2;
- aa = pw * norm + alpha;
- bb = (tw - pw) * norm + beta;
+ // tw/tw2 renormalize the weights
+ double norm = tw/tw2;
+ aa = pw * norm + alpha;
+ bb = (tw - pw) * norm + beta;
}
else
{
- aa = passed + alpha;
- bb = total - passed + beta;
+ aa = passed + alpha;
+ bb = total - passed + beta;
}
-
- if (!TestBit(kPosteriorMode) )
+
+ if (!TestBit(kPosteriorMode) )
return BetaMean(aa,bb);
- else
+ else
return BetaMode(aa,bb);
- }
+ }
else
return (total)? ((Double_t)passed)/total : 0;
}
@@ -2497,68 +2497,68 @@ Double_t TEfficiency::GetEfficiencyErrorLow(Int_t bin) const
// check whether weights have been used
if(TestBit(kUseWeights))
{
- Double_t tw = fTotalHistogram->GetBinContent(bin);
- Double_t tw2 = fTotalHistogram->GetSumw2()->At(bin);
- Double_t pw = fPassedHistogram->GetBinContent(bin);
- Double_t pw2 = fPassedHistogram->GetSumw2()->At(bin);
-
- if(TestBit(kIsBayesian))
- {
- Double_t alpha = TestBit(kUseBinPrior) ? GetBetaAlpha(bin) : GetBetaAlpha();
- Double_t beta = TestBit(kUseBinPrior) ? GetBetaBeta(bin) : GetBetaBeta();
-
- if (tw2 <= 0) return 0;
-
- // tw/tw2 renormalize the weights
- Double_t norm = tw/tw2;
- Double_t aa = pw * norm + alpha;
- Double_t bb = (tw - pw) * norm + beta;
- Double_t low = 0;
- Double_t upper = 1;
- if(TestBit(kShortestInterval)) {
- TEfficiency::BetaShortestInterval(fConfLevel,aa,bb,low,upper);
- }
- else {
- low = TEfficiency::BetaCentralInterval(fConfLevel,aa,bb,false);
- }
-
- return eff - low;
- }
- else
- {
- if(fStatisticOption != kFNormal)
- {
- Warning("GetEfficiencyErrorLow","frequentist confidence intervals for weights are only supported by the normal approximation");
- Info("GetEfficiencyErrorLow","setting statistic option to kFNormal");
- const_cast<TEfficiency*>(this)->SetStatisticOption(kFNormal);
- }
-
- Double_t variance = ( pw2 * (1. - 2 * eff) + tw2 * eff *eff ) / ( tw * tw) ;
- Double_t sigma = sqrt(variance);
-
- Double_t prob = 0.5 * (1.- fConfLevel);
- Double_t delta = ROOT::Math::normal_quantile_c(prob, sigma);
-
- return (eff - delta > 0) ? delta : 0;
- }
+ Double_t tw = fTotalHistogram->GetBinContent(bin);
+ Double_t tw2 = fTotalHistogram->GetSumw2()->At(bin);
+ Double_t pw = fPassedHistogram->GetBinContent(bin);
+ Double_t pw2 = fPassedHistogram->GetSumw2()->At(bin);
+
+ if(TestBit(kIsBayesian))
+ {
+ Double_t alpha = TestBit(kUseBinPrior) ? GetBetaAlpha(bin) : GetBetaAlpha();
+ Double_t beta = TestBit(kUseBinPrior) ? GetBetaBeta(bin) : GetBetaBeta();
+
+ if (tw2 <= 0) return 0;
+
+ // tw/tw2 renormalize the weights
+ Double_t norm = tw/tw2;
+ Double_t aa = pw * norm + alpha;
+ Double_t bb = (tw - pw) * norm + beta;
+ Double_t low = 0;
+ Double_t upper = 1;
+ if(TestBit(kShortestInterval)) {
+ TEfficiency::BetaShortestInterval(fConfLevel,aa,bb,low,upper);
+ }
+ else {
+ low = TEfficiency::BetaCentralInterval(fConfLevel,aa,bb,false);
+ }
+
+ return eff - low;
+ }
+ else
+ {
+ if(fStatisticOption != kFNormal)
+ {
+ Warning("GetEfficiencyErrorLow","frequentist confidence intervals for weights are only supported by the normal approximation");
+ Info("GetEfficiencyErrorLow","setting statistic option to kFNormal");
+ const_cast<TEfficiency*>(this)->SetStatisticOption(kFNormal);
+ }
+
+ Double_t variance = ( pw2 * (1. - 2 * eff) + tw2 * eff *eff ) / ( tw * tw) ;
+ Double_t sigma = sqrt(variance);
+
+ Double_t prob = 0.5 * (1.- fConfLevel);
+ Double_t delta = ROOT::Math::normal_quantile_c(prob, sigma);
+
+ return (eff - delta > 0) ? delta : 0;
+ }
}
else
{
- if(TestBit(kIsBayesian))
- {
- // parameters for the beta prior distribution
- Double_t alpha = TestBit(kUseBinPrior) ? GetBetaAlpha(bin) : GetBetaAlpha();
- Double_t beta = TestBit(kUseBinPrior) ? GetBetaBeta(bin) : GetBetaBeta();
- return (eff - Bayesian(total,passed,fConfLevel,alpha,beta,false,TestBit(kShortestInterval)));
- }
- else
- return (eff - fBoundary(total,passed,fConfLevel,false));
+ if(TestBit(kIsBayesian))
+ {
+ // parameters for the beta prior distribution
+ Double_t alpha = TestBit(kUseBinPrior) ? GetBetaAlpha(bin) : GetBetaAlpha();
+ Double_t beta = TestBit(kUseBinPrior) ? GetBetaBeta(bin) : GetBetaBeta();
+ return (eff - Bayesian(total,passed,fConfLevel,alpha,beta,false,TestBit(kShortestInterval)));
+ }
+ else
+ return (eff - fBoundary(total,passed,fConfLevel,false));
}
}
//______________________________________________________________________________
Double_t TEfficiency::GetEfficiencyErrorUp(Int_t bin) const
-{
+{
//returns the upper error on the efficiency in the given global bin
//
//The result depends on the current confidence level fConfLevel and the
@@ -2567,7 +2567,7 @@ Double_t TEfficiency::GetEfficiencyErrorUp(Int_t bin) const
//
//Note: If the histograms are filled with weights, only bayesian methods and the
// normal approximation are supported.
-
+
Int_t total = (Int_t)fTotalHistogram->GetBinContent(bin);
Int_t passed = (Int_t)fPassedHistogram->GetBinContent(bin);
@@ -2576,62 +2576,62 @@ Double_t TEfficiency::GetEfficiencyErrorUp(Int_t bin) const
// check whether weights have been used
if(TestBit(kUseWeights))
{
- Double_t tw = fTotalHistogram->GetBinContent(bin);
- Double_t tw2 = fTotalHistogram->GetSumw2()->At(bin);
- Double_t pw = fPassedHistogram->GetBinContent(bin);
- Double_t pw2 = fPassedHistogram->GetSumw2()->At(bin);
-
- if(TestBit(kIsBayesian))
- {
- Double_t alpha = TestBit(kUseBinPrior) ? GetBetaAlpha(bin) : GetBetaAlpha();
- Double_t beta = TestBit(kUseBinPrior) ? GetBetaBeta(bin) : GetBetaBeta();
-
- if (tw2 <= 0) return 0;
-
- // tw/tw2 renormalize the weights
- Double_t norm = tw/tw2;
- Double_t aa = pw * norm + alpha;
- Double_t bb = (tw - pw) * norm + beta;
- Double_t low = 0;
- Double_t upper = 1;
- if(TestBit(kShortestInterval)) {
- TEfficiency::BetaShortestInterval(fConfLevel,aa,bb,low,upper);
- }
- else {
- upper = TEfficiency::BetaCentralInterval(fConfLevel,aa,bb,true);
- }
-
- return upper - eff;
- }
- else
- {
- if(fStatisticOption != kFNormal)
- {
- Warning("GetEfficiencyErrorUp","frequentist confidence intervals for weights are only supported by the normal approximation");
- Info("GetEfficiencyErrorUp","setting statistic option to kFNormal");
- const_cast<TEfficiency*>(this)->SetStatisticOption(kFNormal);
- }
-
- Double_t variance = ( pw2 * (1. - 2 * eff) + tw2 * eff *eff ) / ( tw * tw) ;
- Double_t sigma = sqrt(variance);
-
- Double_t prob = 0.5 * (1.- fConfLevel);
- Double_t delta = ROOT::Math::normal_quantile_c(prob, sigma);
-
- return (eff + delta < 1) ? delta : 1;
- }
+ Double_t tw = fTotalHistogram->GetBinContent(bin);
+ Double_t tw2 = fTotalHistogram->GetSumw2()->At(bin);
+ Double_t pw = fPassedHistogram->GetBinContent(bin);
+ Double_t pw2 = fPassedHistogram->GetSumw2()->At(bin);
+
+ if(TestBit(kIsBayesian))
+ {
+ Double_t alpha = TestBit(kUseBinPrior) ? GetBetaAlpha(bin) : GetBetaAlpha();
+ Double_t beta = TestBit(kUseBinPrior) ? GetBetaBeta(bin) : GetBetaBeta();
+
+ if (tw2 <= 0) return 0;
+
+ // tw/tw2 renormalize the weights
+ Double_t norm = tw/tw2;
+ Double_t aa = pw * norm + alpha;
+ Double_t bb = (tw - pw) * norm + beta;
+ Double_t low = 0;
+ Double_t upper = 1;
+ if(TestBit(kShortestInterval)) {
+ TEfficiency::BetaShortestInterval(fConfLevel,aa,bb,low,upper);
+ }
+ else {
+ upper = TEfficiency::BetaCentralInterval(fConfLevel,aa,bb,true);
+ }
+
+ return upper - eff;
+ }
+ else
+ {
+ if(fStatisticOption != kFNormal)
+ {
+ Warning("GetEfficiencyErrorUp","frequentist confidence intervals for weights are only supported by the normal approximation");
+ Info("GetEfficiencyErrorUp","setting statistic option to kFNormal");
+ const_cast<TEfficiency*>(this)->SetStatisticOption(kFNormal);
+ }
+
+ Double_t variance = ( pw2 * (1. - 2 * eff) + tw2 * eff *eff ) / ( tw * tw) ;
+ Double_t sigma = sqrt(variance);
+
+ Double_t prob = 0.5 * (1.- fConfLevel);
+ Double_t delta = ROOT::Math::normal_quantile_c(prob, sigma);
+
+ return (eff + delta < 1) ? delta : 1;
+ }
}
else
{
- if(TestBit(kIsBayesian))
- {
- // parameters for the beta prior distribution
- Double_t alpha = TestBit(kUseBinPrior) ? GetBetaAlpha(bin) : GetBetaAlpha();
- Double_t beta = TestBit(kUseBinPrior) ? GetBetaBeta(bin) : GetBetaBeta();
- return (Bayesian(total,passed,fConfLevel,alpha,beta,true,TestBit(kShortestInterval)) - eff);
- }
- else
- return fBoundary(total,passed,fConfLevel,true) - eff;
+ if(TestBit(kIsBayesian))
+ {
+ // parameters for the beta prior distribution
+ Double_t alpha = TestBit(kUseBinPrior) ? GetBetaAlpha(bin) : GetBetaAlpha();
+ Double_t beta = TestBit(kUseBinPrior) ? GetBetaBeta(bin) : GetBetaBeta();
+ return (Bayesian(total,passed,fConfLevel,alpha,beta,true,TestBit(kShortestInterval)) - eff);
+ }
+ else
+ return fBoundary(total,passed,fConfLevel,true) - eff;
}
}
@@ -2645,7 +2645,7 @@ Int_t TEfficiency::GetGlobalBin(Int_t binx,Int_t biny,Int_t binz) const
// - SetPassedEvents(bin), SetTotalEvents(bin)
//
//see TH1::GetBin() for conventions on numbering bins
-
+
return fTotalHistogram->GetBin(binx,biny,binz);
}
@@ -2668,9 +2668,9 @@ Long64_t TEfficiency::Merge(TCollection* pList)
//the same process.
//
//The new weight is set according to:
- //Begin_Latex #frac{1}{w_{new}} = #sum_{i} \frac{1}{w_{i}}End_Latex
-
- if(!pList->IsEmpty()) {
+ //Begin_Latex #frac{1}{w_{new}} = #sum_{i} \frac{1}{w_{i}}End_Latex
+
+ if(!pList->IsEmpty()) {
TIter next(pList);
TObject* obj = 0;
TEfficiency* pEff = 0;
@@ -2729,15 +2729,15 @@ TEfficiency& TEfficiency::operator+=(const TEfficiency& rhs)
//current weight of this TEfficiency object = Begin_Latex w_{1} End_Latex
//weight of rhs = Begin_Latex w_{2} End_Latex
//Begin_Latex w_{new} = \frac{w_{1} \times w_{2}}{w_{1} + w_{2}}End_Latex
-
- if (fTotalHistogram == 0 && fPassedHistogram == 0) {
+
+ if (fTotalHistogram == 0 && fPassedHistogram == 0) {
// efficiency is empty just copy it over
- *this = rhs;
+ *this = rhs;
return *this;
}
else if (fTotalHistogram == 0 || fPassedHistogram == 0) {
- Fatal("operator+=","Adding to a non consistent TEfficiency object which has not a total or a passed histogram ");
+ Fatal("operator+=","Adding to a non consistent TEfficiency object which has not a total or a passed histogram ");
return *this;
}
@@ -2746,7 +2746,7 @@ TEfficiency& TEfficiency::operator+=(const TEfficiency& rhs)
return *this;
}
else if (rhs.fTotalHistogram == 0 || rhs.fTotalHistogram == 0 ) {
- Fatal("operator+=","Adding a non consistent TEfficiency object which has not a total or a passed histogram ");
+ Fatal("operator+=","Adding a non consistent TEfficiency object which has not a total or a passed histogram ");
return *this;
}
@@ -2757,7 +2757,7 @@ TEfficiency& TEfficiency::operator+=(const TEfficiency& rhs)
fPassedHistogram->Add(rhs.fPassedHistogram);
SetWeight((fWeight * rhs.GetWeight())/(fWeight + rhs.GetWeight()));
-
+
return *this;
}
@@ -2771,7 +2771,7 @@ TEfficiency& TEfficiency::operator=(const TEfficiency& rhs)
//
//Note: - The list of associated functions is not copied. After this
// operation the list of associated functions is empty.
-
+
if(this != &rhs)
{
//statistic options
@@ -2780,10 +2780,10 @@ TEfficiency& TEfficiency::operator=(const TEfficiency& rhs)
SetBetaAlpha(rhs.GetBetaAlpha());
SetBetaBeta(rhs.GetBetaBeta());
SetWeight(rhs.GetWeight());
-
+
//associated list of functions
if(fFunctions)
- fFunctions->Delete();
+ fFunctions->Delete();
//copy histograms
delete fTotalHistogram;
@@ -2819,50 +2819,50 @@ void TEfficiency::Paint(const Option_t* opt)
//
// Note for 1D classes
// In 1D the TEfficiency uses a TGraphAsymmErrors for drawing
- // The TGraph is created only the first time Paint is used. The user can manipulate the
+ // The TGraph is created only the first time Paint is used. The user can manipulate the
// TGraph via the method TEfficiency::GetPaintedGraph()
// The TGraph creates behing an histogram for the axis. The histogram is created also only the first time.
- // If the axis needs to be updated because in the meantime the class changed use this trick
+ // If the axis needs to be updated because in the meantime the class changed use this trick
// which will trigger a re-calculation of the axis of the graph
// TEfficiency::GetPaintedGraph()->Set(0)
//
- // Note that in order to access the painted graph via GetPaintedGraph() you need either to call Paint or better
+ // Note that in order to access the painted graph via GetPaintedGraph() you need either to call Paint or better
// gPad->Update();
//
-
+
if(!gPad)
return;
-
+
//use TGraphAsymmErrors for painting
if(GetDimension() == 1) {
- if(!fPaintGraph) {
- fPaintGraph = CreateGraph(opt);
+ if(!fPaintGraph) {
+ fPaintGraph = CreateGraph(opt);
}
- else
- // update existing graph already created
- FillGraph(fPaintGraph, opt);
-
- //paint graph
+ else
+ // update existing graph already created
+ FillGraph(fPaintGraph, opt);
+
+ //paint graph
fPaintGraph->Paint(opt);
//paint all associated functions
if(fFunctions) {
- //paint box with fit parameters
- gStyle->SetOptFit(1);
- TIter next(fFunctions);
- TObject* obj = 0;
- while((obj = next())) {
- if(obj->InheritsFrom(TF1::Class())) {
+ //paint box with fit parameters
+ gStyle->SetOptFit(1);
+ TIter next(fFunctions);
+ TObject* obj = 0;
+ while((obj = next())) {
+ if(obj->InheritsFrom(TF1::Class())) {
fPaintGraph->PaintStats((TF1*)obj);
- ((TF1*)obj)->Paint("sameC");
- }
- }
+ ((TF1*)obj)->Paint("sameC");
+ }
+ }
}
-
+
return;
}
@@ -2871,14 +2871,14 @@ void TEfficiency::Paint(const Option_t* opt)
if(!fPaintHisto) {
fPaintHisto = CreateHistogram();
}
- else
+ else
FillHistogram(fPaintHisto);
//paint histogram
fPaintHisto->Paint(opt);
return;
}
- Warning("Paint","Painting 3D efficiency is not implemented");
+ Warning("Paint","Painting 3D efficiency is not implemented");
}
//______________________________________________________________________________
@@ -2896,15 +2896,15 @@ void TEfficiency::SavePrimitive(std::ostream& out,Option_t* opt)
//note the missing break statements!
switch(GetDimension()) {
- case 3:
- equi_bins = equi_bins && !fTotalHistogram->GetZaxis()->GetXbins()->fArray
- && !fTotalHistogram->GetZaxis()->GetXbins()->fN;
- case 2:
- equi_bins = equi_bins && !fTotalHistogram->GetYaxis()->GetXbins()->fArray
- && !fTotalHistogram->GetYaxis()->GetXbins()->fN;
- case 1:
- equi_bins = equi_bins && !fTotalHistogram->GetXaxis()->GetXbins()->fArray
- && !fTotalHistogram->GetXaxis()->GetXbins()->fN;
+ case 3:
+ equi_bins = equi_bins && !fTotalHistogram->GetZaxis()->GetXbins()->fArray
+ && !fTotalHistogram->GetZaxis()->GetXbins()->fN;
+ case 2:
+ equi_bins = equi_bins && !fTotalHistogram->GetYaxis()->GetXbins()->fArray
+ && !fTotalHistogram->GetYaxis()->GetXbins()->fN;
+ case 1:
+ equi_bins = equi_bins && !fTotalHistogram->GetXaxis()->GetXbins()->fArray
+ && !fTotalHistogram->GetXaxis()->GetXbins()->fN;
}
//create arrays containing the variable binning
@@ -2916,7 +2916,7 @@ void TEfficiency::SavePrimitive(std::ostream& out,Option_t* opt)
szaxis += naxis;
//x axis
out << indent << "Double_t " << sxaxis << "["
- << fTotalHistogram->GetXaxis()->GetXbins()->fN << "] = {";
+ << fTotalHistogram->GetXaxis()->GetXbins()->fN << "] = {";
for (i = 0; i < fTotalHistogram->GetXaxis()->GetXbins()->fN; ++i) {
if (i != 0) out << ", ";
out << fTotalHistogram->GetXaxis()->GetXbins()->fArray[i];
@@ -2924,23 +2924,23 @@ void TEfficiency::SavePrimitive(std::ostream& out,Option_t* opt)
out << "}; " << std::endl;
//y axis
if(GetDimension() > 1) {
- out << indent << "Double_t " << syaxis << "["
- << fTotalHistogram->GetYaxis()->GetXbins()->fN << "] = {";
- for (i = 0; i < fTotalHistogram->GetYaxis()->GetXbins()->fN; ++i) {
- if (i != 0) out << ", ";
- out << fTotalHistogram->GetYaxis()->GetXbins()->fArray[i];
- }
- out << "}; " << std::endl;
+ out << indent << "Double_t " << syaxis << "["
+ << fTotalHistogram->GetYaxis()->GetXbins()->fN << "] = {";
+ for (i = 0; i < fTotalHistogram->GetYaxis()->GetXbins()->fN; ++i) {
+ if (i != 0) out << ", ";
+ out << fTotalHistogram->GetYaxis()->GetXbins()->fArray[i];
+ }
+ out << "}; " << std::endl;
}
//z axis
if(GetDimension() > 2) {
- out << indent << "Double_t " << szaxis << "["
- << fTotalHistogram->GetZaxis()->GetXbins()->fN << "] = {";
- for (i = 0; i < fTotalHistogram->GetZaxis()->GetXbins()->fN; ++i) {
- if (i != 0) out << ", ";
- out << fTotalHistogram->GetZaxis()->GetXbins()->fArray[i];
- }
- out << "}; " << std::endl;
+ out << indent << "Double_t " << szaxis << "["
+ << fTotalHistogram->GetZaxis()->GetXbins()->fN << "] = {";
+ for (i = 0; i < fTotalHistogram->GetZaxis()->GetXbins()->fN; ++i) {
+ if (i != 0) out << ", ";
+ out << fTotalHistogram->GetZaxis()->GetXbins()->fArray[i];
+ }
+ out << "}; " << std::endl;
}
}//creating variable binning
@@ -2956,56 +2956,56 @@ void TEfficiency::SavePrimitive(std::ostream& out,Option_t* opt)
const char quote = '"';
out << indent << std::endl;
out << indent << ClassName() << " * " << name << " = new " << ClassName()
- << "(" << quote << GetName() << quote << "," << quote
- << GetTitle() << quote <<",";
+ << "(" << quote << GetName() << quote << "," << quote
+ << GetTitle() << quote <<",";
//fixed bin size -> use n,min,max constructor
if(equi_bins) {
out << fTotalHistogram->GetXaxis()->GetNbins() << ","
- << fTotalHistogram->GetXaxis()->GetXmin() << ","
- << fTotalHistogram->GetXaxis()->GetXmax();
+ << fTotalHistogram->GetXaxis()->GetXmin() << ","
+ << fTotalHistogram->GetXaxis()->GetXmax();
if(GetDimension() > 1) {
- out << "," << fTotalHistogram->GetYaxis()->GetNbins() << ","
- << fTotalHistogram->GetYaxis()->GetXmin() << ","
- << fTotalHistogram->GetYaxis()->GetXmax();
+ out << "," << fTotalHistogram->GetYaxis()->GetNbins() << ","
+ << fTotalHistogram->GetYaxis()->GetXmin() << ","
+ << fTotalHistogram->GetYaxis()->GetXmax();
}
if(GetDimension() > 2) {
- out << "," << fTotalHistogram->GetZaxis()->GetNbins() << ","
- << fTotalHistogram->GetZaxis()->GetXmin() << ","
- << fTotalHistogram->GetZaxis()->GetXmax();
+ out << "," << fTotalHistogram->GetZaxis()->GetNbins() << ","
+ << fTotalHistogram->GetZaxis()->GetXmin() << ","
+ << fTotalHistogram->GetZaxis()->GetXmax();
}
}
//variable bin size -> use n,*bins constructor
else {
- out << fTotalHistogram->GetXaxis()->GetNbins() << "," << sxaxis;
- if(GetDimension() > 1)
- out << "," << fTotalHistogram->GetYaxis()->GetNbins() << ","
- << syaxis;
- if(GetDimension() > 2)
- out << "," << fTotalHistogram->GetZaxis()->GetNbins() << ","
- << szaxis;
+ out << fTotalHistogram->GetXaxis()->GetNbins() << "," << sxaxis;
+ if(GetDimension() > 1)
+ out << "," << fTotalHistogram->GetYaxis()->GetNbins() << ","
+ << syaxis;
+ if(GetDimension() > 2)
+ out << "," << fTotalHistogram->GetZaxis()->GetNbins() << ","
+ << szaxis;
}
out << ");" << std::endl;
out << indent << std::endl;
//set statistic options
out << indent << name << "->SetConfidenceLevel(" << fConfLevel << ");"
- << std::endl;
+ << std::endl;
out << indent << name << "->SetBetaAlpha(" << fBeta_alpha << ");"
- << std::endl;
+ << std::endl;
out << indent << name << "->SetBetaBeta(" << fBeta_beta << ");" << std::endl;
out << indent << name << "->SetWeight(" << fWeight << ");" << std::endl;
out << indent << name << "->SetStatisticOption(" << fStatisticOption << ");"
- << std::endl;
+ << std::endl;
out << indent << name << "->SetPosteriorMode(" << TestBit(kPosteriorMode) << ");" << std::endl;
out << indent << name << "->SetShortestInterval(" << TestBit(kShortestInterval) << ");" << std::endl;
if(TestBit(kUseWeights))
- out << indent << name << "->SetUseWeightedEvents();" << std::endl;
+ out << indent << name << "->SetUseWeightedEvents();" << std::endl;
// save bin-by-bin prior parameters
for(unsigned int i = 0; i < fBeta_bin_params.size(); ++i)
{
- out << indent << name << "->SetBetaBinParameters(" << i << "," << fBeta_bin_params.at(i).first
- << "," << fBeta_bin_params.at(i).second << ");" << std::endl;
+ out << indent << name << "->SetBetaBinParameters(" << i << "," << fBeta_bin_params.at(i).first
+ << "," << fBeta_bin_params.at(i).second << ");" << std::endl;
}
//set bin contents
@@ -3017,10 +3017,10 @@ void TEfficiency::SavePrimitive(std::ostream& out,Option_t* opt)
//important: set first total number than passed number
for(Int_t i = 0; i < nbins; ++i) {
- out << indent << name <<"->SetTotalEvents(" << i << "," <<
- fTotalHistogram->GetBinContent(i) << ");" << std::endl;
- out << indent << name <<"->SetPassedEvents(" << i << "," <<
- fPassedHistogram->GetBinContent(i) << ");" << std::endl;
+ out << indent << name <<"->SetTotalEvents(" << i << "," <<
+ fTotalHistogram->GetBinContent(i) << ");" << std::endl;
+ out << indent << name <<"->SetPassedEvents(" << i << "," <<
+ fPassedHistogram->GetBinContent(i) << ");" << std::endl;
}
//save list of functions
@@ -3029,8 +3029,8 @@ void TEfficiency::SavePrimitive(std::ostream& out,Option_t* opt)
while((obj = next())) {
obj->SavePrimitive(out,"nodraw");
if(obj->InheritsFrom(TF1::Class())) {
- out << indent << name << "->GetListOfFunctions()->Add("
- << obj->GetName() << ");" << std::endl;
+ out << indent << name << "->GetListOfFunctions()->Add("
+ << obj->GetName() << ");" << std::endl;
}
}
@@ -3044,7 +3044,7 @@ void TEfficiency::SavePrimitive(std::ostream& out,Option_t* opt)
option.ToLower();
if (!option.Contains("nodraw"))
out<< indent << name<< "->Draw(" << quote << opt << quote << ");"
- << std::endl;
+ << std::endl;
}
//______________________________________________________________________________
@@ -3058,7 +3058,7 @@ void TEfficiency::SetBetaAlpha(Double_t alpha)
//End_Latex
//
//Note: - both shape parameters have to be positive (i.e. > 0)
-
+
if(alpha > 0)
fBeta_alpha = alpha;
else
@@ -3067,7 +3067,7 @@ void TEfficiency::SetBetaAlpha(Double_t alpha)
//______________________________________________________________________________
void TEfficiency::SetBetaBeta(Double_t beta)
-{
+{
//sets the shape parameter Begin_Latex \beta End_Latex
//
//The prior probability of the efficiency is given by the beta distribution:
@@ -3076,7 +3076,7 @@ void TEfficiency::SetBetaBeta(Double_t beta)
//End_Latex
//
//Note: - both shape parameters have to be positive (i.e. > 0)
-
+
if(beta > 0)
fBeta_beta = beta;
else
@@ -3087,8 +3087,8 @@ void TEfficiency::SetBetaBeta(Double_t beta)
void TEfficiency::SetBetaBinParameters(Int_t bin, Double_t alpha, Double_t beta)
{
//sets different shape parameter Begin_Latex \alpha and \beta End_Latex
- // for the prior distribution for each bin. By default the global parameter are used if they are not set
- // for the specific bin
+ // for the prior distribution for each bin. By default the global parameter are used if they are not set
+ // for the specific bin
//The prior probability of the efficiency is given by the beta distribution:
//Begin_Latex
// f(\varepsilon;\alpha;\beta) = \frac{1}{B(\alpha,\beta)} \varepsilon^{\alpha-1} (1 - \varepsilon)^{\beta-1}
@@ -3099,12 +3099,12 @@ void TEfficiency::SetBetaBinParameters(Int_t bin, Double_t alpha, Double_t beta)
if (!fPassedHistogram || !fTotalHistogram) return;
TH1 * h1 = fTotalHistogram;
- // doing this I get h1->fN which is available only for a TH1D
+ // doing this I get h1->fN which is available only for a TH1D
UInt_t n = h1->GetBin(h1->GetNbinsX()+1, h1->GetNbinsY()+1, h1->GetNbinsZ()+1 ) + 1;
// in case vector is not created do with default alpha, beta params
- if (fBeta_bin_params.size() != n )
- fBeta_bin_params = std::vector<std::pair<Double_t, Double_t> >(n, std::make_pair(fBeta_alpha, fBeta_beta) );
+ if (fBeta_bin_params.size() != n )
+ fBeta_bin_params = std::vector<std::pair<Double_t, Double_t> >(n, std::make_pair(fBeta_alpha, fBeta_beta) );
// vector contains also values for under/overflows
fBeta_bin_params[bin] = std::make_pair(alpha,beta);
@@ -3113,38 +3113,38 @@ void TEfficiency::SetBetaBinParameters(Int_t bin, Double_t alpha, Double_t beta)
}
//______________________________________________________________________________
-Bool_t TEfficiency::SetBins(Int_t nx, Double_t xmin, Double_t xmax)
-{
+Bool_t TEfficiency::SetBins(Int_t nx, Double_t xmin, Double_t xmax)
+{
// set the bins for the underlined passed and total histograms
- // If the class have been already filled the previous contents will be lost
- if (GetDimension() != 1) {
+ // If the class have been already filled the previous contents will be lost
+ if (GetDimension() != 1) {
Error("SetBins","Using wrong SetBins function for a %d-d histogram",GetDimension());
- return kFALSE;
+ return kFALSE;
}
- if (fTotalHistogram->GetEntries() != 0 ) {
- Warning("SetBins","Histogram entries will be lost after SetBins");
+ if (fTotalHistogram->GetEntries() != 0 ) {
+ Warning("SetBins","Histogram entries will be lost after SetBins");
fPassedHistogram->Reset();
fTotalHistogram->Reset();
- }
+ }
fPassedHistogram->SetBins(nx,xmin,xmax);
fTotalHistogram->SetBins(nx,xmin,xmax);
return kTRUE;
}
//______________________________________________________________________________
-Bool_t TEfficiency::SetBins(Int_t nx, const Double_t *xBins)
-{
+Bool_t TEfficiency::SetBins(Int_t nx, const Double_t *xBins)
+{
// set the bins for the underlined passed and total histograms
- // If the class have been already filled the previous contents will be lost
- if (GetDimension() != 1) {
+ // If the class have been already filled the previous contents will be lost
+ if (GetDimension() != 1) {
Error("SetBins","Using wrong SetBins function for a %d-d histogram",GetDimension());
- return kFALSE;
+ return kFALSE;
}
- if (fTotalHistogram->GetEntries() != 0 ) {
- Warning("SetBins","Histogram entries will be lost after SetBins");
+ if (fTotalHistogram->GetEntries() != 0 ) {
+ Warning("SetBins","Histogram entries will be lost after SetBins");
fPassedHistogram->Reset();
fTotalHistogram->Reset();
- }
+ }
fPassedHistogram->SetBins(nx,xBins);
fTotalHistogram->SetBins(nx,xBins);
return kTRUE;
@@ -3152,37 +3152,37 @@ Bool_t TEfficiency::SetBins(Int_t nx, const Double_t *xBins)
//______________________________________________________________________________
Bool_t TEfficiency::SetBins(Int_t nx, Double_t xmin, Double_t xmax, Int_t ny, Double_t ymin, Double_t ymax)
-{
+{
// set the bins for the underlined passed and total histograms
- // If the class have been already filled the previous contents will be lost
- if (GetDimension() != 2) {
+ // If the class have been already filled the previous contents will be lost
+ if (GetDimension() != 2) {
Error("SetBins","Using wrong SetBins function for a %d-d histogram",GetDimension());
- return kFALSE;
+ return kFALSE;
}
- if (fTotalHistogram->GetEntries() != 0 ) {
- Warning("SetBins","Histogram entries will be lost after SetBins");
+ if (fTotalHistogram->GetEntries() != 0 ) {
+ Warning("SetBins","Histogram entries will be lost after SetBins");
fPassedHistogram->Reset();
fTotalHistogram->Reset();
- }
+ }
fPassedHistogram->SetBins(nx,xmin,xmax,ny,ymin,ymax);
fTotalHistogram->SetBins(nx,xmin,xmax,ny,ymin,ymax);
return kTRUE;
}
//______________________________________________________________________________
-Bool_t TEfficiency::SetBins(Int_t nx, const Double_t *xBins, Int_t ny, const Double_t *yBins)
-{
+Bool_t TEfficiency::SetBins(Int_t nx, const Double_t *xBins, Int_t ny, const Double_t *yBins)
+{
// set the bins for the underlined passed and total histograms
- // If the class have been already filled the previous contents will be lost
- if (GetDimension() != 2) {
+ // If the class have been already filled the previous contents will be lost
+ if (GetDimension() != 2) {
Error("SetBins","Using wrong SetBins function for a %d-d histogram",GetDimension());
- return kFALSE;
+ return kFALSE;
}
- if (fTotalHistogram->GetEntries() != 0 ) {
- Warning("SetBins","Histogram entries will be lost after SetBins");
+ if (fTotalHistogram->GetEntries() != 0 ) {
+ Warning("SetBins","Histogram entries will be lost after SetBins");
fPassedHistogram->Reset();
fTotalHistogram->Reset();
- }
+ }
fPassedHistogram->SetBins(nx,xBins,ny,yBins);
fTotalHistogram->SetBins(nx,xBins,ny,yBins);
return kTRUE;
@@ -3191,18 +3191,18 @@ Bool_t TEfficiency::SetBins(Int_t nx, const Double_t *xBins, Int_t ny, const Dou
//______________________________________________________________________________
Bool_t TEfficiency::SetBins(Int_t nx, Double_t xmin, Double_t xmax, Int_t ny, Double_t ymin, Double_t ymax,
Int_t nz, Double_t zmin, Double_t zmax)
-{
+{
// set the bins for the underlined passed and total histograms
- // If the class have been already filled the previous contents will be lost
- if (GetDimension() != 3) {
+ // If the class have been already filled the previous contents will be lost
+ if (GetDimension() != 3) {
Error("SetBins","Using wrong SetBins function for a %d-d histogram",GetDimension());
- return kFALSE;
+ return kFALSE;
}
- if (fTotalHistogram->GetEntries() != 0 ) {
- Warning("SetBins","Histogram entries will be lost after SetBins");
+ if (fTotalHistogram->GetEntries() != 0 ) {
+ Warning("SetBins","Histogram entries will be lost after SetBins");
fPassedHistogram->Reset();
fTotalHistogram->Reset();
- }
+ }
fPassedHistogram->SetBins(nx,xmin,xmax,ny,ymin,ymax,nz,zmin,zmax);
fTotalHistogram->SetBins (nx,xmin,xmax,ny,ymin,ymax,nz,zmin,zmax);
return kTRUE;
@@ -3210,19 +3210,19 @@ Bool_t TEfficiency::SetBins(Int_t nx, Double_t xmin, Double_t xmax, Int_t ny, Do
//______________________________________________________________________________
Bool_t TEfficiency::SetBins(Int_t nx, const Double_t *xBins, Int_t ny, const Double_t *yBins, Int_t nz,
- const Double_t *zBins )
-{
+ const Double_t *zBins )
+{
// set the bins for the underlined passed and total histograms
- // If the class have been already filled the previous contents will be lost
- if (GetDimension() != 3) {
+ // If the class have been already filled the previous contents will be lost
+ if (GetDimension() != 3) {
Error("SetBins","Using wrong SetBins function for a %d-d histogram",GetDimension());
- return kFALSE;
+ return kFALSE;
}
- if (fTotalHistogram->GetEntries() != 0 ) {
- Warning("SetBins","Histogram entries will be lost after SetBins");
+ if (fTotalHistogram->GetEntries() != 0 ) {
+ Warning("SetBins","Histogram entries will be lost after SetBins");
fPassedHistogram->Reset();
fTotalHistogram->Reset();
- }
+ }
fPassedHistogram->SetBins(nx,xBins,ny,yBins,nz,zBins);
fTotalHistogram->SetBins(nx,xBins,ny,yBins,nz,zBins);
return kTRUE;
@@ -3259,7 +3259,7 @@ void TEfficiency::SetDirectory(TDirectory* dir)
fDirectory->Remove(this);
fDirectory = dir;
if(fDirectory)
- fDirectory->Append(this);
+ fDirectory->Append(this);
}
//______________________________________________________________________________
@@ -3269,9 +3269,9 @@ void TEfficiency::SetName(const char* name)
//
//Note: The names of the internal histograms are set to "name + _total" and
// "name + _passed" respectively.
-
+
TNamed::SetName(name);
-
+
//setting the names (appending the correct ending)
TString name_total = name + TString("_total");
TString name_passed = name + TString("_passed");
@@ -3325,7 +3325,7 @@ Bool_t TEfficiency::SetPassedHistogram(const TH1& rPassed,Option_t* opt)
Bool_t bReplace = option.Contains("f");
if(!bReplace)
- bReplace = CheckConsistency(rPassed,*fTotalHistogram,"w");
+ bReplace = CheckConsistency(rPassed,*fTotalHistogram,"w");
if(bReplace) {
delete fPassedHistogram;
@@ -3336,14 +3336,14 @@ Bool_t TEfficiency::SetPassedHistogram(const TH1& rPassed,Option_t* opt)
TH1::AddDirectory(bStatus);
if(fFunctions)
- fFunctions->Delete();
+ fFunctions->Delete();
//check whether histogram is filled with weights
Double_t statpass[TH1::kNstat];
rPassed.GetStats(statpass);
//require: sum of weights == sum of weights^2
if(TMath::Abs(statpass[0]-statpass[1]) > 1e-5)
- SetUseWeightedEvents();
+ SetUseWeightedEvents();
return true;
}
@@ -3371,7 +3371,7 @@ void TEfficiency::SetStatisticOption(EStatOption option)
// see also AgrestiCoull
//- kFFC (=4) : using the Feldman-Cousins frequentist method
// sets kIsBayesian = false
- // see also FeldmanCousins
+ // see also FeldmanCousins
//- kBJeffrey (=5) : using the Jeffrey interval
// sets kIsBayesian = true, fBeta_alpha = 0.5 and fBeta_beta = 0.5
// see also Bayesian
@@ -3381,50 +3381,50 @@ void TEfficiency::SetStatisticOption(EStatOption option)
//- kBBayesian (=7) : using a custom prior defined by fBeta_alpha and fBeta_beta
// sets kIsBayesian = true
// see also Bayesian
-
+
fStatisticOption = option;
switch(option)
{
- case kFCP:
- fBoundary = &ClopperPearson;
- SetBit(kIsBayesian,false);
- break;
- case kFNormal:
- fBoundary = &Normal;
- SetBit(kIsBayesian,false);
- break;
- case kFWilson:
- fBoundary = &Wilson;
- SetBit(kIsBayesian,false);
- break;
- case kFAC:
- fBoundary = &AgrestiCoull;
- SetBit(kIsBayesian,false);
- break;
- case kFFC:
- fBoundary = &FeldmanCousins;
- SetBit(kIsBayesian,false);
- break;
- case kBJeffrey:
- fBeta_alpha = 0.5;
- fBeta_beta = 0.5;
- SetBit(kIsBayesian,true);
- SetBit(kUseBinPrior,false);
- break;
- case kBUniform:
- fBeta_alpha = 1;
- fBeta_beta = 1;
- SetBit(kIsBayesian,true);
- SetBit(kUseBinPrior,false);
- break;
- case kBBayesian:
- SetBit(kIsBayesian,true);
- break;
- default:
- fStatisticOption = kFCP;
- fBoundary = &ClopperPearson;
- SetBit(kIsBayesian,false);
+ case kFCP:
+ fBoundary = &ClopperPearson;
+ SetBit(kIsBayesian,false);
+ break;
+ case kFNormal:
+ fBoundary = &Normal;
+ SetBit(kIsBayesian,false);
+ break;
+ case kFWilson:
+ fBoundary = &Wilson;
+ SetBit(kIsBayesian,false);
+ break;
+ case kFAC:
+ fBoundary = &AgrestiCoull;
+ SetBit(kIsBayesian,false);
+ break;
+ case kFFC:
+ fBoundary = &FeldmanCousins;
+ SetBit(kIsBayesian,false);
+ break;
+ case kBJeffrey:
+ fBeta_alpha = 0.5;
+ fBeta_beta = 0.5;
+ SetBit(kIsBayesian,true);
+ SetBit(kUseBinPrior,false);
+ break;
+ case kBUniform:
+ fBeta_alpha = 1;
+ fBeta_beta = 1;
+ SetBit(kIsBayesian,true);
+ SetBit(kUseBinPrior,false);
+ break;
+ case kBBayesian:
+ SetBit(kIsBayesian,true);
+ break;
+ default:
+ fStatisticOption = kFCP;
+ fBoundary = &ClopperPearson;
+ SetBit(kIsBayesian,false);
}
}
@@ -3445,17 +3445,17 @@ void TEfficiency::SetTitle(const char* title)
//</pre></div>
//<div class="clear"></div>
//End_Html
-
-
+
+
//setting the titles (looking for the first semicolon and insert the tokens there)
- TString title_passed = title;
- TString title_total = title;
+ TString title_passed = title;
+ TString title_total = title;
Ssiz_t pos = title_passed.First(";");
- if (pos != kNPOS) {
+ if (pos != kNPOS) {
title_passed.Insert(pos," (passed)");
title_total.Insert(pos," (total)");
}
- else {
+ else {
title_passed.Append(" (passed)");
title_total.Append(" (total)");
}
@@ -3463,11 +3463,11 @@ void TEfficiency::SetTitle(const char* title)
fTotalHistogram->SetTitle(title_total);
// strip (total) for the TEfficiency title
- // HIstogram SetTitle has already stripped the axis
+ // HIstogram SetTitle has already stripped the axis
TString teffTitle = fTotalHistogram->GetTitle();
teffTitle.ReplaceAll(" (total)","");
TNamed::SetTitle(teffTitle);
-
+
}
//______________________________________________________________________________
@@ -3480,7 +3480,7 @@ Bool_t TEfficiency::SetTotalEvents(Int_t bin,Int_t events)
//
//Note: - requires: fPassedHistogram->GetBinContent(bin) <= events
- if(events >= fPassedHistogram->GetBinContent(bin)) {
+ if(events >= fPassedHistogram->GetBinContent(bin)) {
fTotalHistogram->SetBinContent(bin,events);
return true;
}
@@ -3516,7 +3516,7 @@ Bool_t TEfficiency::SetTotalHistogram(const TH1& rTotal,Option_t* opt)
Bool_t bReplace = option.Contains("f");
if(!bReplace)
- bReplace = CheckConsistency(*fPassedHistogram,rTotal,"w");
+ bReplace = CheckConsistency(*fPassedHistogram,rTotal,"w");
if(bReplace) {
delete fTotalHistogram;
@@ -3527,14 +3527,14 @@ Bool_t TEfficiency::SetTotalHistogram(const TH1& rTotal,Option_t* opt)
TH1::AddDirectory(bStatus);
if(fFunctions)
- fFunctions->Delete();
+ fFunctions->Delete();
//check whether histogram is filled with weights
Double_t stattotal[TH1::kNstat];
rTotal.GetStats(stattotal);
//require: sum of weights == sum of weights^2
if(TMath::Abs(stattotal[0]-stattotal[1]) > 1e-5)
- SetUseWeightedEvents();
+ SetUseWeightedEvents();
return true;
}
@@ -3545,9 +3545,9 @@ Bool_t TEfficiency::SetTotalHistogram(const TH1& rTotal,Option_t* opt)
//______________________________________________________________________________
void TEfficiency::SetUseWeightedEvents()
{
- SetBit(kUseWeights,true);
- fTotalHistogram->Sumw2();
- fPassedHistogram->Sumw2();
+ SetBit(kUseWeights,true);
+ fTotalHistogram->Sumw2();
+ fPassedHistogram->Sumw2();
}
//______________________________________________________________________________
@@ -3556,7 +3556,7 @@ void TEfficiency::SetWeight(Double_t weight)
//sets the global weight for this TEfficiency object
//
//Note: - weight has to be positive ( > 0)
-
+
if(weight > 0)
fWeight = weight;
else
@@ -3582,15 +3582,15 @@ Double_t TEfficiency::Wilson(Int_t total,Int_t passed,Double_t level,Bool_t bUpp
// #Delta = #frac{#kappa}{total + #kappa^{2}} * #sqrt{passed (1 - #frac{passed}{total}) + #frac{#kappa^{2}}{4}}
// return = max(0,mode - #Delta) or min(1,mode + #Delta)
//End_Latex
-
+
Double_t alpha = (1.0 - level)/2;
- if (total == 0) return (bUpper) ? 1 : 0;
+ if (total == 0) return (bUpper) ? 1 : 0;
Double_t average = ((Double_t)passed) / total;
Double_t kappa = ROOT::Math::normal_quantile(1 - alpha,1);
-
+
Double_t mode = (passed + 0.5 * kappa * kappa) / (total + kappa * kappa);
Double_t delta = kappa / (total + kappa*kappa) * std::sqrt(total * average
- * (1 - average) + kappa * kappa / 4);
+ * (1 - average) + kappa * kappa / 4);
if(bUpper)
return ((mode + delta) > 1) ? 1.0 : (mode + delta);
else
diff --git a/hist/hist/src/TFractionFitter.cxx b/hist/hist/src/TFractionFitter.cxx
index 3da5602bdc0..5b4f6597790 100644
--- a/hist/hist/src/TFractionFitter.cxx
+++ b/hist/hist/src/TFractionFitter.cxx
@@ -151,12 +151,12 @@ ClassImp(TFractionFitter)
//______________________________________________________________________________
TFractionFitter::TFractionFitter() :
- fFitDone(kFALSE),
- fLowLimitX(0), fHighLimitX(0),
- fLowLimitY(0), fHighLimitY(0),
- fLowLimitZ(0), fHighLimitZ(0),
- fData(0), fIntegralData(0),
- fPlot(0)
+fFitDone(kFALSE),
+fLowLimitX(0), fHighLimitX(0),
+fLowLimitY(0), fHighLimitY(0),
+fLowLimitZ(0), fHighLimitZ(0),
+fData(0), fIntegralData(0),
+fPlot(0)
{
// TFractionFitter default constructor.
@@ -172,7 +172,7 @@ TFractionFitter::TFractionFitter() :
//______________________________________________________________________________
TFractionFitter::TFractionFitter(TH1* data, TObjArray *MCs, Option_t *option) :
- fFitDone(kFALSE), fChisquare(0), fPlot(0) {
+fFitDone(kFALSE), fChisquare(0), fPlot(0) {
// TFractionFitter constructor. Does a complete initialisation (including
// consistency checks, default fit range as the whole histogram but without
// under- and overflows, and declaration of the fit parameters). Note that
@@ -182,8 +182,8 @@ TFractionFitter::TFractionFitter(TH1* data, TObjArray *MCs, Option_t *option) :
// MCs: array of TH1* corresponding template distributions
// Option: can be used to control the print level of the minimization algorithm
// option = "Q" : quite - no message is printed
- // option = "V" : verbose - max print out
- // option = "" : default: print initial fraction values and result
+ // option = "V" : verbose - max print out
+ // option = "" : default: print initial fraction values and result
fData = data;
// Default: include all of the histogram (but without under- and overflows)
@@ -215,13 +215,13 @@ TFractionFitter::TFractionFitter(TH1* data, TObjArray *MCs, Option_t *option) :
fFractionFitter = new ROOT::Fit::Fitter();
- // set print level
+ // set print level
TString opt(option);
opt.ToUpper();
- if (opt.Contains("Q") ) {
+ if (opt.Contains("Q") ) {
fFractionFitter->Config().MinimizerOptions().SetPrintLevel(0);
}
- else if (opt.Contains("V") ) {
+ else if (opt.Contains("V") ) {
fFractionFitter->Config().MinimizerOptions().SetPrintLevel(2);
}
else
@@ -244,7 +244,7 @@ TFractionFitter::TFractionFitter(TH1* data, TObjArray *MCs, Option_t *option) :
//______________________________________________________________________________
TFractionFitter::~TFractionFitter() {
- // TFractionFitter default destructor
+ // TFractionFitter default destructor
if (fFractionFitter) delete fFractionFitter;
delete[] fIntegralMCs;
@@ -411,8 +411,8 @@ void TFractionFitter::ExcludeBin(Int_t bin) {
int excluded = fExcludedBins.size();
for (int b = 0; b < excluded; ++b) {
if (fExcludedBins[b] == bin) {
- Error("ExcludeBin", "bin %d already excluded", bin);
- return;
+ Error("ExcludeBin", "bin %d already excluded", bin);
+ return;
}
}
fExcludedBins.push_back(bin);
@@ -426,12 +426,12 @@ void TFractionFitter::IncludeBin(Int_t bin) {
// The bin numbering to be used is that of TH1::GetBin().
for (std::vector<Int_t>::iterator it = fExcludedBins.begin();
- it != fExcludedBins.end(); ++it) {
+ it != fExcludedBins.end(); ++it) {
if (*it == bin) {
- fExcludedBins.erase(it);
- // This call serves to properly (re)determine the number of degrees of freeom
- CheckConsistency();
- return;
+ fExcludedBins.erase(it);
+ // This call serves to properly (re)determine the number of degrees of freeom
+ CheckConsistency();
+ return;
}
}
Error("IncludeBin", "bin %d was not excluded", bin);
@@ -442,7 +442,7 @@ bool TFractionFitter::IsExcluded(Int_t bin) const {
// Function for internal use, checking whether the given bin is
// excluded from the fit or not.
- for (unsigned int b = 0; b < fExcludedBins.size(); ++b)
+ for (unsigned int b = 0; b < fExcludedBins.size(); ++b)
if (fExcludedBins[b] == bin) return true;
return false;
}
@@ -486,7 +486,7 @@ void TFractionFitter::CheckConsistency() {
for (z = minZ; z <= maxZ; ++z) {
for (y = minY; y <= maxY; ++y) {
for (x = minX; x <= maxX; ++x) {
- if (IsExcluded(fData->GetBin(x, y, z))) continue;
+ if (IsExcluded(fData->GetBin(x, y, z))) continue;
fNpfits++;
fIntegralData += fData->GetBinContent(x, y, z);
}
@@ -522,11 +522,11 @@ void TFractionFitter::CheckConsistency() {
for (y = minY; y <= maxY; ++y) {
for (x = minX; x <= maxX; ++x) {
Int_t bin = fData->GetBin(x, y, z);
- if (IsExcluded(bin)) continue;
+ if (IsExcluded(bin)) continue;
Double_t MCEvents = h->GetBinContent(bin);
if (MCEvents < 0) {
- Error("CheckConsistency", "Number of MC events (bin = %d, par = %d) cannot be negative: "
- " their distribution is binomial (see paper)", bin, par);
+ Error("CheckConsistency", "Number of MC events (bin = %d, par = %d) cannot be negative: "
+ " their distribution is binomial (see paper)", bin, par);
}
fIntegralMCs[par] += MCEvents;
}
@@ -667,7 +667,7 @@ void TFractionFitter::ComputeFCN(Double_t& f, const Double_t* xx, Int_t flag)
for (z = minZ; z <= maxZ; ++z) {
for (y = minY; y <= maxY; ++y) {
for (x = minX; x <= maxX; ++x) {
- if (IsExcluded(fData->GetBin(x, y, z))) continue;
+ if (IsExcluded(fData->GetBin(x, y, z))) continue;
Double_t weight = hw->GetBinContent(x, y, z);
if (weight <= 0) {
Error("ComputeFCN","Invalid weight encountered for MC source %d",mc);
@@ -692,7 +692,7 @@ void TFractionFitter::ComputeFCN(Double_t& f, const Double_t* xx, Int_t flag)
for (y = minY; y <= maxY; ++y) {
for (x = minX; x <= maxX; ++x) {
bin = fData->GetBin(x, y, z);
- if (IsExcluded(bin)) continue;
+ if (IsExcluded(bin)) continue;
// Solve for the "predictions"
int k0 = 0;
@@ -715,8 +715,8 @@ void TFractionFitter::ComputeFCN(Double_t& f, const Double_t* xx, Int_t flag)
prediction += fFractions[mc]*weight*binPrediction;
result -= binPrediction;
if (binContent > 0 && binPrediction > 0)
- result += binContent*TMath::Log(binPrediction);
-
+ result += binContent*TMath::Log(binPrediction);
+
if (flag == 3) {
((TH1*)fAji.At(mc))->SetBinContent(bin, binPrediction);
}
@@ -770,13 +770,13 @@ void TFractionFitter::FindPrediction(int bin, Double_t &t_i, int& k_0, Double_t
// Case one or more of the MC bin contents == 0 -> find largest fraction
// k_0 stores the source index of the largest fraction
k_0 = 0;
- Double_t maxWgtFrac = wgtFrac[0];
+ Double_t maxWgtFrac = wgtFrac[0];
for (Int_t par = 1; par < fNpar; ++par) {
if (wgtFrac[par] > maxWgtFrac) {
k_0 = par;
maxWgtFrac = wgtFrac[par];
}
- }
+ }
Double_t t_min = -1 / maxWgtFrac; // t_i cannot be smaller than this value (see paper, par 5)
// Determine if there are more sources which have the same maximum contribution (fraction)
@@ -809,7 +809,7 @@ void TFractionFitter::FindPrediction(int bin, Double_t &t_i, int& k_0, Double_t
// The equation that needs to be solved:
// func(t_i) = \sum\limits_j{\frac{ p_j a_{ji} }{1 + p_j t_i}} - \frac{d_i}{1 - t_i} = 0
t_i = 0; Double_t step = 0.2;
- Int_t maxIter = 100000; // maximum number of iterations
+ Int_t maxIter = 100000; // maximum number of iterations
for(Int_t i = 0; i < maxIter; ++i) {
if (t_i >= 1 || t_i < t_min) {
step /= 10;
@@ -823,7 +823,7 @@ void TFractionFitter::FindPrediction(int bin, Double_t &t_i, int& k_0, Double_t
deriv -= a_ji[par] * r * r;
}
if (TMath::Abs(func) < 1e-12) return; // solution found
- Double_t delta = - func / deriv; // update delta
+ Double_t delta = - func / deriv; // update delta
if (TMath::Abs(delta) > step)
delta = (delta > 0) ? step : -step; // correct delta if it becomes too large
t_i += delta;
@@ -867,7 +867,7 @@ Double_t TFractionFitter::GetChisquare() const
// chi2 = -2*ln(lambda).
// This parameter can be shown to follow a Chi-square distribution. See for
// example S. Baker and R. Cousins, "Clarification of the use of chi-square
- // and likelihood functions in fits to histograms", Nucl. Instr. Meth. A221,
+ // and likelihood functions in fits to histograms", Nucl. Instr. Meth. A221,
// pp. 437-442 (1984)
return fChisquare;
@@ -889,7 +889,7 @@ Int_t TFractionFitter::GetNDF() const
Double_t TFractionFitter::GetProb() const
{
// return the fit probability
-
+
Int_t ndf = fNpfits - fNpar;
if (ndf <= 0) return 0;
return TMath::Prob(fChisquare,ndf);
@@ -908,18 +908,18 @@ void TFractionFitter::ComputeChisquareLambda()
}
// fPlot must be initialized and filled. Leave this to the GetPlot() method.
- if (! fPlot)
- GetPlot();
+ if (! fPlot)
+ GetPlot();
Int_t minX, maxX, minY, maxY, minZ, maxZ;
GetRanges(minX, maxX, minY, maxY, minZ, maxZ);
-
+
Double_t logLyn = 0; // likelihood of prediction
Double_t logLmn = 0; // likelihood of data ("true" distribution)
for(Int_t x = minX; x <= maxX; x++) {
for(Int_t y = minY; y <= maxY; y++) {
for(Int_t z = minZ; z <= maxZ; z++) {
- if (IsExcluded(fData->GetBin(x, y, z))) continue;
+ if (IsExcluded(fData->GetBin(x, y, z))) continue;
Double_t di = fData->GetBinContent(x, y, z);
Double_t fi = fPlot->GetBinContent(x, y, z);
if(fi != 0) logLyn += di * TMath::Log(fi) - fi;
@@ -945,7 +945,7 @@ TH1* TFractionFitter::GetMCPrediction(Int_t parm) const
// Return the adjusted MC template (Aji) for template (parm).
// Note that the (Aji) times fractions only sum to the total prediction
// of the fit if all weights are 1.
-
+
CheckParNo(parm);
if ( !fFitDone ) {
Error("GetMCPrediction","Fit not yet performed");
diff --git a/hist/hist/src/TH3.cxx b/hist/hist/src/TH3.cxx
index 92de59c6d39..f47e19e45d3 100644
--- a/hist/hist/src/TH3.cxx
+++ b/hist/hist/src/TH3.cxx
@@ -3218,7 +3218,7 @@ TH3 *TH3::Rebin3D(Int_t nxgroup, Int_t nygroup, Int_t nzgroup, const char *newna
}
}
Int_t binNew = hnew->GetBin( xover *(newxbins+1),
- yover*(newybins+1), zover*(newzbins+1) );
+ yover*(newybins+1), zover*(newzbins+1) );
hnew->SetBinContent(binNew,binContent);
if (oldSumw2) hnew->fSumw2.fArray[binNew] = binSumw2;
}
@@ -3258,8 +3258,8 @@ TH3 *TH3::Rebin3D(Int_t nxgroup, Int_t nygroup, Int_t nzgroup, const char *newna
hnew->SetBinContent(xbin,0,zbin,binContent0);
hnew->SetBinContent(xbin,newybins+1,zbin,binContent2);
if (oldSumw2) {
- hnew->SetBinError(xbin,0,zbin,TMath::Sqrt(binError0));
- hnew->SetBinError(xbin,newybins+1,zbin,TMath::Sqrt(binError2) );
+ hnew->SetBinError(xbin,0,zbin,TMath::Sqrt(binError0));
+ hnew->SetBinError(xbin,newybins+1,zbin,TMath::Sqrt(binError2) );
}
oldzbin2 += nzgroup;
}
@@ -3294,8 +3294,8 @@ TH3 *TH3::Rebin3D(Int_t nxgroup, Int_t nygroup, Int_t nzgroup, const char *newna
hnew->SetBinContent(0,ybin,zbin,binContent0);
hnew->SetBinContent(newxbins+1,ybin,zbin,binContent2);
if (oldSumw2) {
- hnew->SetBinError(0,ybin,zbin,TMath::Sqrt(binError0));
- hnew->SetBinError(newxbins+1,ybin,zbin,TMath::Sqrt(binError2) );
+ hnew->SetBinError(0,ybin,zbin,TMath::Sqrt(binError0));
+ hnew->SetBinError(newxbins+1,ybin,zbin,TMath::Sqrt(binError2) );
}
oldzbin2 += nzgroup;
}
@@ -3330,8 +3330,8 @@ TH3 *TH3::Rebin3D(Int_t nxgroup, Int_t nygroup, Int_t nzgroup, const char *newna
hnew->SetBinContent(xbin,ybin,0,binContent0);
hnew->SetBinContent(xbin,ybin,newzbins+1,binContent2);
if (oldSumw2) {
- hnew->SetBinError(xbin,ybin,0,TMath::Sqrt(binError0));
- hnew->SetBinError(xbin,ybin,newzbins+1,TMath::Sqrt(binError2) );
+ hnew->SetBinError(xbin,ybin,0,TMath::Sqrt(binError0));
+ hnew->SetBinError(xbin,ybin,newzbins+1,TMath::Sqrt(binError2) );
}
oldybin2 += nygroup;
}
@@ -3519,11 +3519,11 @@ TH3 *TH3::Rebin3D(Int_t nxgroup, Int_t nygroup, Int_t nzgroup, const char *newna
fZaxis.SetTitleSize(zTitleSize);
fZaxis.SetTitleColor(zTitleColor);
fZaxis.SetTitleFont(zTitleFont);
-
+
//restore statistics and entries modified by SetBinContent
hnew->SetEntries(entries);
if (!resetStat) hnew->PutStats(stat);
-
+
delete [] oldBins;
if (oldSumw2) delete [] oldSumw2;
return hnew;
diff --git a/hist/hist/src/THnBase.cxx b/hist/hist/src/THnBase.cxx
index ea1288dcea7..ef6c67c92c7 100644
--- a/hist/hist/src/THnBase.cxx
+++ b/hist/hist/src/THnBase.cxx
@@ -43,9 +43,9 @@ ClassImp(THnBase);
//______________________________________________________________________________
THnBase::THnBase(const char* name, const char* title, Int_t dim,
const Int_t* nbins, const Double_t* xmin, const Double_t* xmax):
- TNamed(name, title), fNdimensions(dim), fAxes(dim), fBrowsables(dim),
- fEntries(0), fTsumw(0), fTsumw2(-1.), fTsumwx(dim), fTsumwx2(dim),
- fIntegral(0), fIntegralStatus(kNoInt)
+TNamed(name, title), fNdimensions(dim), fAxes(dim), fBrowsables(dim),
+fEntries(0), fTsumw(0), fTsumw2(-1.), fTsumwx(dim), fTsumwx2(dim),
+fIntegral(0), fIntegralStatus(kNoInt)
{
// Construct a THnBase with "dim" dimensions,
// "nbins" holds the number of bins for each dimension;
@@ -103,13 +103,13 @@ void THnBase::Init(const char* name, const char* title,
TAxis* reqaxis = (TAxis*)axis->Clone();
if (!keepTargetAxis && axis->TestBit(TAxis::kAxisRange)) {
Int_t binFirst = axis->GetFirst();
- // The lowest egde of the underflow is meaningless.
- if (binFirst == 0)
- binFirst = 1;
+ // The lowest egde of the underflow is meaningless.
+ if (binFirst == 0)
+ binFirst = 1;
Int_t binLast = axis->GetLast();
- // The overflow edge is implicit.
- if (binLast > axis->GetNbins())
- binLast = axis->GetNbins();
+ // The overflow edge is implicit.
+ if (binLast > axis->GetNbins())
+ binLast = axis->GetNbins();
Int_t nBins = binLast - binFirst + 1;
if (axis->GetXbins()->GetSize()) {
// non-uniform bins:
@@ -134,8 +134,8 @@ void THnBase::Init(const char* name, const char* title,
//______________________________________________________________________________
TH1* THnBase::CreateHist(const char* name, const char* title,
- const TObjArray* axes,
- Bool_t keepTargetAxis ) const {
+ const TObjArray* axes,
+ Bool_t keepTargetAxis ) const {
// Create an empty histogram with name and title with a given
// set of axes. Create a TH1D/TH2D/TH3D, depending on the number
// of elements in axes.
@@ -217,21 +217,21 @@ THnBase* THnBase::CreateHnAny(const char* name, const char* title,
&& cname[2] >= '1' && cname[2] <= '3' && cname[4] == 0) {
#define R__THNBCASE(TAG) \
- if (sparse) { \
- s = new _NAME2_(THnSparse,TAG)(name, title, ndim, nbins, \
- minRange, maxRange, chunkSize); \
- } else { \
- s = new _NAME2_(THn,TAG)(name, title, ndim, nbins, \
- minRange, maxRange); \
- } \
- break;
+if (sparse) { \
+s = new _NAME2_(THnSparse,TAG)(name, title, ndim, nbins, \
+minRange, maxRange, chunkSize); \
+} else { \
+s = new _NAME2_(THn,TAG)(name, title, ndim, nbins, \
+minRange, maxRange); \
+} \
+break;
switch (cname[3]) {
- case 'F': R__THNBCASE(F);
- case 'D': R__THNBCASE(D);
- case 'I': R__THNBCASE(I);
- case 'S': R__THNBCASE(S);
- case 'C': R__THNBCASE(C);
+ case 'F': R__THNBCASE(F);
+ case 'D': R__THNBCASE(D);
+ case 'I': R__THNBCASE(I);
+ case 'S': R__THNBCASE(S);
+ case 'C': R__THNBCASE(C);
}
#undef R__THNBCASE
}
@@ -276,7 +276,7 @@ THnBase* THnBase::CreateHnAny(const char* name, const char* title,
else if (hn->InheritsFrom(THnSparseC::Class())) bintype = 'C';
else {
hn->Error("CreateHnAny", "Type %s not implemented; please inform the ROOT team!",
- hn->IsA()->GetName());
+ hn->IsA()->GetName());
return 0;
}
type = TClass::GetClass(TString::Format("THn%c", bintype));
@@ -301,12 +301,12 @@ THnBase* THnBase::CreateHnAny(const char* name, const char* title,
}
} else {
hn->Error("CreateHnAny", "Unhandled type %s, not deriving from THn nor THnSparse!",
- hn->IsA()->GetName());
+ hn->IsA()->GetName());
return 0;
}
if (!type) {
hn->Error("CreateHnAny", "Unhandled type %s, please inform the ROOT team!",
- hn->IsA()->GetName());
+ hn->IsA()->GetName());
return 0;
}
@@ -339,24 +339,24 @@ void THnBase::Add(const TH1* hist, Double_t c /*=1.*/)
//______________________________________________________________________________
TFitResultPtr THnBase::Fit(TF1 *f ,Option_t *option ,Option_t *goption)
{
-// Fit a THnSparse with function f
-//
-// since the data is sparse by default a likelihood fit is performed
-// merging all the regions with empty bins for betetr performance efficiency
-//
-// Since the THnSparse is not drawn no graphics options are passed
-// Here is the list of possible options
-//
-// = "I" Use integral of function in bin instead of value at bin center
-// = "X" Use chi2 method (default is log-likelihood method)
-// = "U" Use a User specified fitting algorithm (via SetFCN)
-// = "Q" Quiet mode (minimum printing)
-// = "V" Verbose mode (default is between Q and V)
-// = "E" Perform better Errors estimation using Minos technique
-// = "B" Use this option when you want to fix one or more parameters
-// and the fitting function is like "gaus", "expo", "poln", "landau".
-// = "M" More. Improve fit results
-// = "R" Use the Range specified in the function range
+ // Fit a THnSparse with function f
+ //
+ // since the data is sparse by default a likelihood fit is performed
+ // merging all the regions with empty bins for betetr performance efficiency
+ //
+ // Since the THnSparse is not drawn no graphics options are passed
+ // Here is the list of possible options
+ //
+ // = "I" Use integral of function in bin instead of value at bin center
+ // = "X" Use chi2 method (default is log-likelihood method)
+ // = "U" Use a User specified fitting algorithm (via SetFCN)
+ // = "Q" Quiet mode (minimum printing)
+ // = "V" Verbose mode (default is between Q and V)
+ // = "E" Perform better Errors estimation using Minos technique
+ // = "B" Use this option when you want to fix one or more parameters
+ // and the fitting function is like "gaus", "expo", "poln", "landau".
+ // = "M" More. Improve fit results
+ // = "R" Use the Range specified in the function range
Foption_t fitOption;
@@ -368,15 +368,15 @@ TFitResultPtr THnBase::Fit(TF1 *f ,Option_t *option ,Option_t *goption)
fitOption.Nostore = true;
// Use likelihood fit if not specified
if (!fitOption.Chi2) fitOption.Like = true;
- // create range and minimizer options with default values
- ROOT::Fit::DataRange range(GetNdimensions());
+ // create range and minimizer options with default values
+ ROOT::Fit::DataRange range(GetNdimensions());
for ( int i = 0; i < GetNdimensions(); ++i ) {
TAxis *axis = GetAxis(i);
range.AddRange(i, axis->GetXmin(), axis->GetXmax());
}
- ROOT::Math::MinimizerOptions minOption;
-
- return ROOT::Fit::FitObject(this, f , fitOption , minOption, goption, range);
+ ROOT::Math::MinimizerOptions minOption;
+
+ return ROOT::Fit::FitObject(this, f , fitOption , minOption, goption, range);
}
//______________________________________________________________________________
@@ -451,10 +451,10 @@ TObject* THnBase::ProjectionAny(Int_t ndim, const Int_t* dim,
TString name(GetName());
name +="_proj";
-
+
for (Int_t d = 0; d < ndim; ++d) {
- name += "_";
- name += dim[d];
+ name += "_";
+ name += dim[d];
}
TString title(GetTitle());
@@ -496,7 +496,7 @@ TObject* THnBase::ProjectionAny(Int_t ndim, const Int_t* dim,
if (wantNDim)
ret = hn = CloneEmpty(name, title, &newaxes, keepTargetAxis);
else
- ret = hist = CreateHist(name, title, &newaxes, keepTargetAxis);
+ ret = hist = CreateHist(name, title, &newaxes, keepTargetAxis);
if (keepTargetAxis) {
// make the whole axes visible, i.e. unset the range
@@ -794,7 +794,7 @@ void THnBase::Multiply(TF1* f, Double_t c)
// Only bins inside the function range are recomputed.
// IMPORTANT NOTE: If you intend to use the errors of this histogram later
// you should call Sumw2 before making this operation.
- // This is particularly important if you fit the histogram after
+ // This is particularly important if you fit the histogram after
// calling Multiply()
Int_t* coord = new Int_t[fNdimensions];
@@ -826,7 +826,7 @@ void THnBase::Multiply(TF1* f, Double_t c)
SetBinError(i, c * fvalue * error);
}
}
-
+
delete [] x;
delete [] coord;
}
@@ -1013,31 +1013,31 @@ void THnBase::SetTitle(const char *title)
// To insert the character ";" in one of the titles, one should use "#;"
// or "#semicolon".
- fTitle = title;
- fTitle.ReplaceAll("#;",2,"#semicolon",10);
-
- Int_t endHistTitle = fTitle.First(';');
- if (endHistTitle >= 0) {
- // title contains a ';' so parse the axis titles
- Int_t posTitle = endHistTitle + 1;
- Int_t lenTitle = fTitle.Length();
- Int_t dim = 0;
- while (posTitle > 0 && posTitle < lenTitle && dim < fNdimensions){
- Int_t endTitle = fTitle.Index(";", posTitle);
- TString axisTitle = fTitle(posTitle, endTitle - posTitle);
- axisTitle.ReplaceAll("#semicolon", 10, ";", 1);
- GetAxis(dim)->SetTitle(axisTitle);
- dim++;
- if (endTitle > 0)
- posTitle = endTitle + 1;
- else
- posTitle = -1;
- }
- // Remove axis titles from histogram title
- fTitle.Remove(endHistTitle, lenTitle - endHistTitle);
- }
-
- fTitle.ReplaceAll("#semicolon", 10, ";", 1);
+ fTitle = title;
+ fTitle.ReplaceAll("#;",2,"#semicolon",10);
+
+ Int_t endHistTitle = fTitle.First(';');
+ if (endHistTitle >= 0) {
+ // title contains a ';' so parse the axis titles
+ Int_t posTitle = endHistTitle + 1;
+ Int_t lenTitle = fTitle.Length();
+ Int_t dim = 0;
+ while (posTitle > 0 && posTitle < lenTitle && dim < fNdimensions){
+ Int_t endTitle = fTitle.Index(";", posTitle);
+ TString axisTitle = fTitle(posTitle, endTitle - posTitle);
+ axisTitle.ReplaceAll("#semicolon", 10, ";", 1);
+ GetAxis(dim)->SetTitle(axisTitle);
+ dim++;
+ if (endTitle > 0)
+ posTitle = endTitle + 1;
+ else
+ posTitle = -1;
+ }
+ // Remove axis titles from histogram title
+ fTitle.Remove(endHistTitle, lenTitle - endHistTitle);
+ }
+
+ fTitle.ReplaceAll("#semicolon", 10, ";", 1);
}
@@ -1233,7 +1233,7 @@ Bool_t THnBase::PrintBin(Long64_t idx, Int_t* bin, Option_t* options) const
// If "options" contains:
// '0': only print bins with an error or content != 0
// Return whether the bin was printed (depends on options)
-
+
Double_t v = -42;
if (idx == -1) {
idx = GetBin(bin);
@@ -1426,7 +1426,7 @@ ClassImp(ROOT::THnBaseBrowsable);
//______________________________________________________________________________
ROOT::THnBaseBrowsable::THnBaseBrowsable(THnBase* hist, Int_t axis):
- fHist(hist), fAxis(axis), fProj(0)
+fHist(hist), fAxis(axis), fProj(0)
{
// Construct a THnBaseBrowsable.
TString axisName = hist->GetAxis(axis)->GetName();
diff --git a/hist/hist/src/TKDE.cxx b/hist/hist/src/TKDE.cxx
index 14ed2343f67..d3ef667a714 100644
--- a/hist/hist/src/TKDE.cxx
+++ b/hist/hist/src/TKDE.cxx
@@ -10,15 +10,15 @@
**********************************************************************/
//////////////////////////////////////////////////////////////////////////////
/*
- Kernel Density Estimation class.
- The three main references are (1) "Scott DW, Multivariate Density Estimation. Theory, Practice and Visualization. New York: Wiley",
- (2) "Jann Ben - ETH Zurich, Switzerland -, Univariate kernel density estimation document for KDENS:
- Stata module for univariate kernel density estimation."
- (3) "Hardle W, Muller M, Sperlich S, Werwatz A, Nonparametric and Semiparametric Models. Springer."
- The algorithm is briefly described in (4) "Cranmer KS, Kernel Estimation in High-Energy
- Physics. Computer Physics Communications 136:198-207,2001" - e-Print Archive: hep ex/0011057.
- A binned version is also implemented to address the performance issue due to its data size dependance.
-*/
+ Kernel Density Estimation class.
+ The three main references are (1) "Scott DW, Multivariate Density Estimation. Theory, Practice and Visualization. New York: Wiley",
+ (2) "Jann Ben - ETH Zurich, Switzerland -, Univariate kernel density estimation document for KDENS:
+ Stata module for univariate kernel density estimation."
+ (3) "Hardle W, Muller M, Sperlich S, Werwatz A, Nonparametric and Semiparametric Models. Springer."
+ The algorithm is briefly described in (4) "Cranmer KS, Kernel Estimation in High-Energy
+ Physics. Computer Physics Communications 136:198-207,2001" - e-Print Archive: hep ex/0011057.
+ A binned version is also implemented to address the performance issue due to its data size dependance.
+ */
#include <functional>
@@ -63,26 +63,26 @@ private:
};
TKDE::TKDE(UInt_t events, const Double_t* data, Double_t xMin, Double_t xMax, const Option_t* option, Double_t rho) :
- fData(events, 0.0),
- fEvents(events, 0.0),
- fPDF(0),
- fUpperPDF(0),
- fLowerPDF(0),
- fApproximateBias(0),
- fGraph(0),
- fNewData(false),
- fUseMinMaxFromData((xMin >= xMax)),
- fNBins(events < 10000 ? 100: events / 10),
- fNEvents(events),
- fUseBinsNEvents(10000),
- fMean(0.0),
- fSigma(0.0),
- fXMin(xMin),
- fXMax(xMax),
- fAdaptiveBandwidthFactor(1.0),
- fCanonicalBandwidths(std::vector<Double_t>(kTotalKernels, 0.0)),
- fKernelSigmas2(std::vector<Double_t>(kTotalKernels, -1.0)),
- fSettedOptions(std::vector<Bool_t>(4, kFALSE))
+fData(events, 0.0),
+fEvents(events, 0.0),
+fPDF(0),
+fUpperPDF(0),
+fLowerPDF(0),
+fApproximateBias(0),
+fGraph(0),
+fNewData(false),
+fUseMinMaxFromData((xMin >= xMax)),
+fNBins(events < 10000 ? 100: events / 10),
+fNEvents(events),
+fUseBinsNEvents(10000),
+fMean(0.0),
+fSigma(0.0),
+fXMin(xMin),
+fXMax(xMax),
+fAdaptiveBandwidthFactor(1.0),
+fCanonicalBandwidths(std::vector<Double_t>(kTotalKernels, 0.0)),
+fKernelSigmas2(std::vector<Double_t>(kTotalKernels, -1.0)),
+fSettedOptions(std::vector<Bool_t>(4, kFALSE))
{
//Class constructor
SetOptions(option, rho);
@@ -469,9 +469,9 @@ void TKDE::InitFromNewData() {
Double_t midspread = ComputeMidspread();
SetMean();
SetSigma(midspread);
-// if (fUseBins) {
-// } // bin usage is not supported in this case
-//
+ // if (fUseBins) {
+ // } // bin usage is not supported in this case
+ //
fWeightSize = fNEvents / (fXMax - fXMin);
if (fUseMirroring) {
SetMirroredEvents();
@@ -583,13 +583,13 @@ TF1* TKDE::GetFunction(UInt_t npx, Double_t xMin, Double_t xMax) {
}
TF1* TKDE::GetUpperFunction(Double_t confidenceLevel, UInt_t npx, Double_t xMin, Double_t xMax) {
- // Returns the PDF upper estimate (upper confidence interval limit)
- return GetPDFUpperConfidenceInterval(confidenceLevel,npx,xMin,xMax);
+ // Returns the PDF upper estimate (upper confidence interval limit)
+ return GetPDFUpperConfidenceInterval(confidenceLevel,npx,xMin,xMax);
}
TF1* TKDE::GetLowerFunction(Double_t confidenceLevel, UInt_t npx, Double_t xMin, Double_t xMax) {
- // Returns the PDF lower estimate (lower confidence interval limit)
- return GetPDFLowerConfidenceInterval(confidenceLevel,npx,xMin,xMax);
+ // Returns the PDF lower estimate (lower confidence interval limit)
+ return GetPDFLowerConfidenceInterval(confidenceLevel,npx,xMin,xMax);
}
TF1* TKDE::GetApproximateBias(UInt_t npx, Double_t xMin, Double_t xMax) {
@@ -638,10 +638,10 @@ Double_t TKDE::GetRAMISE() const {
}
TKDE::TKernel::TKernel(Double_t weight, TKDE* kde) :
- // Internal class constructor
- fKDE(kde),
- fNWeights(kde->fData.size()),
- fWeights(fNWeights, weight)
+// Internal class constructor
+fKDE(kde),
+fNWeights(kde->fData.size()),
+fWeights(fNWeights, weight)
{}
void TKDE::TKernel::ComputeAdaptiveWeights() {
@@ -659,7 +659,7 @@ void TKDE::TKernel::ComputeAdaptiveWeights() {
Double_t kAPPROX_GEO_MEAN = 0.241970724519143365; // 1 / TMath::Power(2 * TMath::Pi(), .5) * TMath::Exp(-.5). Approximated geometric mean over pointwise data (the KDE function is substituted by the "real Gaussian" pdf) and proportional to sigma. Used directly when the mirroring is enabled, otherwise computed from the data
fKDE->fAdaptiveBandwidthFactor = fKDE->fUseMirroring ? kAPPROX_GEO_MEAN / fKDE->fSigmaRob : std::sqrt(std::exp(fKDE->fAdaptiveBandwidthFactor / fKDE->fData.size()));
transform(weights.begin(), weights.end(), fWeights.begin(), std::bind2nd(std::multiplies<Double_t>(), fKDE->fAdaptiveBandwidthFactor));
- }
+}
Double_t TKDE::TKernel::GetWeight(Double_t x) const {
// Returns the bandwidth
@@ -686,24 +686,24 @@ void TKDE::SetBinCountData() {
void TKDE::Draw(const Option_t* opt) {
// Draws either the KDE functions or its errors
- // Possible options:
+ // Possible options:
// "" (default) - draw just the kde
// "same" draw on top of existing pad
// "Errors" draw a TGraphErrors with the point and errors
// "confidenceinterval" draw KDE + conf interval functions (default is 95%)
// "confidenceinterval@0.90" draw KDE + conf interval functions at 90%
- // Extra options can be passed in opt for drawing the TF1 or the TGraph
+ // Extra options can be passed in opt for drawing the TF1 or the TGraph
//
- //NOTE: The functions GetDrawnFunction(), GetDrawnUpperFunction(), GetDrawnLowerFunction()
- // and GetGraphWithErrors() return the corresponding drawn objects (which are maneged by the TKDE)
+ //NOTE: The functions GetDrawnFunction(), GetDrawnUpperFunction(), GetDrawnLowerFunction()
+ // and GetGraphWithErrors() return the corresponding drawn objects (which are maneged by the TKDE)
// They can be used to changes style, color, etc...
// TString plotOpt = "";
// TString drawOpt = "";
- // LM : this is too complicates - skip it - not needed for just
+ // LM : this is too complicates - skip it - not needed for just
// three options
// SetDrawOptions(opt, plotOpt, drawOpt);
- TString plotOpt = opt;
+ TString plotOpt = opt;
plotOpt.ToLower();
TString drawOpt = plotOpt;
if(gPad && !plotOpt.Contains("same")) {
@@ -713,7 +713,7 @@ void TKDE::Draw(const Option_t* opt) {
drawOpt.ReplaceAll("errors","");
DrawErrors(drawOpt);
}
- else if (plotOpt.Contains("confidenceinterval") ||
+ else if (plotOpt.Contains("confidenceinterval") ||
plotOpt.Contains("confinterval")) {
// parse level option
drawOpt.ReplaceAll("confidenceinterval","");
@@ -723,13 +723,13 @@ void TKDE::Draw(const Option_t* opt) {
// coverity [secure_coding : FALSE]
if (s != 0) sscanf(s,"interval@%lf",&level);
if((level <= 0) || (level >= 1)) {
- Warning("Draw","given confidence level %.3lf is invalid - use default 0.95",level);
+ Warning("Draw","given confidence level %.3lf is invalid - use default 0.95",level);
level = 0.95;
}
DrawConfidenceInterval(drawOpt,level);
}
else {
- if (fPDF) delete fPDF;
+ if (fPDF) delete fPDF;
fPDF = GetKDEFunction();
fPDF->Draw(drawOpt);
}
@@ -970,7 +970,7 @@ TKDE::KernelIntegrand::KernelIntegrand(const TKDE* kde, EIntegralResult intRes)
Double_t TKDE::KernelIntegrand::operator()(Double_t x) const {
// Internal class unary function
if (fIntegralResult == kNorm) {
- return std::pow((*fKDE->fKernelFunction)(x), 2);
+ return std::pow((*fKDE->fKernelFunction)(x), 2);
} else if (fIntegralResult == kMu) {
return x * (*fKDE->fKernelFunction)(x);
} else if (fIntegralResult == kSigma2) {
@@ -991,7 +991,7 @@ TF1* TKDE::GetKDEFunction(UInt_t npx, Double_t xMin , Double_t xMax) {
if (npx > 0) pdf->SetNpx(npx);
pdf->SetTitle(title);
TF1 * f = (TF1*)pdf->Clone();
- delete pdf;
+ delete pdf;
return f;
}
@@ -1006,7 +1006,7 @@ TF1* TKDE::GetPDFUpperConfidenceInterval(Double_t confidenceLevel, UInt_t npx, D
TF1 * f = (TF1*)upperPDF->Clone();
delete upperPDF;
return f;
- }
+}
TF1* TKDE::GetPDFLowerConfidenceInterval(Double_t confidenceLevel, UInt_t npx, Double_t xMin , Double_t xMax) {
// Returns the upper estimated density
diff --git a/hist/hist/src/TMultiDimFit.cxx b/hist/hist/src/TMultiDimFit.cxx
index cdfde05681e..37b2130962f 100644
--- a/hist/hist/src/TMultiDimFit.cxx
+++ b/hist/hist/src/TMultiDimFit.cxx
@@ -6,205 +6,205 @@
//
// Begin_Html
/*
-</pre>
-<H1><A NAME="SECTION00010000000000000000">
-Multidimensional Fits in ROOT</A>
-</H1>
-
-<H1><A NAME="SECTION00020000000000000000"></A>
-<A NAME="sec:overview"></A><BR>
-Overview
-</H1>
-
-<P>
-A common problem encountered in different fields of applied science is
-to find an expression for one physical quantity in terms of several
-others, which are directly measurable.
-
-<P>
-An example in high energy physics is the evaluation of the momentum of
-a charged particle from the observation of its trajectory in a magnetic
-field. The problem is to relate the momentum of the particle to the
-observations, which may consists of of positional measurements at
-intervals along the particle trajectory.
-
-<P>
-The exact functional relationship between the measured quantities
-(e.g., the space-points) and the dependent quantity (e.g., the
-momentum) is in general not known, but one possible way of solving the
-problem, is to find an expression which reliably approximates the
-dependence of the momentum on the observations.
-
-<P>
-This explicit function of the observations can be obtained by a
-<I>least squares</I> fitting procedure applied to a representive
-sample of the data, for which the dependent quantity (e.g., momentum)
-and the independent observations are known. The function can then be
-used to compute the quantity of interest for new observations of the
-independent variables.
-
-<P>
-This class <TT>TMultiDimFit</TT> implements such a procedure in
-ROOT. It is largely based on the CERNLIB MUDIFI package
-[<A
+ </pre>
+ <H1><A NAME="SECTION00010000000000000000">
+ Multidimensional Fits in ROOT</A>
+ </H1>
+
+ <H1><A NAME="SECTION00020000000000000000"></A>
+ <A NAME="sec:overview"></A><BR>
+ Overview
+ </H1>
+
+ <P>
+ A common problem encountered in different fields of applied science is
+ to find an expression for one physical quantity in terms of several
+ others, which are directly measurable.
+
+ <P>
+ An example in high energy physics is the evaluation of the momentum of
+ a charged particle from the observation of its trajectory in a magnetic
+ field. The problem is to relate the momentum of the particle to the
+ observations, which may consists of of positional measurements at
+ intervals along the particle trajectory.
+
+ <P>
+ The exact functional relationship between the measured quantities
+ (e.g., the space-points) and the dependent quantity (e.g., the
+ momentum) is in general not known, but one possible way of solving the
+ problem, is to find an expression which reliably approximates the
+ dependence of the momentum on the observations.
+
+ <P>
+ This explicit function of the observations can be obtained by a
+ <I>least squares</I> fitting procedure applied to a representive
+ sample of the data, for which the dependent quantity (e.g., momentum)
+ and the independent observations are known. The function can then be
+ used to compute the quantity of interest for new observations of the
+ independent variables.
+
+ <P>
+ This class <TT>TMultiDimFit</TT> implements such a procedure in
+ ROOT. It is largely based on the CERNLIB MUDIFI package
+ [<A
HREF="TMultiFimFit.html#mudifi">2</A>]. Though the basic concepts are still sound, and
-therefore kept, a few implementation details have changed, and this
-class can take advantage of MINUIT [<A
+ therefore kept, a few implementation details have changed, and this
+ class can take advantage of MINUIT [<A
HREF="TMultiFimFit.html#minuit">4</A>] to improve the errors
-of the fitting, thanks to the class <TT>TMinuit</TT>.
+ of the fitting, thanks to the class <TT>TMinuit</TT>.
-<P>
-In [<A
+ <P>
+ In [<A
HREF="TMultiFimFit.html#wind72">5</A>] and [<A
HREF="TMultiFimFit.html#wind81">6</A>] H. Wind demonstrates the utility
-of this procedure in the context of tracking, magnetic field
-parameterisation, and so on. The outline of the method used in this
-class is based on Winds discussion, and I refer these two excellents
-text for more information.
-
-<P>
-And example of usage is given in
-<A NAME="tex2html1"
- HREF="
- ./examples/multidimfit.C"><TT>$ROOTSYS/tutorials/fit/multidimfit.C</TT></A>.
-
-<P>
-
-<H1><A NAME="SECTION00030000000000000000"></A>
-<A NAME="sec:method"></A><BR>
-The Method
-</H1>
-
-<P>
-Let <IMG
+ of this procedure in the context of tracking, magnetic field
+ parameterisation, and so on. The outline of the method used in this
+ class is based on Winds discussion, and I refer these two excellents
+ text for more information.
+
+ <P>
+ And example of usage is given in
+ <A NAME="tex2html1"
+ HREF="
+ ./examples/multidimfit.C"><TT>$ROOTSYS/tutorials/fit/multidimfit.C</TT></A>.
+
+ <P>
+
+ <H1><A NAME="SECTION00030000000000000000"></A>
+ <A NAME="sec:method"></A><BR>
+ The Method
+ </H1>
+
+ <P>
+ Let <IMG
WIDTH="18" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img7.gif"
ALT="$ D$"> by the dependent quantity of interest, which depends smoothly
-on the observable quantities <!-- MATH
+ on the observable quantities <!-- MATH
$x_1, \ldots, x_N$
-->
-<IMG
+ <IMG
WIDTH="80" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img8.gif"
ALT="$ x_1, \ldots, x_N$">, which we'll denote by
-<!-- MATH
+ <!-- MATH
$\mathbf{x}$
-->
-<IMG
+ <IMG
WIDTH="14" HEIGHT="13" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img9.gif"
ALT="$ \mathbf{x}$">. Given a training sample of <IMG
WIDTH="21" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img10.gif"
ALT="$ M$"> tuples of the form,
-(<A NAME="tex2html2"
- HREF="
- ./TMultiDimFit.html#TMultiDimFit:AddRow"><TT>TMultiDimFit::AddRow</TT></A>)
-<!-- MATH
+ (<A NAME="tex2html2"
+ HREF="
+ ./TMultiDimFit.html#TMultiDimFit:AddRow"><TT>TMultiDimFit::AddRow</TT></A>)
+ <!-- MATH
\begin{displaymath}
-\left(\mathbf{x}_j, D_j, E_j\right)\quad,
-\end{displaymath}
+ \left(\mathbf{x}_j, D_j, E_j\right)\quad,
+ \end{displaymath}
-->
-<P></P><DIV ALIGN="CENTER">
-<IMG
+ <P></P><DIV ALIGN="CENTER">
+ <IMG
WIDTH="108" HEIGHT="31" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img11.gif"
ALT="$\displaystyle \left(\mathbf{x}_j, D_j, E_j\right)\quad,
-$">
-</DIV><P></P>
-where <!-- MATH
+ $">
+ </DIV><P></P>
+ where <!-- MATH
$\mathbf{x}_j = (x_{1,j},\ldots,x_{N,j})$
-->
-<IMG
+ <IMG
WIDTH="148" HEIGHT="31" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img12.gif"
ALT="$ \mathbf{x}_j = (x_{1,j},\ldots,x_{N,j})$"> are <IMG
WIDTH="19" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img13.gif"
ALT="$ N$"> independent
-variables, <IMG
+ variables, <IMG
WIDTH="24" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img14.gif"
ALT="$ D_j$"> is the known, quantity dependent at <!-- MATH
$\mathbf{x}_j$
-->
-<IMG
+ <IMG
WIDTH="20" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img15.gif"
ALT="$ \mathbf{x}_j$">,
-and <IMG
+ and <IMG
WIDTH="23" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img16.gif"
ALT="$ E_j$"> is the square error in <IMG
WIDTH="24" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img14.gif"
ALT="$ D_j$">, the class
-<A NAME="tex2html3"
- HREF="./TMultiDimFit.html"><TT>TMultiDimFit</TT></A>
-will
-try to find the parameterization
-<P></P>
-<DIV ALIGN="CENTER"><A NAME="Dp"></A><!-- MATH
+ <A NAME="tex2html3"
+ HREF="./TMultiDimFit.html"><TT>TMultiDimFit</TT></A>
+ will
+ try to find the parameterization
+ <P></P>
+ <DIV ALIGN="CENTER"><A NAME="Dp"></A><!-- MATH
\begin{equation}
-D_p(\mathbf{x}) = \sum_{l=1}^{L} c_l \prod_{i=1}^{N} p_{li}\left(x_i\right)
- = \sum_{l=1}^{L} c_l F_l(\mathbf{x})
-\end{equation}
+ D_p(\mathbf{x}) = \sum_{l=1}^{L} c_l \prod_{i=1}^{N} p_{li}\left(x_i\right)
+ = \sum_{l=1}^{L} c_l F_l(\mathbf{x})
+ \end{equation}
-->
-<TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
-<TR VALIGN="MIDDLE">
-<TD NOWRAP ALIGN="CENTER"><IMG
+ <TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
+ <TR VALIGN="MIDDLE">
+ <TD NOWRAP ALIGN="CENTER"><IMG
WIDTH="274" HEIGHT="65" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img17.gif"
ALT="$\displaystyle D_p(\mathbf{x}) = \sum_{l=1}^{L} c_l \prod_{i=1}^{N} p_{li}\left(x_i\right) = \sum_{l=1}^{L} c_l F_l(\mathbf{x})$"></TD>
-<TD NOWRAP WIDTH="10" ALIGN="RIGHT">
-(1)</TD></TR>
-</TABLE></DIV>
-<BR CLEAR="ALL"><P></P>
-such that
-<P></P>
-<DIV ALIGN="CENTER"><A NAME="S"></A><!-- MATH
+ <TD NOWRAP WIDTH="10" ALIGN="RIGHT">
+ (1)</TD></TR>
+ </TABLE></DIV>
+ <BR CLEAR="ALL"><P></P>
+ such that
+ <P></P>
+ <DIV ALIGN="CENTER"><A NAME="S"></A><!-- MATH
\begin{equation}
-S \equiv \sum_{j=1}^{M} \left(D_j - D_p\left(\mathbf{x}_j\right)\right)^2
-\end{equation}
+ S \equiv \sum_{j=1}^{M} \left(D_j - D_p\left(\mathbf{x}_j\right)\right)^2
+ \end{equation}
-->
-<TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
-<TR VALIGN="MIDDLE">
-<TD NOWRAP ALIGN="CENTER"><IMG
+ <TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
+ <TR VALIGN="MIDDLE">
+ <TD NOWRAP ALIGN="CENTER"><IMG
WIDTH="172" HEIGHT="65" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img18.gif"
ALT="$\displaystyle S \equiv \sum_{j=1}^{M} \left(D_j - D_p\left(\mathbf{x}_j\right)\right)^2$"></TD>
-<TD NOWRAP WIDTH="10" ALIGN="RIGHT">
-(2)</TD></TR>
-</TABLE></DIV>
-<BR CLEAR="ALL"><P></P>
-is minimal. Here <!-- MATH
+ <TD NOWRAP WIDTH="10" ALIGN="RIGHT">
+ (2)</TD></TR>
+ </TABLE></DIV>
+ <BR CLEAR="ALL"><P></P>
+ is minimal. Here <!-- MATH
$p_{li}(x_i)$
-->
-<IMG
+ <IMG
WIDTH="48" HEIGHT="31" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img19.gif"
ALT="$ p_{li}(x_i)$"> are monomials, or Chebyshev or Legendre
-polynomials, labelled <!-- MATH
+ polynomials, labelled <!-- MATH
$l = 1, \ldots, L$
-->
-<IMG
+ <IMG
WIDTH="87" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img20.gif"
ALT="$ l = 1, \ldots, L$">, in each variable
-<IMG
+ <IMG
WIDTH="18" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img21.gif"
ALT="$ x_i$">, <!-- MATH
$i=1, \ldots, N$
-->
-<IMG
+ <IMG
WIDTH="91" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img22.gif"
ALT="$ i=1, \ldots, N$">.
-<P>
-So what <TT>TMultiDimFit</TT> does, is to determine the number of
-terms <IMG
+ <P>
+ So what <TT>TMultiDimFit</TT> does, is to determine the number of
+ terms <IMG
WIDTH="15" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img23.gif"
ALT="$ L$">, and then <IMG
@@ -217,79 +217,79 @@ terms <IMG
WIDTH="15" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img23.gif"
ALT="$ L$">
-coefficients <IMG
+ coefficients <IMG
WIDTH="16" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img25.gif"
ALT="$ c_l$">, so that <IMG
WIDTH="15" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img26.gif"
ALT="$ S$"> is minimal
-(<A NAME="tex2html4"
- HREF="
- ./TMultiDimFit.html#TMultiDimFit:FindParameterization"><TT>TMultiDimFit::FindParameterization</TT></A>).
+ (<A NAME="tex2html4"
+ HREF="
+ ./TMultiDimFit.html#TMultiDimFit:FindParameterization"><TT>TMultiDimFit::FindParameterization</TT></A>).
-<P>
-Of course it's more than a little unlikely that <IMG
+ <P>
+ Of course it's more than a little unlikely that <IMG
WIDTH="15" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img26.gif"
ALT="$ S$"> will ever become
-exact zero as a result of the procedure outlined below. Therefore, the
-user is asked to provide a minimum relative error <IMG
+ exact zero as a result of the procedure outlined below. Therefore, the
+ user is asked to provide a minimum relative error <IMG
WIDTH="11" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img27.gif"
ALT="$ \epsilon$">
-(<A NAME="tex2html5"
- HREF="
- ./TMultiDimFit.html#TMultiDimFit:SetMinRelativeError"><TT>TMultiDimFit::SetMinRelativeError</TT></A>), and <IMG
+ (<A NAME="tex2html5"
+ HREF="
+ ./TMultiDimFit.html#TMultiDimFit:SetMinRelativeError"><TT>TMultiDimFit::SetMinRelativeError</TT></A>), and <IMG
WIDTH="15" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img26.gif"
ALT="$ S$">
-will be considered minimized when
-<!-- MATH
+ will be considered minimized when
+ <!-- MATH
\begin{displaymath}
-R = \frac{S}{\sum_{j=1}^M D_j^2} < \epsilon
-\end{displaymath}
+ R = \frac{S}{\sum_{j=1}^M D_j^2} < \epsilon
+ \end{displaymath}
-->
-<P></P><DIV ALIGN="CENTER">
-<IMG
+ <P></P><DIV ALIGN="CENTER">
+ <IMG
WIDTH="132" HEIGHT="51" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img28.gif"
ALT="$\displaystyle R = \frac{S}{\sum_{j=1}^M D_j^2} < \epsilon
-$">
-</DIV><P></P>
+ $">
+ </DIV><P></P>
-<P>
-Optionally, the user may impose a functional expression by specifying
-the powers of each variable in <IMG
+ <P>
+ Optionally, the user may impose a functional expression by specifying
+ the powers of each variable in <IMG
WIDTH="15" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img23.gif"
ALT="$ L$"> specified functions <!-- MATH
$F_1, \ldots,
-F_L$
+ F_L$
-->
-<IMG
+ <IMG
WIDTH="79" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img29.gif"
ALT="$ F_1, \ldots,
-F_L$"> (<A NAME="tex2html6"
- HREF="
- ./TMultiDimFit.html#TMultiDimFit:SetPowers"><TT>TMultiDimFit::SetPowers</TT></A>). In that case, only the
-coefficients <IMG
+ F_L$"> (<A NAME="tex2html6"
+ HREF="
+ ./TMultiDimFit.html#TMultiDimFit:SetPowers"><TT>TMultiDimFit::SetPowers</TT></A>). In that case, only the
+ coefficients <IMG
WIDTH="16" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img25.gif"
ALT="$ c_l$"> is calculated by the class.
-<P>
+ <P>
-<H2><A NAME="SECTION00031000000000000000"></A>
-<A NAME="sec:selection"></A><BR>
-Limiting the Number of Terms
-</H2>
+ <H2><A NAME="SECTION00031000000000000000"></A>
+ <A NAME="sec:selection"></A><BR>
+ Limiting the Number of Terms
+ </H2>
-<P>
-As always when dealing with fits, there's a real chance of
-<I>over fitting</I>. As is well-known, it's always possible to fit an
-<IMG
+ <P>
+ As always when dealing with fits, there's a real chance of
+ <I>over fitting</I>. As is well-known, it's always possible to fit an
+ <IMG
WIDTH="46" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img30.gif"
ALT="$ N-1$"> polynomial in <IMG
@@ -304,62 +304,62 @@ As always when dealing with fits, there's a real chance of
ALT="$ (x,y)$"> with <!-- MATH
$\chi^2 = 0$
-->
-<IMG
+ <IMG
WIDTH="50" HEIGHT="33" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img33.gif"
ALT="$ \chi^2 = 0$">, but
-the polynomial is not likely to fit new data at all
-[<A
+ the polynomial is not likely to fit new data at all
+ [<A
HREF="TMultiFimFit.html#bevington">1</A>]. Therefore, the user is asked to provide an upper
-limit, <IMG
+ limit, <IMG
WIDTH="41" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img34.gif"
ALT="$ L_{max}$"> to the number of terms in <IMG
WIDTH="25" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img35.gif"
ALT="$ D_p$">
-(<A NAME="tex2html7"
- HREF="
- ./TMultiDimFit.html#TMultiDimFit:SetMaxTerms"><TT>TMultiDimFit::SetMaxTerms</TT></A>).
+ (<A NAME="tex2html7"
+ HREF="
+ ./TMultiDimFit.html#TMultiDimFit:SetMaxTerms"><TT>TMultiDimFit::SetMaxTerms</TT></A>).
-<P>
-However, since there's an infinite number of <IMG
+ <P>
+ However, since there's an infinite number of <IMG
WIDTH="19" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img24.gif"
ALT="$ F_l$"> to choose from, the
-user is asked to give the maximum power. <IMG
+ user is asked to give the maximum power. <IMG
WIDTH="49" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img36.gif"
ALT="$ P_{max,i}$">, of each variable
-<IMG
+ <IMG
WIDTH="18" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img21.gif"
ALT="$ x_i$"> to be considered in the minimization of <IMG
WIDTH="15" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img26.gif"
ALT="$ S$">
-(<A NAME="tex2html8"
- HREF="
- ./TMultiDimFit.html#TMultiDimFit:SetMaxPowers"><TT>TMultiDimFit::SetMaxPowers</TT></A>).
+ (<A NAME="tex2html8"
+ HREF="
+ ./TMultiDimFit.html#TMultiDimFit:SetMaxPowers"><TT>TMultiDimFit::SetMaxPowers</TT></A>).
-<P>
-One way of obtaining values for the maximum power in variable <IMG
+ <P>
+ One way of obtaining values for the maximum power in variable <IMG
WIDTH="10" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img37.gif"
ALT="$ i$">, is
-to perform a regular fit to the dependent quantity <IMG
+ to perform a regular fit to the dependent quantity <IMG
WIDTH="18" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img7.gif"
ALT="$ D$">, using a
-polynomial only in <IMG
+ polynomial only in <IMG
WIDTH="18" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img21.gif"
ALT="$ x_i$">. The maximum power is <IMG
WIDTH="49" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img36.gif"
ALT="$ P_{max,i}$"> is then the
-power that does not significantly improve the one-dimensional
-least-square fit over <IMG
+ power that does not significantly improve the one-dimensional
+ least-square fit over <IMG
WIDTH="18" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img21.gif"
ALT="$ x_i$"> to <IMG
@@ -368,137 +368,137 @@ least-square fit over <IMG
ALT="$ D$"> [<A
HREF="TMultiFimFit.html#wind72">5</A>].
-<P>
-There are still a huge amount of possible choices for <IMG
+ <P>
+ There are still a huge amount of possible choices for <IMG
WIDTH="19" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img24.gif"
ALT="$ F_l$">; in fact
-there are <!-- MATH
+ there are <!-- MATH
$\prod_{i=1}^{N} (P_{max,i} + 1)$
-->
-<IMG
+ <IMG
WIDTH="125" HEIGHT="39" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img38.gif"
ALT="$ \prod_{i=1}^{N} (P_{max,i} + 1)$"> possible
-choices. Obviously we need to limit this. To this end, the user is
-asked to set a <I>power control limit</I>, <IMG
+ choices. Obviously we need to limit this. To this end, the user is
+ asked to set a <I>power control limit</I>, <IMG
WIDTH="17" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img39.gif"
ALT="$ Q$">
-(<A NAME="tex2html9"
- HREF="
- ./TMultiDimFit.html#TMultiDimFit:SetPowerLimit"><TT>TMultiDimFit::SetPowerLimit</TT></A>), and a function
-<IMG
+ (<A NAME="tex2html9"
+ HREF="
+ ./TMultiDimFit.html#TMultiDimFit:SetPowerLimit"><TT>TMultiDimFit::SetPowerLimit</TT></A>), and a function
+ <IMG
WIDTH="19" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img24.gif"
ALT="$ F_l$"> is only accepted if
-<!-- MATH
+ <!-- MATH
\begin{displaymath}
-Q_l = \sum_{i=1}^{N} \frac{P_{li}}{P_{max,i}} < Q
-\end{displaymath}
+ Q_l = \sum_{i=1}^{N} \frac{P_{li}}{P_{max,i}} < Q
+ \end{displaymath}
-->
-<P></P><DIV ALIGN="CENTER">
-<IMG
+ <P></P><DIV ALIGN="CENTER">
+ <IMG
WIDTH="151" HEIGHT="65" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img40.gif"
ALT="$\displaystyle Q_l = \sum_{i=1}^{N} \frac{P_{li}}{P_{max,i}} < Q
-$">
-</DIV><P></P>
-where <IMG
+ $">
+ </DIV><P></P>
+ where <IMG
WIDTH="24" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img41.gif"
ALT="$ P_{li}$"> is the leading power of variable <IMG
WIDTH="18" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img21.gif"
ALT="$ x_i$"> in function
-<IMG
+ <IMG
WIDTH="19" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img24.gif"
ALT="$ F_l$">. (<A NAME="tex2html10"
- HREF="
+ HREF="
-./TMultiDimFit.html#TMultiDimFit:MakeCandidates"><TT>TMultiDimFit::MakeCandidates</TT></A>). So the number of
-functions increase with <IMG
+ ./TMultiDimFit.html#TMultiDimFit:MakeCandidates"><TT>TMultiDimFit::MakeCandidates</TT></A>). So the number of
+ functions increase with <IMG
WIDTH="17" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img39.gif"
ALT="$ Q$"> (1, 2 is fine, 5 is way out).
-<P>
+ <P>
-<H2><A NAME="SECTION00032000000000000000">
-Gram-Schmidt Orthogonalisation</A>
-</H2>
+ <H2><A NAME="SECTION00032000000000000000">
+ Gram-Schmidt Orthogonalisation</A>
+ </H2>
-<P>
-To further reduce the number of functions in the final expression,
-only those functions that significantly reduce <IMG
+ <P>
+ To further reduce the number of functions in the final expression,
+ only those functions that significantly reduce <IMG
WIDTH="15" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img26.gif"
ALT="$ S$"> is chosen. What
-`significant' means, is chosen by the user, and will be
-discussed below (see <A HREF="TMultiFimFit.html#sec:selectiondetail">2.3</A>).
+ `significant' means, is chosen by the user, and will be
+ discussed below (see <A HREF="TMultiFimFit.html#sec:selectiondetail">2.3</A>).
-<P>
-The functions <IMG
+ <P>
+ The functions <IMG
WIDTH="19" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img24.gif"
ALT="$ F_l$"> are generally not orthogonal, which means one will
-have to evaluate all possible <IMG
+ have to evaluate all possible <IMG
WIDTH="19" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img24.gif"
ALT="$ F_l$">'s over all data-points before
-finding the most significant [<A
+ finding the most significant [<A
HREF="TMultiFimFit.html#bevington">1</A>]. We can, however, do
-better then that. By applying the <I>modified Gram-Schmidt
- orthogonalisation</I> algorithm [<A
+ better then that. By applying the <I>modified Gram-Schmidt
+ orthogonalisation</I> algorithm [<A
HREF="TMultiFimFit.html#wind72">5</A>] [<A
HREF="TMultiFimFit.html#golub">3</A>] to the
-functions <IMG
+ functions <IMG
WIDTH="19" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img24.gif"
ALT="$ F_l$">, we can evaluate the contribution to the reduction of
-<IMG
+ <IMG
WIDTH="15" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img26.gif"
ALT="$ S$"> from each function in turn, and we may delay the actual inversion
-of the curvature-matrix
-(<A NAME="tex2html11"
- HREF="
- ./TMultiDimFit.html#TMultiDimFit:MakeGramSchmidt"><TT>TMultiDimFit::MakeGramSchmidt</TT></A>).
+ of the curvature-matrix
+ (<A NAME="tex2html11"
+ HREF="
+ ./TMultiDimFit.html#TMultiDimFit:MakeGramSchmidt"><TT>TMultiDimFit::MakeGramSchmidt</TT></A>).
-<P>
-So we are let to consider an <IMG
+ <P>
+ So we are let to consider an <IMG
WIDTH="52" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img42.gif"
ALT="$ M\times L$"> matrix <!-- MATH
$\mathsf{F}$
-->
-<IMG
+ <IMG
WIDTH="13" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img43.gif"
ALT="$ \mathsf{F}$">, an
-element of which is given by
-<P></P>
-<DIV ALIGN="CENTER"><A NAME="eq:Felem"></A><!-- MATH
+ element of which is given by
+ <P></P>
+ <DIV ALIGN="CENTER"><A NAME="eq:Felem"></A><!-- MATH
\begin{equation}
-f_{jl} = F_j\left(x_{1j} , x_{2j}, \ldots, x_{Nj}\right)
- = F_l(\mathbf{x}_j)\, \quad\mbox{with}~j=1,2,\ldots,M,
-\end{equation}
+ f_{jl} = F_j\left(x_{1j} , x_{2j}, \ldots, x_{Nj}\right)
+ = F_l(\mathbf{x}_j)\, \quad\mbox{with}~j=1,2,\ldots,M,
+ \end{equation}
-->
-<TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
-<TR VALIGN="MIDDLE">
-<TD NOWRAP ALIGN="CENTER"><IMG
+ <TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
+ <TR VALIGN="MIDDLE">
+ <TD NOWRAP ALIGN="CENTER"><IMG
WIDTH="260" HEIGHT="31" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img44.gif"
ALT="$\displaystyle f_{jl} = F_j\left(x_{1j} , x_{2j}, \ldots, x_{Nj}\right) = F_l(\mathbf{x}_j) $"> with<IMG
WIDTH="120" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img45.gif"
ALT="$\displaystyle j=1,2,\ldots,M,$"></TD>
-<TD NOWRAP WIDTH="10" ALIGN="RIGHT">
-(3)</TD></TR>
-</TABLE></DIV>
-<BR CLEAR="ALL"><P></P>
-where <IMG
+ <TD NOWRAP WIDTH="10" ALIGN="RIGHT">
+ (3)</TD></TR>
+ </TABLE></DIV>
+ <BR CLEAR="ALL"><P></P>
+ where <IMG
WIDTH="12" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img46.gif"
ALT="$ j$"> labels the <IMG
@@ -508,7 +508,7 @@ where <IMG
WIDTH="9" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img47.gif"
ALT="$ l$"> labels
-<IMG
+ <IMG
WIDTH="15" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img23.gif"
ALT="$ L$"> functions of <IMG
@@ -521,471 +521,471 @@ where <IMG
WIDTH="23" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img49.gif"
ALT="$ f_{jl}$"> is
-the term (or function) numbered <IMG
+ the term (or function) numbered <IMG
WIDTH="9" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img47.gif"
ALT="$ l$"> evaluated at the data point
-<IMG
+ <IMG
WIDTH="12" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img46.gif"
ALT="$ j$">. We have to normalise <!-- MATH
$\mathbf{x}_j$
-->
-<IMG
+ <IMG
WIDTH="20" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img15.gif"
ALT="$ \mathbf{x}_j$"> to <IMG
WIDTH="48" HEIGHT="31" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img50.gif"
ALT="$ [-1,1]$"> for this to
-succeed [<A
+ succeed [<A
HREF="TMultiFimFit.html#wind72">5</A>]
-(<A NAME="tex2html12"
- HREF="
- ./TMultiDimFit.html#TMultiDimFit:MakeNormalized"><TT>TMultiDimFit::MakeNormalized</TT></A>). We then define a
-matrix <!-- MATH
+ (<A NAME="tex2html12"
+ HREF="
+ ./TMultiDimFit.html#TMultiDimFit:MakeNormalized"><TT>TMultiDimFit::MakeNormalized</TT></A>). We then define a
+ matrix <!-- MATH
$\mathsf{W}$
-->
-<IMG
+ <IMG
WIDTH="19" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img51.gif"
ALT="$ \mathsf{W}$"> of which the columns <!-- MATH
$\mathbf{w}_j$
-->
-<IMG
+ <IMG
WIDTH="24" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img52.gif"
ALT="$ \mathbf{w}_j$"> are given by
-<BR>
-<DIV ALIGN="CENTER"><A NAME="eq:wj"></A><!-- MATH
+ <BR>
+ <DIV ALIGN="CENTER"><A NAME="eq:wj"></A><!-- MATH
\begin{eqnarray}
-\mathbf{w}_1 &=& \mathbf{f}_1 = F_1\left(\mathbf x_1\right)\\
- \mathbf{w}_l &=& \mathbf{f}_l - \sum^{l-1}_{k=1} \frac{\mathbf{f}_l \bullet
- \mathbf{w}_k}{\mathbf{w}_k^2}\mathbf{w}_k\,.
-\end{eqnarray}
+ \mathbf{w}_1 &=& \mathbf{f}_1 = F_1\left(\mathbf x_1\right)\\
+ \mathbf{w}_l &=& \mathbf{f}_l - \sum^{l-1}_{k=1} \frac{\mathbf{f}_l \bullet
+ \mathbf{w}_k}{\mathbf{w}_k^2}\mathbf{w}_k\,.
+ \end{eqnarray}
-->
-<TABLE CELLPADDING="0" ALIGN="CENTER" WIDTH="100%">
-<TR VALIGN="MIDDLE"><TD NOWRAP ALIGN="RIGHT"><IMG
+ <TABLE CELLPADDING="0" ALIGN="CENTER" WIDTH="100%">
+ <TR VALIGN="MIDDLE"><TD NOWRAP ALIGN="RIGHT"><IMG
WIDTH="25" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img53.gif"
ALT="$\displaystyle \mathbf{w}_1$"></TD>
-<TD WIDTH="10" ALIGN="CENTER" NOWRAP><IMG
+ <TD WIDTH="10" ALIGN="CENTER" NOWRAP><IMG
WIDTH="16" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img54.gif"
ALT="$\displaystyle =$"></TD>
-<TD ALIGN="LEFT" NOWRAP><IMG
+ <TD ALIGN="LEFT" NOWRAP><IMG
WIDTH="87" HEIGHT="31" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img55.gif"
ALT="$\displaystyle \mathbf{f}_1 = F_1\left(\mathbf x_1\right)$"></TD>
-<TD WIDTH=10 ALIGN="RIGHT">
-(4)</TD></TR>
-<TR VALIGN="MIDDLE"><TD NOWRAP ALIGN="RIGHT"><IMG
+ <TD WIDTH=10 ALIGN="RIGHT">
+ (4)</TD></TR>
+ <TR VALIGN="MIDDLE"><TD NOWRAP ALIGN="RIGHT"><IMG
WIDTH="22" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img56.gif"
ALT="$\displaystyle \mathbf{w}_l$"></TD>
-<TD WIDTH="10" ALIGN="CENTER" NOWRAP><IMG
+ <TD WIDTH="10" ALIGN="CENTER" NOWRAP><IMG
WIDTH="16" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img54.gif"
ALT="$\displaystyle =$"></TD>
-<TD ALIGN="LEFT" NOWRAP><IMG
+ <TD ALIGN="LEFT" NOWRAP><IMG
WIDTH="138" HEIGHT="66" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img57.gif"
ALT="$\displaystyle \mathbf{f}_l - \sum^{l-1}_{k=1} \frac{\mathbf{f}_l \bullet
-\mathbf{w}_k}{\mathbf{w}_k^2}\mathbf{w}_k .$"></TD>
-<TD WIDTH=10 ALIGN="RIGHT">
-(5)</TD></TR>
-</TABLE></DIV>
-<BR CLEAR="ALL"><P></P>
-and <!-- MATH
+ \mathbf{w}_k}{\mathbf{w}_k^2}\mathbf{w}_k .$"></TD>
+ <TD WIDTH=10 ALIGN="RIGHT">
+ (5)</TD></TR>
+ </TABLE></DIV>
+ <BR CLEAR="ALL"><P></P>
+ and <!-- MATH
$\mathbf{w}_{l}$
-->
-<IMG
+ <IMG
WIDTH="22" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img58.gif"
ALT="$ \mathbf{w}_{l}$"> is the component of <!-- MATH
$\mathbf{f}_{l}$
-->
-<IMG
+ <IMG
WIDTH="15" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img59.gif"
ALT="$ \mathbf{f}_{l}$"> orthogonal
-to <!-- MATH
+ to <!-- MATH
$\mathbf{w}_{1}, \ldots, \mathbf{w}_{l-1}$
-->
-<IMG
+ <IMG
WIDTH="97" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img60.gif"
ALT="$ \mathbf{w}_{1}, \ldots, \mathbf{w}_{l-1}$">. Hence we obtain
-[<A
+ [<A
HREF="TMultiFimFit.html#golub">3</A>],
-<P></P>
-<DIV ALIGN="CENTER"><A NAME="eq:worto"></A><!-- MATH
+ <P></P>
+ <DIV ALIGN="CENTER"><A NAME="eq:worto"></A><!-- MATH
\begin{equation}
-\mathbf{w}_k\bullet\mathbf{w}_l = 0\quad\mbox{if}~k \neq l\quad.
-\end{equation}
+ \mathbf{w}_k\bullet\mathbf{w}_l = 0\quad\mbox{if}~k \neq l\quad.
+ \end{equation}
-->
-<TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
-<TR VALIGN="MIDDLE">
-<TD NOWRAP ALIGN="CENTER"><IMG
+ <TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
+ <TR VALIGN="MIDDLE">
+ <TD NOWRAP ALIGN="CENTER"><IMG
WIDTH="87" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img61.gif"
ALT="$\displaystyle \mathbf{w}_k\bullet\mathbf{w}_l = 0$"> if<IMG
WIDTH="65" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img62.gif"
ALT="$\displaystyle k \neq l\quad.$"></TD>
-<TD NOWRAP WIDTH="10" ALIGN="RIGHT">
-(6)</TD></TR>
-</TABLE></DIV>
-<BR CLEAR="ALL"><P></P>
+ <TD NOWRAP WIDTH="10" ALIGN="RIGHT">
+ (6)</TD></TR>
+ </TABLE></DIV>
+ <BR CLEAR="ALL"><P></P>
-<P>
-We now take as a new model <!-- MATH
+ <P>
+ We now take as a new model <!-- MATH
$\mathsf{W}\mathbf{a}$
-->
-<IMG
+ <IMG
WIDTH="28" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img63.gif"
ALT="$ \mathsf{W}\mathbf{a}$">. We thus want to
-minimize
-<P></P>
-<DIV ALIGN="CENTER"><A NAME="eq:S"></A><!-- MATH
+ minimize
+ <P></P>
+ <DIV ALIGN="CENTER"><A NAME="eq:S"></A><!-- MATH
\begin{equation}
-S\equiv \left(\mathbf{D} - \mathsf{W}\mathbf{a}\right)^2\quad,
-\end{equation}
+ S\equiv \left(\mathbf{D} - \mathsf{W}\mathbf{a}\right)^2\quad,
+ \end{equation}
-->
-<TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
-<TR VALIGN="MIDDLE">
-<TD NOWRAP ALIGN="CENTER"><IMG
+ <TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
+ <TR VALIGN="MIDDLE">
+ <TD NOWRAP ALIGN="CENTER"><IMG
WIDTH="136" HEIGHT="38" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img64.gif"
ALT="$\displaystyle S\equiv \left(\mathbf{D} - \mathsf{W}\mathbf{a}\right)^2\quad,$"></TD>
-<TD NOWRAP WIDTH="10" ALIGN="RIGHT">
-(7)</TD></TR>
-</TABLE></DIV>
-<BR CLEAR="ALL"><P></P>
-where <!-- MATH
+ <TD NOWRAP WIDTH="10" ALIGN="RIGHT">
+ (7)</TD></TR>
+ </TABLE></DIV>
+ <BR CLEAR="ALL"><P></P>
+ where <!-- MATH
$\mathbf{D} = \left(D_1,\ldots,D_M\right)$
-->
-<IMG
+ <IMG
WIDTH="137" HEIGHT="31" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img65.gif"
ALT="$ \mathbf{D} = \left(D_1,\ldots,D_M\right)$"> is a vector of the
-dependent quantity in the sample. Differentiation with respect to
-<IMG
+ dependent quantity in the sample. Differentiation with respect to
+ <IMG
WIDTH="19" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img66.gif"
ALT="$ a_j$"> gives, using (<A HREF="TMultiFimFit.html#eq:worto">6</A>),
-<P></P>
-<DIV ALIGN="CENTER"><A NAME="eq:dS"></A><!-- MATH
+ <P></P>
+ <DIV ALIGN="CENTER"><A NAME="eq:dS"></A><!-- MATH
\begin{equation}
-\mathbf{D}\bullet\mathbf{w}_l - a_l\mathbf{w}_l^2 = 0
-\end{equation}
+ \mathbf{D}\bullet\mathbf{w}_l - a_l\mathbf{w}_l^2 = 0
+ \end{equation}
-->
-<TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
-<TR VALIGN="MIDDLE">
-<TD NOWRAP ALIGN="CENTER"><IMG
+ <TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
+ <TR VALIGN="MIDDLE">
+ <TD NOWRAP ALIGN="CENTER"><IMG
WIDTH="134" HEIGHT="35" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img67.gif"
ALT="$\displaystyle \mathbf{D}\bullet\mathbf{w}_l - a_l\mathbf{w}_l^2 = 0$"></TD>
-<TD NOWRAP WIDTH="10" ALIGN="RIGHT">
-(8)</TD></TR>
-</TABLE></DIV>
-<BR CLEAR="ALL"><P></P>
-or
-<P></P>
-<DIV ALIGN="CENTER"><A NAME="eq:dS2"></A><!-- MATH
+ <TD NOWRAP WIDTH="10" ALIGN="RIGHT">
+ (8)</TD></TR>
+ </TABLE></DIV>
+ <BR CLEAR="ALL"><P></P>
+ or
+ <P></P>
+ <DIV ALIGN="CENTER"><A NAME="eq:dS2"></A><!-- MATH
\begin{equation}
-a_l = \frac{\mathbf{D}_l\bullet\mathbf{w}_l}{\mathbf{w}_l^2}
-\end{equation}
+ a_l = \frac{\mathbf{D}_l\bullet\mathbf{w}_l}{\mathbf{w}_l^2}
+ \end{equation}
-->
-<TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
-<TR VALIGN="MIDDLE">
-<TD NOWRAP ALIGN="CENTER"><IMG
+ <TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
+ <TR VALIGN="MIDDLE">
+ <TD NOWRAP ALIGN="CENTER"><IMG
WIDTH="95" HEIGHT="51" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img68.gif"
ALT="$\displaystyle a_l = \frac{\mathbf{D}_l\bullet\mathbf{w}_l}{\mathbf{w}_l^2}$"></TD>
-<TD NOWRAP WIDTH="10" ALIGN="RIGHT">
-(9)</TD></TR>
-</TABLE></DIV>
-<BR CLEAR="ALL"><P></P>
-Let <IMG
+ <TD NOWRAP WIDTH="10" ALIGN="RIGHT">
+ (9)</TD></TR>
+ </TABLE></DIV>
+ <BR CLEAR="ALL"><P></P>
+ Let <IMG
WIDTH="21" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img69.gif"
ALT="$ S_j$"> be the sum of squares of residuals when taking <IMG
WIDTH="12" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img46.gif"
ALT="$ j$"> functions
-into account. Then
-<P></P>
-<DIV ALIGN="CENTER"><A NAME="eq:Sj"></A><!-- MATH
+ into account. Then
+ <P></P>
+ <DIV ALIGN="CENTER"><A NAME="eq:Sj"></A><!-- MATH
\begin{equation}
-S_l = \left[\mathbf{D} - \sum^l_{k=1} a_k\mathbf{w}_k\right]^2
- = \mathbf{D}^2 - 2\mathbf{D} \sum^l_{k=1} a_k\mathbf{w}_k
- + \sum^l_{k=1} a_k^2\mathbf{w}_k^2
-\end{equation}
- -->
-<TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
-<TR VALIGN="MIDDLE">
-<TD NOWRAP ALIGN="CENTER"><IMG
+ S_l = \left[\mathbf{D} - \sum^l_{k=1} a_k\mathbf{w}_k\right]^2
+ = \mathbf{D}^2 - 2\mathbf{D} \sum^l_{k=1} a_k\mathbf{w}_k
+ + \sum^l_{k=1} a_k^2\mathbf{w}_k^2
+ \end{equation}
+ -->
+ <TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
+ <TR VALIGN="MIDDLE">
+ <TD NOWRAP ALIGN="CENTER"><IMG
WIDTH="394" HEIGHT="72" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img70.gif"
ALT="$\displaystyle S_l = \left[\mathbf{D} - \sum^l_{k=1} a_k\mathbf{w}_k\right]^2 = ...
-...2 - 2\mathbf{D} \sum^l_{k=1} a_k\mathbf{w}_k + \sum^l_{k=1} a_k^2\mathbf{w}_k^2$"></TD>
-<TD NOWRAP WIDTH="10" ALIGN="RIGHT">
-(10)</TD></TR>
-</TABLE></DIV>
-<BR CLEAR="ALL"><P></P>
-Using (<A HREF="TMultiFimFit.html#eq:dS2">9</A>), we see that
-<BR>
-<DIV ALIGN="CENTER"><A NAME="eq:sj2"></A><!-- MATH
+ ...2 - 2\mathbf{D} \sum^l_{k=1} a_k\mathbf{w}_k + \sum^l_{k=1} a_k^2\mathbf{w}_k^2$"></TD>
+ <TD NOWRAP WIDTH="10" ALIGN="RIGHT">
+ (10)</TD></TR>
+ </TABLE></DIV>
+ <BR CLEAR="ALL"><P></P>
+ Using (<A HREF="TMultiFimFit.html#eq:dS2">9</A>), we see that
+ <BR>
+ <DIV ALIGN="CENTER"><A NAME="eq:sj2"></A><!-- MATH
\begin{eqnarray}
-S_l &=& \mathbf{D}^2 - 2 \sum^l_{k=1} a_k^2\mathbf{w}_k^2 +
- \sum^j_{k=1} a_k^2\mathbf{w}_k^2\nonumber\\
- &=& \mathbf{D}^2 - \sum^l_{k=1} a_k^2\mathbf{w}_k^2\nonumber\\
- &=& \mathbf{D}^2 - \sum^l_{k=1} \frac{\left(\mathbf D\bullet \mathbf
- w_k\right)}{\mathbf w_k^2}
-\end{eqnarray}
- -->
-<TABLE CELLPADDING="0" ALIGN="CENTER" WIDTH="100%">
-<TR VALIGN="MIDDLE"><TD NOWRAP ALIGN="RIGHT"><IMG
+ S_l &=& \mathbf{D}^2 - 2 \sum^l_{k=1} a_k^2\mathbf{w}_k^2 +
+ \sum^j_{k=1} a_k^2\mathbf{w}_k^2\nonumber\\
+ &=& \mathbf{D}^2 - \sum^l_{k=1} a_k^2\mathbf{w}_k^2\nonumber\\
+ &=& \mathbf{D}^2 - \sum^l_{k=1} \frac{\left(\mathbf D\bullet \mathbf
+ w_k\right)}{\mathbf w_k^2}
+ \end{eqnarray}
+ -->
+ <TABLE CELLPADDING="0" ALIGN="CENTER" WIDTH="100%">
+ <TR VALIGN="MIDDLE"><TD NOWRAP ALIGN="RIGHT"><IMG
WIDTH="19" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img71.gif"
ALT="$\displaystyle S_l$"></TD>
-<TD WIDTH="10" ALIGN="CENTER" NOWRAP><IMG
+ <TD WIDTH="10" ALIGN="CENTER" NOWRAP><IMG
WIDTH="16" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img54.gif"
ALT="$\displaystyle =$"></TD>
-<TD ALIGN="LEFT" NOWRAP><IMG
+ <TD ALIGN="LEFT" NOWRAP><IMG
WIDTH="201" HEIGHT="67" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img72.gif"
ALT="$\displaystyle \mathbf{D}^2 - 2 \sum^l_{k=1} a_k^2\mathbf{w}_k^2 +
-\sum^j_{k=1} a_k^2\mathbf{w}_k^2$"></TD>
-<TD WIDTH=10 ALIGN="RIGHT">
- </TD></TR>
-<TR VALIGN="MIDDLE"><TD NOWRAP ALIGN="RIGHT"> </TD>
-<TD WIDTH="10" ALIGN="CENTER" NOWRAP><IMG
+ \sum^j_{k=1} a_k^2\mathbf{w}_k^2$"></TD>
+ <TD WIDTH=10 ALIGN="RIGHT">
+ </TD></TR>
+ <TR VALIGN="MIDDLE"><TD NOWRAP ALIGN="RIGHT"> </TD>
+ <TD WIDTH="10" ALIGN="CENTER" NOWRAP><IMG
WIDTH="16" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img54.gif"
ALT="$\displaystyle =$"></TD>
-<TD ALIGN="LEFT" NOWRAP><IMG
+ <TD ALIGN="LEFT" NOWRAP><IMG
WIDTH="108" HEIGHT="66" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img73.gif"
ALT="$\displaystyle \mathbf{D}^2 - \sum^l_{k=1} a_k^2\mathbf{w}_k^2$"></TD>
-<TD WIDTH=10 ALIGN="RIGHT">
- </TD></TR>
-<TR VALIGN="MIDDLE"><TD NOWRAP ALIGN="RIGHT"> </TD>
-<TD WIDTH="10" ALIGN="CENTER" NOWRAP><IMG
+ <TD WIDTH=10 ALIGN="RIGHT">
+ </TD></TR>
+ <TR VALIGN="MIDDLE"><TD NOWRAP ALIGN="RIGHT"> </TD>
+ <TD WIDTH="10" ALIGN="CENTER" NOWRAP><IMG
WIDTH="16" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img54.gif"
ALT="$\displaystyle =$"></TD>
-<TD ALIGN="LEFT" NOWRAP><IMG
+ <TD ALIGN="LEFT" NOWRAP><IMG
WIDTH="137" HEIGHT="66" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img74.gif"
ALT="$\displaystyle \mathbf{D}^2 - \sum^l_{k=1} \frac{\left(\mathbf D\bullet \mathbf
-w_k\right)}{\mathbf w_k^2}$"></TD>
-<TD WIDTH=10 ALIGN="RIGHT">
-(11)</TD></TR>
-</TABLE></DIV>
-<BR CLEAR="ALL"><P></P>
-
-<P>
-So for each new function <IMG
+ w_k\right)}{\mathbf w_k^2}$"></TD>
+ <TD WIDTH=10 ALIGN="RIGHT">
+ (11)</TD></TR>
+ </TABLE></DIV>
+ <BR CLEAR="ALL"><P></P>
+
+ <P>
+ So for each new function <IMG
WIDTH="19" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img24.gif"
ALT="$ F_l$"> included in the model, we get a
-reduction of the sum of squares of residuals of <!-- MATH
+ reduction of the sum of squares of residuals of <!-- MATH
$a_l^2\mathbf{w}_l^2$
-->
-<IMG
+ <IMG
WIDTH="40" HEIGHT="33" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img75.gif"
ALT="$ a_l^2\mathbf{w}_l^2$">,
-where <!-- MATH
+ where <!-- MATH
$\mathbf{w}_l$
-->
-<IMG
+ <IMG
WIDTH="22" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img76.gif"
ALT="$ \mathbf{w}_l$"> is given by (<A HREF="TMultiFimFit.html#eq:wj">4</A>) and <IMG
WIDTH="17" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img77.gif"
ALT="$ a_l$"> by
-(<A HREF="TMultiFimFit.html#eq:dS2">9</A>). Thus, using the Gram-Schmidt orthogonalisation, we
-can decide if we want to include this function in the final model,
-<I>before</I> the matrix inversion.
+ (<A HREF="TMultiFimFit.html#eq:dS2">9</A>). Thus, using the Gram-Schmidt orthogonalisation, we
+ can decide if we want to include this function in the final model,
+ <I>before</I> the matrix inversion.
-<P>
+ <P>
-<H2><A NAME="SECTION00033000000000000000"></A>
-<A NAME="sec:selectiondetail"></A><BR>
-Function Selection Based on Residual
-</H2>
+ <H2><A NAME="SECTION00033000000000000000"></A>
+ <A NAME="sec:selectiondetail"></A><BR>
+ Function Selection Based on Residual
+ </H2>
-<P>
-Supposing that <IMG
+ <P>
+ Supposing that <IMG
WIDTH="42" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img78.gif"
ALT="$ L-1$"> steps of the procedure have been performed, the
-problem now is to consider the <!-- MATH
+ problem now is to consider the <!-- MATH
$L^{\mbox{th}}$
-->
-<IMG
+ <IMG
WIDTH="31" HEIGHT="20" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img79.gif"
ALT="$ L^{\mbox{th}}$"> function.
-<P>
-The sum of squares of residuals can be written as
-<P></P>
-<DIV ALIGN="CENTER"><A NAME="eq:sums"></A><!-- MATH
+ <P>
+ The sum of squares of residuals can be written as
+ <P></P>
+ <DIV ALIGN="CENTER"><A NAME="eq:sums"></A><!-- MATH
\begin{equation}
-S_L = \textbf{D}^T\bullet\textbf{D} -
- \sum^L_{l=1}a^2_l\left(\textbf{w}_l^T\bullet\textbf{w}_l\right)
-\end{equation}
+ S_L = \textbf{D}^T\bullet\textbf{D} -
+ \sum^L_{l=1}a^2_l\left(\textbf{w}_l^T\bullet\textbf{w}_l\right)
+ \end{equation}
-->
-<TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
-<TR VALIGN="MIDDLE">
-<TD NOWRAP ALIGN="CENTER"><IMG
+ <TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
+ <TR VALIGN="MIDDLE">
+ <TD NOWRAP ALIGN="CENTER"><IMG
WIDTH="232" HEIGHT="65" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img80.gif"
ALT="$\displaystyle S_L = \textbf{D}^T\bullet\textbf{D} - \sum^L_{l=1}a^2_l\left(\textbf{w}_l^T\bullet\textbf{w}_l\right)$"></TD>
-<TD NOWRAP WIDTH="10" ALIGN="RIGHT">
-(12)</TD></TR>
-</TABLE></DIV>
-<BR CLEAR="ALL"><P></P>
-where the relation (<A HREF="TMultiFimFit.html#eq:dS2">9</A>) have been taken into account. The
-contribution of the <!-- MATH
+ <TD NOWRAP WIDTH="10" ALIGN="RIGHT">
+ (12)</TD></TR>
+ </TABLE></DIV>
+ <BR CLEAR="ALL"><P></P>
+ where the relation (<A HREF="TMultiFimFit.html#eq:dS2">9</A>) have been taken into account. The
+ contribution of the <!-- MATH
$L^{\mbox{th}}$
-->
-<IMG
+ <IMG
WIDTH="31" HEIGHT="20" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img79.gif"
ALT="$ L^{\mbox{th}}$"> function to the reduction of S, is
-given by
-<P></P>
-<DIV ALIGN="CENTER"><A NAME="eq:dSN"></A><!-- MATH
+ given by
+ <P></P>
+ <DIV ALIGN="CENTER"><A NAME="eq:dSN"></A><!-- MATH
\begin{equation}
-\Delta S_L = a^2_L\left(\textbf{w}_L^T\bullet\textbf{w}_L\right)
-\end{equation}
+ \Delta S_L = a^2_L\left(\textbf{w}_L^T\bullet\textbf{w}_L\right)
+ \end{equation}
-->
-<TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
-<TR VALIGN="MIDDLE">
-<TD NOWRAP ALIGN="CENTER"><IMG
+ <TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
+ <TR VALIGN="MIDDLE">
+ <TD NOWRAP ALIGN="CENTER"><IMG
WIDTH="154" HEIGHT="36" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img81.gif"
ALT="$\displaystyle \Delta S_L = a^2_L\left(\textbf{w}_L^T\bullet\textbf{w}_L\right)$"></TD>
-<TD NOWRAP WIDTH="10" ALIGN="RIGHT">
-(13)</TD></TR>
-</TABLE></DIV>
-<BR CLEAR="ALL"><P></P>
+ <TD NOWRAP WIDTH="10" ALIGN="RIGHT">
+ (13)</TD></TR>
+ </TABLE></DIV>
+ <BR CLEAR="ALL"><P></P>
-<P>
-Two test are now applied to decide whether this <!-- MATH
+ <P>
+ Two test are now applied to decide whether this <!-- MATH
$L^{\mbox{th}}$
-->
-<IMG
+ <IMG
WIDTH="31" HEIGHT="20" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img79.gif"
ALT="$ L^{\mbox{th}}$">
-function is to be included in the final expression, or not.
+ function is to be included in the final expression, or not.
-<P>
+ <P>
-<H3><A NAME="SECTION00033100000000000000"></A>
-<A NAME="testone"></A><BR>
-Test 1
-</H3>
+ <H3><A NAME="SECTION00033100000000000000"></A>
+ <A NAME="testone"></A><BR>
+ Test 1
+ </H3>
-<P>
-Denoting by <IMG
+ <P>
+ Denoting by <IMG
WIDTH="43" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img82.gif"
ALT="$ H_{L-1}$"> the subspace spanned by
-<!-- MATH
+ <!-- MATH
$\textbf{w}_1,\ldots,\textbf{w}_{L-1}$
-->
-<IMG
+ <IMG
WIDTH="102" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img83.gif"
ALT="$ \textbf{w}_1,\ldots,\textbf{w}_{L-1}$"> the function <!-- MATH
$\textbf{w}_L$
-->
-<IMG
+ <IMG
WIDTH="27" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img5.gif"
ALT="$ \textbf {w}_L$"> is
-by construction (see (<A HREF="TMultiFimFit.html#eq:wj">4</A>)) the projection of the function
-<IMG
+ by construction (see (<A HREF="TMultiFimFit.html#eq:wj">4</A>)) the projection of the function
+ <IMG
WIDTH="24" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img84.gif"
ALT="$ F_L$"> onto the direction perpendicular to <IMG
WIDTH="43" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img82.gif"
ALT="$ H_{L-1}$">. Now, if the
-length of <!-- MATH
+ length of <!-- MATH
$\textbf{w}_L$
-->
-<IMG
+ <IMG
WIDTH="27" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img5.gif"
ALT="$ \textbf {w}_L$"> (given by <!-- MATH
$\textbf{w}_L\bullet\textbf{w}_L$
-->
-<IMG
+ <IMG
WIDTH="65" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img85.gif"
ALT="$ \textbf{w}_L\bullet\textbf{w}_L$">)
-is very small compared to the length of <!-- MATH
+ is very small compared to the length of <!-- MATH
$\textbf{f}_L$
-->
-<IMG
+ <IMG
WIDTH="19" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img3.gif"
ALT="$ \textbf {f}_L$"> this new
-function can not contribute much to the reduction of the sum of
-squares of residuals. The test consists then in calculating the angle
-<IMG
+ function can not contribute much to the reduction of the sum of
+ squares of residuals. The test consists then in calculating the angle
+ <IMG
WIDTH="12" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img1.gif"
ALT="$ \theta $"> between the two vectors <!-- MATH
$\textbf{w}_L$
-->
-<IMG
+ <IMG
WIDTH="27" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img5.gif"
ALT="$ \textbf {w}_L$"> and <!-- MATH
$\textbf{f}_L$
-->
-<IMG
+ <IMG
WIDTH="19" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img3.gif"
ALT="$ \textbf {f}_L$">
-(see also figure <A HREF="TMultiFimFit.html#fig:thetaphi">1</A>) and requiring that it's
-<I>greater</I> then a threshold value which the user must set
-(<A NAME="tex2html14"
- HREF="
- ./TMultiDimFit.html#TMultiDimFit:SetMinAngle"><TT>TMultiDimFit::SetMinAngle</TT></A>).
-
-<P>
-
-<P></P>
-<DIV ALIGN="CENTER"><A NAME="fig:thetaphi"></A><A NAME="519"></A>
-<TABLE>
-<CAPTION ALIGN="BOTTOM"><STRONG>Figure 1:</STRONG>
-(a) Angle <IMG
+ (see also figure <A HREF="TMultiFimFit.html#fig:thetaphi">1</A>) and requiring that it's
+ <I>greater</I> then a threshold value which the user must set
+ (<A NAME="tex2html14"
+ HREF="
+ ./TMultiDimFit.html#TMultiDimFit:SetMinAngle"><TT>TMultiDimFit::SetMinAngle</TT></A>).
+
+ <P>
+
+ <P></P>
+ <DIV ALIGN="CENTER"><A NAME="fig:thetaphi"></A><A NAME="519"></A>
+ <TABLE>
+ <CAPTION ALIGN="BOTTOM"><STRONG>Figure 1:</STRONG>
+ (a) Angle <IMG
WIDTH="12" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img1.gif"
ALT="$ \theta $"> between <!-- MATH
$\textbf{w}_l$
-->
-<IMG
+ <IMG
WIDTH="22" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img2.gif"
ALT="$ \textbf {w}_l$"> and
- <!-- MATH
+ <!-- MATH
$\textbf{f}_L$
-->
-<IMG
+ <IMG
WIDTH="19" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img3.gif"
ALT="$ \textbf {f}_L$">, (b) angle <IMG
@@ -994,744 +994,744 @@ squares of residuals. The test consists then in calculating the angle
ALT="$ \phi $"> between <!-- MATH
$\textbf{w}_L$
-->
-<IMG
+ <IMG
WIDTH="27" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img5.gif"
ALT="$ \textbf {w}_L$"> and
- <!-- MATH
+ <!-- MATH
$\textbf{D}$
-->
-<IMG
+ <IMG
WIDTH="18" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img6.gif"
ALT="$ \textbf {D}$"></CAPTION>
-<TR><TD><IMG
+ <TR><TD><IMG
WIDTH="466" HEIGHT="172" BORDER="0"
SRC="gif/multidimfit_img86.gif"
ALT="\begin{figure}\begin{center}
-\begin{tabular}{p{.4\textwidth}p{.4\textwidth}}
-\...
-... \put(80,100){$\mathbf{D}$}
-\end{picture} \end{tabular} \end{center}\end{figure}"></TD></TR>
-</TABLE>
-</DIV><P></P>
+ \begin{tabular}{p{.4\textwidth}p{.4\textwidth}}
+ \...
+ ... \put(80,100){$\mathbf{D}$}
+ \end{picture} \end{tabular} \end{center}\end{figure}"></TD></TR>
+ </TABLE>
+ </DIV><P></P>
-<P>
+ <P>
-<H3><A NAME="SECTION00033200000000000000"></A> <A NAME="testtwo"></A><BR>
-Test 2
-</H3>
+ <H3><A NAME="SECTION00033200000000000000"></A> <A NAME="testtwo"></A><BR>
+ Test 2
+ </H3>
-<P>
-Let <!-- MATH
+ <P>
+ Let <!-- MATH
$\textbf{D}$
-->
-<IMG
+ <IMG
WIDTH="18" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img6.gif"
ALT="$ \textbf {D}$"> be the data vector to be fitted. As illustrated in
-figure <A HREF="TMultiFimFit.html#fig:thetaphi">1</A>, the <!-- MATH
+ figure <A HREF="TMultiFimFit.html#fig:thetaphi">1</A>, the <!-- MATH
$L^{\mbox{th}}$
-->
-<IMG
+ <IMG
WIDTH="31" HEIGHT="20" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img79.gif"
ALT="$ L^{\mbox{th}}$"> function <!-- MATH
$\textbf{w}_L$
-->
-<IMG
+ <IMG
WIDTH="27" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img5.gif"
ALT="$ \textbf {w}_L$">
-will contribute significantly to the reduction of <IMG
+ will contribute significantly to the reduction of <IMG
WIDTH="15" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img26.gif"
ALT="$ S$">, if the angle
-<!-- MATH
+ <!-- MATH
$\phi^\prime$
-->
-<IMG
+ <IMG
WIDTH="18" HEIGHT="31" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img87.gif"
ALT="$ \phi^\prime$"> between <!-- MATH
$\textbf{w}_L$
-->
-<IMG
+ <IMG
WIDTH="27" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img5.gif"
ALT="$ \textbf {w}_L$"> and <!-- MATH
$\textbf{D}$
-->
-<IMG
+ <IMG
WIDTH="18" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img6.gif"
ALT="$ \textbf {D}$"> is smaller than
-an upper limit <IMG
+ an upper limit <IMG
WIDTH="14" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img4.gif"
ALT="$ \phi $">, defined by the user
-(<A NAME="tex2html15"
- HREF="
- ./TMultiDimFit.html#TMultiDimFit:SetMaxAngle"><TT>TMultiDimFit::SetMaxAngle</TT></A>)
-
-<P>
-However, the method automatically readjusts the value of this angle
-while fitting is in progress, in order to make the selection criteria
-less and less difficult to be fulfilled. The result is that the
-functions contributing most to the reduction of <IMG
+ (<A NAME="tex2html15"
+ HREF="
+ ./TMultiDimFit.html#TMultiDimFit:SetMaxAngle"><TT>TMultiDimFit::SetMaxAngle</TT></A>)
+
+ <P>
+ However, the method automatically readjusts the value of this angle
+ while fitting is in progress, in order to make the selection criteria
+ less and less difficult to be fulfilled. The result is that the
+ functions contributing most to the reduction of <IMG
WIDTH="15" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img26.gif"
ALT="$ S$"> are chosen first
-(<A NAME="tex2html16"
- HREF="
- ./TMultiDimFit.html#TMultiDimFit:TestFunction"><TT>TMultiDimFit::TestFunction</TT></A>).
+ (<A NAME="tex2html16"
+ HREF="
+ ./TMultiDimFit.html#TMultiDimFit:TestFunction"><TT>TMultiDimFit::TestFunction</TT></A>).
-<P>
-In case <IMG
+ <P>
+ In case <IMG
WIDTH="14" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img4.gif"
ALT="$ \phi $"> isn't defined, an alternative method of
-performing this second test is used: The <!-- MATH
+ performing this second test is used: The <!-- MATH
$L^{\mbox{th}}$
-->
-<IMG
+ <IMG
WIDTH="31" HEIGHT="20" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img79.gif"
ALT="$ L^{\mbox{th}}$"> function
-<!-- MATH
+ <!-- MATH
$\textbf{f}_L$
-->
-<IMG
+ <IMG
WIDTH="19" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img3.gif"
ALT="$ \textbf {f}_L$"> is accepted if (refer also to equation (<A HREF="TMultiFimFit.html#eq:dSN">13</A>))
-<P></P>
-<DIV ALIGN="CENTER"><A NAME="eq:dSN2"></A><!-- MATH
+ <P></P>
+ <DIV ALIGN="CENTER"><A NAME="eq:dSN2"></A><!-- MATH
\begin{equation}
-\Delta S_L > \frac{S_{L-1}}{L_{max}-L}
-\end{equation}
+ \Delta S_L > \frac{S_{L-1}}{L_{max}-L}
+ \end{equation}
-->
-<TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
-<TR VALIGN="MIDDLE">
-<TD NOWRAP ALIGN="CENTER"><IMG
+ <TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
+ <TR VALIGN="MIDDLE">
+ <TD NOWRAP ALIGN="CENTER"><IMG
WIDTH="129" HEIGHT="51" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img88.gif"
ALT="$\displaystyle \Delta S_L > \frac{S_{L-1}}{L_{max}-L}$"></TD>
-<TD NOWRAP WIDTH="10" ALIGN="RIGHT">
-(14)</TD></TR>
-</TABLE></DIV>
-<BR CLEAR="ALL"><P></P>
-where <IMG
+ <TD NOWRAP WIDTH="10" ALIGN="RIGHT">
+ (14)</TD></TR>
+ </TABLE></DIV>
+ <BR CLEAR="ALL"><P></P>
+ where <IMG
WIDTH="40" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img89.gif"
ALT="$ S_{L-1}$"> is the sum of the <IMG
WIDTH="42" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img78.gif"
ALT="$ L-1$"> first residuals from the
-<IMG
+ <IMG
WIDTH="42" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img78.gif"
ALT="$ L-1$"> functions previously accepted; and <IMG
WIDTH="41" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img34.gif"
ALT="$ L_{max}$"> is the total number
-of functions allowed in the final expression of the fit (defined by
-user).
+ of functions allowed in the final expression of the fit (defined by
+ user).
-<P>
->From this we see, that by restricting <IMG
+ <P>
+ >From this we see, that by restricting <IMG
WIDTH="41" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img34.gif"
ALT="$ L_{max}$"> -- the number of
-terms in the final model -- the fit is more difficult to perform,
-since the above selection criteria is more limiting.
+ terms in the final model -- the fit is more difficult to perform,
+ since the above selection criteria is more limiting.
-<P>
-The more coefficients we evaluate, the more the sum of squares of
-residuals <IMG
+ <P>
+ The more coefficients we evaluate, the more the sum of squares of
+ residuals <IMG
WIDTH="15" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img26.gif"
ALT="$ S$"> will be reduced. We can evaluate <IMG
WIDTH="15" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img26.gif"
ALT="$ S$"> before inverting
-<!-- MATH
+ <!-- MATH
$\mathsf{B}$
-->
-<IMG
+ <IMG
WIDTH="15" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img90.gif"
ALT="$ \mathsf{B}$"> as shown below.
-<P>
+ <P>
-<H2><A NAME="SECTION00034000000000000000">
-Coefficients and Coefficient Errors</A>
-</H2>
+ <H2><A NAME="SECTION00034000000000000000">
+ Coefficients and Coefficient Errors</A>
+ </H2>
-<P>
-Having found a parameterization, that is the <IMG
+ <P>
+ Having found a parameterization, that is the <IMG
WIDTH="19" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img24.gif"
ALT="$ F_l$">'s and <IMG
WIDTH="15" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img23.gif"
ALT="$ L$">, that
-minimizes <IMG
+ minimizes <IMG
WIDTH="15" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img26.gif"
ALT="$ S$">, we still need to determine the coefficients
-<IMG
+ <IMG
WIDTH="16" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img25.gif"
ALT="$ c_l$">. However, it's a feature of how we choose the significant
-functions, that the evaluation of the <IMG
+ functions, that the evaluation of the <IMG
WIDTH="16" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img25.gif"
ALT="$ c_l$">'s becomes trivial
-[<A
+ [<A
HREF="TMultiFimFit.html#wind72">5</A>]. To derive <!-- MATH
$\mathbf{c}$
-->
-<IMG
+ <IMG
WIDTH="12" HEIGHT="13" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img91.gif"
ALT="$ \mathbf{c}$">, we first note that
-equation (<A HREF="TMultiFimFit.html#eq:wj">4</A>) can be written as
-<P></P>
-<DIV ALIGN="CENTER"><A NAME="eq:FF"></A><!-- MATH
+ equation (<A HREF="TMultiFimFit.html#eq:wj">4</A>) can be written as
+ <P></P>
+ <DIV ALIGN="CENTER"><A NAME="eq:FF"></A><!-- MATH
\begin{equation}
-\mathsf{F} = \mathsf{W}\mathsf{B}
-\end{equation}
+ \mathsf{F} = \mathsf{W}\mathsf{B}
+ \end{equation}
-->
-<TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
-<TR VALIGN="MIDDLE">
-<TD NOWRAP ALIGN="CENTER"><IMG
+ <TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
+ <TR VALIGN="MIDDLE">
+ <TD NOWRAP ALIGN="CENTER"><IMG
WIDTH="60" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img92.gif"
ALT="$\displaystyle \mathsf{F} = \mathsf{W}\mathsf{B}$"></TD>
-<TD NOWRAP WIDTH="10" ALIGN="RIGHT">
-(15)</TD></TR>
-</TABLE></DIV>
-<BR CLEAR="ALL"><P></P>
-where
-<P></P>
-<DIV ALIGN="CENTER"><A NAME="eq:bij"></A><!-- MATH
+ <TD NOWRAP WIDTH="10" ALIGN="RIGHT">
+ (15)</TD></TR>
+ </TABLE></DIV>
+ <BR CLEAR="ALL"><P></P>
+ where
+ <P></P>
+ <DIV ALIGN="CENTER"><A NAME="eq:bij"></A><!-- MATH
\begin{equation}
-b_{ij} = \left\{\begin{array}{rcl}
- \frac{\mathbf{f}_j \bullet \mathbf{w}_i}{\mathbf{w}_i^2}
- & \mbox{if} & i < j\\
- 1 & \mbox{if} & i = j\\
- 0 & \mbox{if} & i > j
- \end{array}\right.
-\end{equation}
- -->
-<TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
-<TR VALIGN="MIDDLE">
-<TD NOWRAP ALIGN="CENTER"><IMG
+ b_{ij} = \left\{\begin{array}{rcl}
+ \frac{\mathbf{f}_j \bullet \mathbf{w}_i}{\mathbf{w}_i^2}
+ & \mbox{if} & i < j\\
+ 1 & \mbox{if} & i = j\\
+ 0 & \mbox{if} & i > j
+ \end{array}\right.
+ \end{equation}
+ -->
+ <TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
+ <TR VALIGN="MIDDLE">
+ <TD NOWRAP ALIGN="CENTER"><IMG
WIDTH="187" HEIGHT="79" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img93.gif"
ALT="$\displaystyle b_{ij} = \left\{\begin{array}{rcl} \frac{\mathbf{f}_j \bullet \ma...
-...f} & i < j\ 1 & \mbox{if} & i = j\ 0 & \mbox{if} & i > j \end{array}\right.$"></TD>
-<TD NOWRAP WIDTH="10" ALIGN="RIGHT">
-(16)</TD></TR>
-</TABLE></DIV>
-<BR CLEAR="ALL"><P></P>
-Consequently, <!-- MATH
+ ...f} & i < j\ 1 & \mbox{if} & i = j\ 0 & \mbox{if} & i > j \end{array}\right.$"></TD>
+ <TD NOWRAP WIDTH="10" ALIGN="RIGHT">
+ (16)</TD></TR>
+ </TABLE></DIV>
+ <BR CLEAR="ALL"><P></P>
+ Consequently, <!-- MATH
$\mathsf{B}$
-->
-<IMG
+ <IMG
WIDTH="15" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img90.gif"
ALT="$ \mathsf{B}$"> is an upper triangle matrix, which can be
-readily inverted. So we now evaluate
-<P></P>
-<DIV ALIGN="CENTER"><A NAME="eq:FFF"></A><!-- MATH
+ readily inverted. So we now evaluate
+ <P></P>
+ <DIV ALIGN="CENTER"><A NAME="eq:FFF"></A><!-- MATH
\begin{equation}
-\mathsf{F}\mathsf{B}^{-1} = \mathsf{W}
-\end{equation}
+ \mathsf{F}\mathsf{B}^{-1} = \mathsf{W}
+ \end{equation}
-->
-<TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
-<TR VALIGN="MIDDLE">
-<TD NOWRAP ALIGN="CENTER"><IMG
+ <TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
+ <TR VALIGN="MIDDLE">
+ <TD NOWRAP ALIGN="CENTER"><IMG
WIDTH="77" HEIGHT="35" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img94.gif"
ALT="$\displaystyle \mathsf{F}\mathsf{B}^{-1} = \mathsf{W}$"></TD>
-<TD NOWRAP WIDTH="10" ALIGN="RIGHT">
-(17)</TD></TR>
-</TABLE></DIV>
-<BR CLEAR="ALL"><P></P>
-The model <!-- MATH
+ <TD NOWRAP WIDTH="10" ALIGN="RIGHT">
+ (17)</TD></TR>
+ </TABLE></DIV>
+ <BR CLEAR="ALL"><P></P>
+ The model <!-- MATH
$\mathsf{W}\mathbf{a}$
-->
-<IMG
+ <IMG
WIDTH="28" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img63.gif"
ALT="$ \mathsf{W}\mathbf{a}$"> can therefore be written as
-<!-- MATH
+ <!-- MATH
\begin{displaymath}
-(\mathsf{F}\mathsf{B}^{-1})\mathbf{a} =
-\mathsf{F}(\mathsf{B}^{-1}\mathbf{a})\,.
-\end{displaymath}
+ (\mathsf{F}\mathsf{B}^{-1})\mathbf{a} =
+ \mathsf{F}(\mathsf{B}^{-1}\mathbf{a})\,.
+ \end{displaymath}
-->
-<P></P><DIV ALIGN="CENTER">
-<IMG
+ <P></P><DIV ALIGN="CENTER">
+ <IMG
WIDTH="148" HEIGHT="35" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img95.gif"
ALT="$\displaystyle (\mathsf{F}\mathsf{B}^{-1})\mathbf{a} =
-\mathsf{F}(\mathsf{B}^{-1}\mathbf{a}) .
-$">
-</DIV><P></P>
-The original model <!-- MATH
+ \mathsf{F}(\mathsf{B}^{-1}\mathbf{a}) .
+ $">
+ </DIV><P></P>
+ The original model <!-- MATH
$\mathsf{F}\mathbf{c}$
-->
-<IMG
+ <IMG
WIDTH="21" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img96.gif"
ALT="$ \mathsf{F}\mathbf{c}$"> is therefore identical with
-this if
-<P></P>
-<DIV ALIGN="CENTER"><A NAME="eq:id:cond"></A><!-- MATH
+ this if
+ <P></P>
+ <DIV ALIGN="CENTER"><A NAME="eq:id:cond"></A><!-- MATH
\begin{equation}
-\mathbf{c} = \left(\mathsf{B}^{-1}\mathbf{a}\right) =
- \left[\mathbf{a}^T\left(\mathsf{B}^{-1}\right)^T\right]^T\,.
-\end{equation}
+ \mathbf{c} = \left(\mathsf{B}^{-1}\mathbf{a}\right) =
+ \left[\mathbf{a}^T\left(\mathsf{B}^{-1}\right)^T\right]^T\,.
+ \end{equation}
-->
-<TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
-<TR VALIGN="MIDDLE">
-<TD NOWRAP ALIGN="CENTER"><IMG
+ <TABLE CELLPADDING="0" WIDTH="100%" ALIGN="CENTER">
+ <TR VALIGN="MIDDLE">
+ <TD NOWRAP ALIGN="CENTER"><IMG
WIDTH="214" HEIGHT="51" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img97.gif"
ALT="$\displaystyle \mathbf{c} = \left(\mathsf{B}^{-1}\mathbf{a}\right) = \left[\mathbf{a}^T\left(\mathsf{B}^{-1}\right)^T\right]^T .$"></TD>
-<TD NOWRAP WIDTH="10" ALIGN="RIGHT">
-(18)</TD></TR>
-</TABLE></DIV>
-<BR CLEAR="ALL"><P></P>
-The reason we use <!-- MATH
+ <TD NOWRAP WIDTH="10" ALIGN="RIGHT">
+ (18)</TD></TR>
+ </TABLE></DIV>
+ <BR CLEAR="ALL"><P></P>
+ The reason we use <!-- MATH
$\left(\mathsf{B}^{-1}\right)^T$
-->
-<IMG
+ <IMG
WIDTH="56" HEIGHT="42" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img98.gif"
ALT="$ \left(\mathsf{B}^{-1}\right)^T$"> rather then
-<!-- MATH
+ <!-- MATH
$\mathsf{B}^{-1}$
-->
-<IMG
+ <IMG
WIDTH="32" HEIGHT="16" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img99.gif"
ALT="$ \mathsf{B}^{-1}$"> is to save storage, since
-<!-- MATH
+ <!-- MATH
$\left(\mathsf{B}^{-1}\right)^T$
-->
-<IMG
+ <IMG
WIDTH="56" HEIGHT="42" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img98.gif"
ALT="$ \left(\mathsf{B}^{-1}\right)^T$"> can be stored in the same matrix as
-<!-- MATH
+ <!-- MATH
$\mathsf{B}$
-->
-<IMG
+ <IMG
WIDTH="15" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img90.gif"
ALT="$ \mathsf{B}$">
-(<A NAME="tex2html17"
- HREF="
- ./TMultiDimFit.html#TMultiDimFit:MakeCoefficients"><TT>TMultiDimFit::MakeCoefficients</TT></A>). The errors in
-the coefficients is calculated by inverting the curvature matrix
-of the non-orthogonal functions <IMG
+ (<A NAME="tex2html17"
+ HREF="
+ ./TMultiDimFit.html#TMultiDimFit:MakeCoefficients"><TT>TMultiDimFit::MakeCoefficients</TT></A>). The errors in
+ the coefficients is calculated by inverting the curvature matrix
+ of the non-orthogonal functions <IMG
WIDTH="23" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img100.gif"
ALT="$ f_{lj}$"> [<A
HREF="TMultiFimFit.html#bevington">1</A>]
-(<A NAME="tex2html18"
- HREF="
+ (<A NAME="tex2html18"
+ HREF="
-./TMultiDimFit.html#TMultiDimFit:MakeCoefficientErrors"><TT>TMultiDimFit::MakeCoefficientErrors</TT></A>).
+ ./TMultiDimFit.html#TMultiDimFit:MakeCoefficientErrors"><TT>TMultiDimFit::MakeCoefficientErrors</TT></A>).
-<P>
+ <P>
-<H2><A NAME="SECTION00035000000000000000"></A>
-<A NAME="sec:considerations"></A><BR>
-Considerations
-</H2>
+ <H2><A NAME="SECTION00035000000000000000"></A>
+ <A NAME="sec:considerations"></A><BR>
+ Considerations
+ </H2>
-<P>
-It's important to realize that the training sample should be
-representive of the problem at hand, in particular along the borders
-of the region of interest. This is because the algorithm presented
-here, is a <I>interpolation</I>, rahter then a <I>extrapolation</I>
-[<A
+ <P>
+ It's important to realize that the training sample should be
+ representive of the problem at hand, in particular along the borders
+ of the region of interest. This is because the algorithm presented
+ here, is a <I>interpolation</I>, rahter then a <I>extrapolation</I>
+ [<A
HREF="TMultiFimFit.html#wind72">5</A>].
-<P>
-Also, the independent variables <IMG
+ <P>
+ Also, the independent variables <IMG
WIDTH="18" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img101.gif"
ALT="$ x_{i}$"> need to be linear
-independent, since the procedure will perform poorly if they are not
-[<A
+ independent, since the procedure will perform poorly if they are not
+ [<A
HREF="TMultiFimFit.html#wind72">5</A>]. One can find an linear transformation from ones
-original variables <IMG
+ original variables <IMG
WIDTH="16" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img102.gif"
ALT="$ \xi_{i}$"> to a set of linear independent variables
-<IMG
+ <IMG
WIDTH="18" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img101.gif"
ALT="$ x_{i}$">, using a <I>Principal Components Analysis</I>
-<A NAME="tex2html19"
- HREF="./TPrincipal.html">(see <TT>TPrincipal</TT>)</A>, and
-then use the transformed variable as input to this class [<A
+ <A NAME="tex2html19"
+ HREF="./TPrincipal.html">(see <TT>TPrincipal</TT>)</A>, and
+ then use the transformed variable as input to this class [<A
HREF="TMultiFimFit.html#wind72">5</A>]
-[<A
+ [<A
HREF="TMultiFimFit.html#wind81">6</A>].
-<P>
-H. Wind also outlines a method for parameterising a multidimensional
-dependence over a multidimensional set of variables. An example
-of the method from [<A
+ <P>
+ H. Wind also outlines a method for parameterising a multidimensional
+ dependence over a multidimensional set of variables. An example
+ of the method from [<A
HREF="TMultiFimFit.html#wind72">5</A>], is a follows (please refer to
-[<A
+ [<A
HREF="TMultiFimFit.html#wind72">5</A>] for a full discussion):
-<P>
+ <P>
-<OL>
-<LI>Define <!-- MATH
+ <OL>
+ <LI>Define <!-- MATH
$\mathbf{P} = (P_1, \ldots, P_5)$
-->
-<IMG
+ <IMG
WIDTH="123" HEIGHT="31" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img103.gif"
ALT="$ \mathbf{P} = (P_1, \ldots, P_5)$"> are the 5 dependent
- quantities that define a track.
-</LI>
-<LI>Compute, for <IMG
+ quantities that define a track.
+ </LI>
+ <LI>Compute, for <IMG
WIDTH="21" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img10.gif"
ALT="$ M$"> different values of <!-- MATH
$\mathbf{P}$
-->
-<IMG
+ <IMG
WIDTH="17" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img104.gif"
ALT="$ \mathbf{P}$">, the tracks
- through the magnetic field, and determine the corresponding
- <!-- MATH
+ through the magnetic field, and determine the corresponding
+ <!-- MATH
$\mathbf{x} = (x_1, \ldots, x_N)$
-->
-<IMG
+ <IMG
WIDTH="123" HEIGHT="31" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img105.gif"
ALT="$ \mathbf{x} = (x_1, \ldots, x_N)$">.
-</LI>
-<LI>Use the simulated observations to determine, with a simple
- approximation, the values of <!-- MATH
+ </LI>
+ <LI>Use the simulated observations to determine, with a simple
+ approximation, the values of <!-- MATH
$\mathbf{P}_j$
-->
-<IMG
+ <IMG
WIDTH="23" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img106.gif"
ALT="$ \mathbf{P}_j$">. We call these values
- <!-- MATH
+ <!-- MATH
$\mathbf{P}^\prime_j, j = 1, \ldots, M$
-->
-<IMG
+ <IMG
WIDTH="122" HEIGHT="31" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img107.gif"
ALT="$ \mathbf{P}^\prime_j, j = 1, \ldots, M$">.
-</LI>
-<LI>Determine from <!-- MATH
+ </LI>
+ <LI>Determine from <!-- MATH
$\mathbf{x}$
-->
-<IMG
+ <IMG
WIDTH="14" HEIGHT="13" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img9.gif"
ALT="$ \mathbf{x}$"> a set of at least five relevant
- coordinates <!-- MATH
+ coordinates <!-- MATH
$\mathbf{x}^\prime$
-->
-<IMG
+ <IMG
WIDTH="18" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img108.gif"
ALT="$ \mathbf{x}^\prime$">, using contrains, <I>or
- alternative:</I>
-</LI>
-<LI>Perform a Principal Component Analysis (using
- <A NAME="tex2html20"
- HREF="./TPrincipal.html"><TT>TPrincipal</TT></A>), and use
-
-to get a linear transformation
- <!-- MATH
+ alternative:</I>
+ </LI>
+ <LI>Perform a Principal Component Analysis (using
+ <A NAME="tex2html20"
+ HREF="./TPrincipal.html"><TT>TPrincipal</TT></A>), and use
+
+ to get a linear transformation
+ <!-- MATH
$\mathbf{x} \rightarrow \mathbf{x}^\prime$
-->
-<IMG
+ <IMG
WIDTH="53" HEIGHT="16" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img109.gif"
ALT="$ \mathbf{x} \rightarrow \mathbf{x}^\prime$">, so that
- <!-- MATH
+ <!-- MATH
$\mathbf{x}^\prime$
-->
-<IMG
+ <IMG
WIDTH="18" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img108.gif"
ALT="$ \mathbf{x}^\prime$"> are constrained and linear independent.
-</LI>
-<LI>Perform a Principal Component Analysis on
- <!-- MATH
+ </LI>
+ <LI>Perform a Principal Component Analysis on
+ <!-- MATH
$Q_i = P_i / P^\prime_i\, i = 1, \ldots, 5$
-->
-<IMG
+ <IMG
WIDTH="210" HEIGHT="31" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img110.gif"
ALT="$ Q_i = P_i / P^prime_i i = 1, \ldots, 5$">, to get linear
- indenpendent (among themselves, but not independent of
- <!-- MATH
+ indenpendent (among themselves, but not independent of
+ <!-- MATH
$\mathbf{x}$
-->
-<IMG
+ <IMG
WIDTH="14" HEIGHT="13" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img9.gif"
ALT="$ \mathbf{x}$">) quantities <!-- MATH
$\mathbf{Q}^\prime$
-->
-<IMG
+ <IMG
WIDTH="22" HEIGHT="31" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img111.gif"
ALT="$ \mathbf{Q}^\prime$">
-</LI>
-<LI>For each component <!-- MATH
+ </LI>
+ <LI>For each component <!-- MATH
$Q^\prime_i$
-->
-<IMG
+ <IMG
WIDTH="22" HEIGHT="31" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img112.gif"
ALT="$ Q^\prime_i$"> make a mutlidimensional fit,
- using <!-- MATH
+ using <!-- MATH
$\mathbf{x}^\prime$
-->
-<IMG
+ <IMG
WIDTH="18" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img108.gif"
ALT="$ \mathbf{x}^\prime$"> as the variables, thus determing a set of
- coefficents <!-- MATH
+ coefficents <!-- MATH
$\mathbf{c}_i$
-->
-<IMG
+ <IMG
WIDTH="17" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img113.gif"
ALT="$ \mathbf{c}_i$">.
-</LI>
-</OL>
+ </LI>
+ </OL>
-<P>
-To process data, using this parameterisation, do
+ <P>
+ To process data, using this parameterisation, do
-<OL>
-<LI>Test wether the observation <!-- MATH
+ <OL>
+ <LI>Test wether the observation <!-- MATH
$\mathbf{x}$
-->
-<IMG
+ <IMG
WIDTH="14" HEIGHT="13" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img9.gif"
ALT="$ \mathbf{x}$"> within the domain of
- the parameterization, using the result from the Principal Component
- Analysis.
-</LI>
-<LI>Determine <!-- MATH
+ the parameterization, using the result from the Principal Component
+ Analysis.
+ </LI>
+ <LI>Determine <!-- MATH
$\mathbf{P}^\prime$
-->
-<IMG
+ <IMG
WIDTH="21" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img114.gif"
ALT="$ \mathbf{P}^\prime$"> as before.
-</LI>
-<LI>Detetmine <!-- MATH
+ </LI>
+ <LI>Detetmine <!-- MATH
$\mathbf{x}^\prime$
-->
-<IMG
+ <IMG
WIDTH="18" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img108.gif"
ALT="$ \mathbf{x}^\prime$"> as before.
-</LI>
-<LI>Use the result of the fit to determind <!-- MATH
+ </LI>
+ <LI>Use the result of the fit to determind <!-- MATH
$\mathbf{Q}^\prime$
-->
-<IMG
+ <IMG
WIDTH="22" HEIGHT="31" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img111.gif"
ALT="$ \mathbf{Q}^\prime$">.
-</LI>
-<LI>Transform back to <!-- MATH
+ </LI>
+ <LI>Transform back to <!-- MATH
$\mathbf{P}$
-->
-<IMG
+ <IMG
WIDTH="17" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img104.gif"
ALT="$ \mathbf{P}$"> from <!-- MATH
$\mathbf{Q}^\prime$
-->
-<IMG
+ <IMG
WIDTH="22" HEIGHT="31" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img111.gif"
ALT="$ \mathbf{Q}^\prime$">, using
- the result from the Principal Component Analysis.
-</LI>
-</OL>
-
-<P>
-
-<H2><A NAME="SECTION00036000000000000000"></A>
-<A NAME="sec:testing"></A><BR>
-Testing the parameterization
-</H2>
-
-<P>
-The class also provides functionality for testing the, over the
-training sample, found parameterization
-(<A NAME="tex2html21"
- HREF="
- ./TMultiDimFit.html#TMultiDimFit:Fit"><TT>TMultiDimFit::Fit</TT></A>). This is done by passing
-the class a test sample of <IMG
+ the result from the Principal Component Analysis.
+ </LI>
+ </OL>
+
+ <P>
+
+ <H2><A NAME="SECTION00036000000000000000"></A>
+ <A NAME="sec:testing"></A><BR>
+ Testing the parameterization
+ </H2>
+
+ <P>
+ The class also provides functionality for testing the, over the
+ training sample, found parameterization
+ (<A NAME="tex2html21"
+ HREF="
+ ./TMultiDimFit.html#TMultiDimFit:Fit"><TT>TMultiDimFit::Fit</TT></A>). This is done by passing
+ the class a test sample of <IMG
WIDTH="25" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img115.gif"
ALT="$ M_t$"> tuples of the form <!-- MATH
$(\mathbf{x}_{t,j},
-D_{t,j}, E_{t,j})$
+ D_{t,j}, E_{t,j})$
-->
-<IMG
+ <IMG
WIDTH="111" HEIGHT="31" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img116.gif"
ALT="$ (\mathbf{x}_{t,j},
-D_{t,j}, E_{t,j})$">, where <!-- MATH
+ D_{t,j}, E_{t,j})$">, where <!-- MATH
$\mathbf{x}_{t,j}$
-->
-<IMG
+ <IMG
WIDTH="29" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img117.gif"
ALT="$ \mathbf{x}_{t,j}$"> are the independent
-variables, <IMG
+ variables, <IMG
WIDTH="33" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img118.gif"
ALT="$ D_{t,j}$"> the known, dependent quantity, and <IMG
WIDTH="31" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img119.gif"
ALT="$ E_{t,j}$"> is
-the square error in <IMG
+ the square error in <IMG
WIDTH="33" HEIGHT="29" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img118.gif"
ALT="$ D_{t,j}$">
-(<A NAME="tex2html22"
- HREF="
+ (<A NAME="tex2html22"
+ HREF="
-./TMultiDimFit.html#TMultiDimFit:AddTestRow"><TT>TMultiDimFit::AddTestRow</TT></A>).
+ ./TMultiDimFit.html#TMultiDimFit:AddTestRow"><TT>TMultiDimFit::AddTestRow</TT></A>).
-<P>
-The parameterization is then evaluated at every <!-- MATH
+ <P>
+ The parameterization is then evaluated at every <!-- MATH
$\mathbf{x}_t$
-->
-<IMG
+ <IMG
WIDTH="19" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img120.gif"
ALT="$ \mathbf{x}_t$"> in the
-test sample, and
-<!-- MATH
+ test sample, and
+ <!-- MATH
\begin{displaymath}
-S_t \equiv \sum_{j=1}^{M_t} \left(D_{t,j} -
- D_p\left(\mathbf{x}_{t,j}\right)\right)^2
-\end{displaymath}
+ S_t \equiv \sum_{j=1}^{M_t} \left(D_{t,j} -
+ D_p\left(\mathbf{x}_{t,j}\right)\right)^2
+ \end{displaymath}
-->
-<P></P><DIV ALIGN="CENTER">
-<IMG
+ <P></P><DIV ALIGN="CENTER">
+ <IMG
WIDTH="194" HEIGHT="66" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img121.gif"
ALT="$\displaystyle S_t \equiv \sum_{j=1}^{M_t} \left(D_{t,j} -
-D_p\left(\mathbf{x}_{t,j}\right)\right)^2
-$">
-</DIV><P></P>
-is evaluated. The relative error over the test sample
-<!-- MATH
+ D_p\left(\mathbf{x}_{t,j}\right)\right)^2
+ $">
+ </DIV><P></P>
+ is evaluated. The relative error over the test sample
+ <!-- MATH
\begin{displaymath}
-R_t = \frac{S_t}{\sum_{j=1}^{M_t} D_{t,j}^2}
-\end{displaymath}
+ R_t = \frac{S_t}{\sum_{j=1}^{M_t} D_{t,j}^2}
+ \end{displaymath}
-->
-<P></P><DIV ALIGN="CENTER">
-<IMG
+ <P></P><DIV ALIGN="CENTER">
+ <IMG
WIDTH="118" HEIGHT="51" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img122.gif"
ALT="$\displaystyle R_t = \frac{S_t}{\sum_{j=1}^{M_t} D_{t,j}^2}
-$">
-</DIV><P></P>
-should not be to low or high compared to <IMG
+ $">
+ </DIV><P></P>
+ should not be to low or high compared to <IMG
WIDTH="16" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
SRC="gif/multidimfit_img123.gif"
ALT="$ R$"> from the training
-sample. Also, multiple correlation coefficient from both samples should
-be fairly close, otherwise one of the samples is not representive of
-the problem. A large difference in the reduced <IMG
+ sample. Also, multiple correlation coefficient from both samples should
+ be fairly close, otherwise one of the samples is not representive of
+ the problem. A large difference in the reduced <IMG
WIDTH="21" HEIGHT="33" ALIGN="MIDDLE" BORDER="0"
SRC="gif/multidimfit_img124.gif"
ALT="$ \chi^2$"> over the two
-samples indicate an over fit, and the maximum number of terms in the
-parameterisation should be reduced.
+ samples indicate an over fit, and the maximum number of terms in the
+ parameterisation should be reduced.
-<P>
-It's possible to use <A NAME="tex2html23"
- HREF="./TMinuit.html"><I>Minuit</I></A>
-[<A
+ <P>
+ It's possible to use <A NAME="tex2html23"
+ HREF="./TMinuit.html"><I>Minuit</I></A>
+ [<A
HREF="TMultiFimFit.html#minuit">4</A>] to further improve the fit, using the test sample.
-<P>
-<DIV ALIGN="RIGHT">
-Christian Holm
-<BR> November 2000, NBI
-
-</DIV>
-
-<P>
-
-<H2><A NAME="SECTION00040000000000000000">
-Bibliography</A>
-</H2><DL COMPACT><DD><P></P><DT><A NAME="bevington">1</A>
-<DD>
-Philip R. Bevington and D. Keith Robinson.
-<BR><EM>Data Reduction and Error Analysis for the Physical Sciences</EM>.
-<BR>McGraw-Hill, 2 edition, 1992.
-
-<P></P><DT><A NAME="mudifi">2</A>
-<DD>
-René Brun et al.
-<BR>Mudifi.
-<BR>Long writeup DD/75-23, CERN, 1980.
-
-<P></P><DT><A NAME="golub">3</A>
-<DD>
-Gene H. Golub and Charles F. van Loan.
-<BR><EM>Matrix Computations</EM>.
-<BR>John Hopkins Univeristy Press, Baltimore, 3 edition, 1996.
-
-<P></P><DT><A NAME="minuit">4</A>
-<DD>
-F. James.
-<BR>Minuit.
-<BR>Long writeup D506, CERN, 1998.
-
-<P></P><DT><A NAME="wind72">5</A>
-<DD>
-H. Wind.
-<BR>Function parameterization.
-<BR>In <EM>Proceedings of the 1972 CERN Computing and Data Processing
- School</EM>, volume 72-21 of <EM>Yellow report</EM>. CERN, 1972.
-
-<P></P><DT><A NAME="wind81">6</A>
-<DD>
-H. Wind.
-<BR>1. principal component analysis, 2. pattern recognition for track
- finding, 3. interpolation and functional representation.
-<BR>Yellow report EP/81-12, CERN, 1981.
-</DL>
-<pre>
+ <P>
+ <DIV ALIGN="RIGHT">
+ Christian Holm
+ <BR> November 2000, NBI
+
+ </DIV>
+
+ <P>
+
+ <H2><A NAME="SECTION00040000000000000000">
+ Bibliography</A>
+ </H2><DL COMPACT><DD><P></P><DT><A NAME="bevington">1</A>
+ <DD>
+ Philip R. Bevington and D. Keith Robinson.
+ <BR><EM>Data Reduction and Error Analysis for the Physical Sciences</EM>.
+ <BR>McGraw-Hill, 2 edition, 1992.
+
+ <P></P><DT><A NAME="mudifi">2</A>
+ <DD>
+ René Brun et al.
+ <BR>Mudifi.
+ <BR>Long writeup DD/75-23, CERN, 1980.
+
+ <P></P><DT><A NAME="golub">3</A>
+ <DD>
+ Gene H. Golub and Charles F. van Loan.
+ <BR><EM>Matrix Computations</EM>.
+ <BR>John Hopkins Univeristy Press, Baltimore, 3 edition, 1996.
+
+ <P></P><DT><A NAME="minuit">4</A>
+ <DD>
+ F. James.
+ <BR>Minuit.
+ <BR>Long writeup D506, CERN, 1998.
+
+ <P></P><DT><A NAME="wind72">5</A>
+ <DD>
+ H. Wind.
+ <BR>Function parameterization.
+ <BR>In <EM>Proceedings of the 1972 CERN Computing and Data Processing
+ School</EM>, volume 72-21 of <EM>Yellow report</EM>. CERN, 1972.
+
+ <P></P><DT><A NAME="wind81">6</A>
+ <DD>
+ H. Wind.
+ <BR>1. principal component analysis, 2. pattern recognition for track
+ finding, 3. interpolation and functional representation.
+ <BR>Yellow report EP/81-12, CERN, 1981.
+ </DL>
+ <pre>
*/
//End_Html
//
@@ -1781,7 +1781,7 @@ TMultiDimFit::TMultiDimFit()
fMinQuantity = 0;
fSumSqQuantity = 0;
fSumSqAvgQuantity = 0;
-
+
fNVariables = 0;
fSampleSize = 0;
fTestSampleSize = 0;
@@ -1792,34 +1792,34 @@ TMultiDimFit::TMultiDimFit()
fMinRelativeError = 0;
fMaxPowers = 0;
fPowerLimit = 0;
-
+
fMaxFunctions = 0;
fFunctionCodes = 0;
fMaxStudy = 0;
fMaxFuncNV = 0;
-
+
fMaxPowersFinal = 0;
fPowers = 0;
fPowerIndex = 0;
-
+
fMaxResidual = 0;
fMinResidual = 0;
fMaxResidualRow = 0;
fMinResidualRow = 0;
- fSumSqResidual = 0;
-
- fNCoefficients = 0;
+ fSumSqResidual = 0;
+
+ fNCoefficients = 0;
fRMS = 0;
fChi2 = 0;
fParameterisationCode = 0;
-
+
fError = 0;
fTestError = 0;
fPrecision = 0;
fTestPrecision = 0;
fCorrelationCoeff = 0;
fTestCorrelationCoeff = 0;
-
+
fHistograms = 0;
fHistogramMask = 0;
fBinVarX = 100;
@@ -1830,7 +1830,7 @@ TMultiDimFit::TMultiDimFit()
fShowCorrelation = kFALSE;
fIsUserFunction = kFALSE;
fIsVerbose = kFALSE;
-
+
}
@@ -1838,13 +1838,13 @@ TMultiDimFit::TMultiDimFit()
TMultiDimFit::TMultiDimFit(Int_t dimension,
EMDFPolyType type,
Option_t *option)
- : TNamed("multidimfit","Multi-dimensional fit object"),
- fQuantity(dimension),
- fSqError(dimension),
- fVariables(dimension*100),
- fMeanVariables(dimension),
- fMaxVariables(dimension),
- fMinVariables(dimension)
+: TNamed("multidimfit","Multi-dimensional fit object"),
+fQuantity(dimension),
+fSqError(dimension),
+fVariables(dimension*100),
+fMeanVariables(dimension),
+fMaxVariables(dimension),
+fMinVariables(dimension)
{
// Constructor
// Second argument is the type of polynomials to use in
@@ -1867,7 +1867,7 @@ TMultiDimFit::TMultiDimFit(Int_t dimension,
fMinQuantity = 0;
fSumSqQuantity = 0;
fSumSqAvgQuantity = 0;
-
+
fNVariables = dimension;
fSampleSize = 0;
fTestSampleSize = 0;
@@ -1878,34 +1878,34 @@ TMultiDimFit::TMultiDimFit(Int_t dimension,
fMinRelativeError = 0.01;
fMaxPowers = new Int_t[dimension];
fPowerLimit = 1;
-
+
fMaxFunctions = 0;
fFunctionCodes = 0;
fMaxStudy = 0;
fMaxFuncNV = 0;
-
+
fMaxPowersFinal = new Int_t[dimension];
fPowers = 0;
fPowerIndex = 0;
-
+
fMaxResidual = 0;
fMinResidual = 0;
fMaxResidualRow = 0;
fMinResidualRow = 0;
- fSumSqResidual = 0;
-
- fNCoefficients = 0;
+ fSumSqResidual = 0;
+
+ fNCoefficients = 0;
fRMS = 0;
fChi2 = 0;
fParameterisationCode = 0;
-
+
fError = 0;
fTestError = 0;
fPrecision = 0;
fTestPrecision = 0;
fCorrelationCoeff = 0;
fTestCorrelationCoeff = 0;
-
+
fHistograms = 0;
fHistogramMask = 0;
fBinVarX = 100;
@@ -2064,10 +2064,10 @@ void TMultiDimFit::AddTestRow(const Double_t *x, Double_t D, Double_t E)
if (x[i] > fMaxVariables(i))
Warning("AddTestRow", "variable %d (row: %d) too large: %f > %f",
- i, fTestSampleSize, x[i], fMaxVariables(i));
+ i, fTestSampleSize, x[i], fMaxVariables(i));
if (x[i] < fMinVariables(i))
Warning("AddTestRow", "variable %d (row: %d) too small: %f < %f",
- i, fTestSampleSize, x[i], fMinVariables(i));
+ i, fTestSampleSize, x[i], fMinVariables(i));
}
}
@@ -2224,7 +2224,7 @@ Double_t TMultiDimFit::Eval(const Double_t *x, const Double_t* coeff) const
// Evaluate the factor (polynomial) in the j-th variable.
Int_t p = fPowers[fPowerIndex[i] * fNVariables + j];
Double_t y = 1 + 2. / (fMaxVariables(j) - fMinVariables(j))
- * (x[j] - fMaxVariables(j));
+ * (x[j] - fMaxVariables(j));
term *= EvalFactor(p,y);
}
// Add this term to the final result
@@ -2245,7 +2245,7 @@ Double_t TMultiDimFit::EvalError(const Double_t *x, const Double_t* coeff) const
Int_t i, j;
for (i = 0; i < fNCoefficients; i++) {
- // std::cout << "Error coef " << i << " -> " << fCoefficientsRMS(i) << std::endl;
+ // std::cout << "Error coef " << i << " -> " << fCoefficientsRMS(i) << std::endl;
}
for (i = 0; i < fNCoefficients; i++) {
// Evaluate the ith term in the expansion
@@ -2254,9 +2254,9 @@ Double_t TMultiDimFit::EvalError(const Double_t *x, const Double_t* coeff) const
// Evaluate the factor (polynomial) in the j-th variable.
Int_t p = fPowers[fPowerIndex[i] * fNVariables + j];
Double_t y = 1 + 2. / (fMaxVariables(j) - fMinVariables(j))
- * (x[j] - fMaxVariables(j));
+ * (x[j] - fMaxVariables(j));
term *= EvalFactor(p,y);
- // std::cout << "i,j " << i << ", " << j << " " << p << " " << y << " " << EvalFactor(p,y) << " " << term << std::endl;
+ // std::cout << "i,j " << i << ", " << j << " " << p << " " << y << " " << EvalFactor(p,y) << " " << term << std::endl;
}
// Add this term to the final result
returnValue += term*term;
@@ -2304,9 +2304,9 @@ Double_t TMultiDimFit::EvalFactor(Int_t p, Double_t x) const
for (i = 3; i <= p; i++) {
p3 = p2 * x;
if (fPolyType == kLegendre)
- p3 = ((2 * i - 3) * p2 * x - (i - 2) * p1) / (i - 1);
+ p3 = ((2 * i - 3) * p2 * x - (i - 2) * p1) / (i - 1);
else if (fPolyType == kChebyshev)
- p3 = 2 * x * p2 - p1;
+ p3 = 2 * x * p2 - p1;
p1 = p2;
p2 = p3;
}
@@ -2386,9 +2386,9 @@ void TMultiDimFit::Fit(Option_t *option)
}
fFitter = TVirtualFitter::Fitter(0,fNCoefficients);
- if (!fFitter) {
+ if (!fFitter) {
Error("Fit", "Vannot create Fitter");
- delete [] x;
+ delete [] x;
return;
}
fFitter->SetFCN(mdfHelper);
@@ -2403,7 +2403,7 @@ void TMultiDimFit::Fit(Option_t *option)
Double_t startVal = fCoefficients(i);
Double_t startErr = fCoefficientsRMS(i);
fFitter->SetParameter(i, Form("coeff%02d",i),
- startVal, startErr, 0, 0);
+ startVal, startErr, 0, 0);
}
// arglist[0] = 0;
@@ -2414,7 +2414,7 @@ void TMultiDimFit::Fit(Option_t *option)
for (i = 0; i < fNCoefficients; i++) {
Double_t val = 0, err = 0, low = 0, high = 0;
fFitter->GetParameter(i, Form("coeff%02d",i),
- val, err, low, high);
+ val, err, low, high);
fCoefficients(i) = val;
fCoefficientsRMS(i) = err;
}
@@ -2582,7 +2582,7 @@ Double_t TMultiDimFit::MakeChi2(const Double_t* coeff)
// Calculate contribution to Chic square
fChi2 += 1. / TMath::Max(fTestSqError(i),1e-20)
- * (fTestQuantity(i) - f) * (fTestQuantity(i) - f);
+ * (fTestQuantity(i) - f) * (fTestQuantity(i) - f);
}
// Clean up
@@ -2663,7 +2663,7 @@ void TMultiDimFit::MakeCoefficientErrors()
for (j = 0; j < fNCoefficients; j++)
f += fCoefficients(j) * fFunctions(j,i);
fChi2 += 1. / TMath::Max(fSqError(i),1e-20) * (fQuantity(i) - f)
- * (fQuantity(i) - f);
+ * (fQuantity(i) - f);
}
// Invert the curvature matrix
@@ -2748,20 +2748,20 @@ void TMultiDimFit::MakeCoefficients()
// If we use histograms, fill some more
if (TESTBIT(fHistogramMask,HIST_RD) ||
- TESTBIT(fHistogramMask,HIST_RTRAI) ||
- TESTBIT(fHistogramMask,HIST_RX)) {
- for (i = 0; i < fSampleSize; i++) {
- if (TESTBIT(fHistogramMask,HIST_RD))
- ((TH2D*)fHistograms->FindObject("res_d"))->Fill(fQuantity(i),
- fResiduals(i));
- if (TESTBIT(fHistogramMask,HIST_RTRAI))
- ((TH1D*)fHistograms->FindObject("res_train"))->Fill(fResiduals(i));
-
- if (TESTBIT(fHistogramMask,HIST_RX))
- for (j = 0; j < fNVariables; j++)
- ((TH2D*)fHistograms->FindObject(Form("res_x_%d",j)))
- ->Fill(fVariables(i * fNVariables + j),fResiduals(i));
- }
+ TESTBIT(fHistogramMask,HIST_RTRAI) ||
+ TESTBIT(fHistogramMask,HIST_RX)) {
+ for (i = 0; i < fSampleSize; i++) {
+ if (TESTBIT(fHistogramMask,HIST_RD))
+ ((TH2D*)fHistograms->FindObject("res_d"))->Fill(fQuantity(i),
+ fResiduals(i));
+ if (TESTBIT(fHistogramMask,HIST_RTRAI))
+ ((TH1D*)fHistograms->FindObject("res_train"))->Fill(fResiduals(i));
+
+ if (TESTBIT(fHistogramMask,HIST_RX))
+ for (j = 0; j < fNVariables; j++)
+ ((TH2D*)fHistograms->FindObject(Form("res_x_%d",j)))
+ ->Fill(fVariables(i * fNVariables + j),fResiduals(i));
+ }
} // If histograms
}
@@ -2795,7 +2795,7 @@ void TMultiDimFit::MakeCorrelation()
k = j * fNVariables + i;
ddotXi += fQuantity(j) * (fVariables(k) - fMeanVariables(i));
xiNorm += (fVariables(k) - fMeanVariables(i))
- * (fVariables(k) - fMeanVariables(i));
+ * (fVariables(k) - fMeanVariables(i));
}
fCorrelationMatrix(i,0) = ddotXi / TMath::Sqrt(d2 * xiNorm);
@@ -2807,12 +2807,12 @@ void TMultiDimFit::MakeCorrelation()
// l = j * fNVariables + k; // G.Q.
l = k * fNVariables + j; // G.Q.
m = k * fNVariables + i; // G.Q.
- // G.Q. xidotXj += (fVariables(i) - fMeanVariables(i))
- // G.Q. * (fVariables(l) - fMeanVariables(j));
+ // G.Q. xidotXj += (fVariables(i) - fMeanVariables(i))
+ // G.Q. * (fVariables(l) - fMeanVariables(j));
xidotXj += (fVariables(m) - fMeanVariables(i))
- * (fVariables(l) - fMeanVariables(j)); // G.Q. modified index for Xi
+ * (fVariables(l) - fMeanVariables(j)); // G.Q. modified index for Xi
xjNorm += (fVariables(l) - fMeanVariables(j))
- * (fVariables(l) - fMeanVariables(j));
+ * (fVariables(l) - fMeanVariables(j));
}
//fCorrelationMatrix(i+1,j) = xidotXj / TMath::Sqrt(xiNorm * xjNorm);
fCorrelationMatrix(i,j+1) = xidotXj / TMath::Sqrt(xiNorm * xjNorm);
@@ -2862,7 +2862,7 @@ Double_t TMultiDimFit::MakeGramSchmidt(Int_t function)
// Calculate (f_fNCoefficients dot w_j) / w_j^2
for (k = 0; k < fSampleSize; k++) {
fdw += fFunctions(fNCoefficients, k) * fOrthFunctions(j,k)
- / fOrthFunctionNorms(j);
+ / fOrthFunctionNorms(j);
}
fOrthCurvatureMatrix(fNCoefficients,j) = fdw;
@@ -2874,18 +2874,18 @@ Double_t TMultiDimFit::MakeGramSchmidt(Int_t function)
for (j = 0; j < fSampleSize; j++) {
// calculate squared length of w_fNCoefficients
fOrthFunctionNorms(fNCoefficients) +=
- fOrthFunctions(fNCoefficients,j)
- * fOrthFunctions(fNCoefficients,j);
+ fOrthFunctions(fNCoefficients,j)
+ * fOrthFunctions(fNCoefficients,j);
// calculate D dot w_fNCoefficients in A
fOrthCoefficients(fNCoefficients) += fQuantity(j)
- * fOrthFunctions(fNCoefficients, j);
+ * fOrthFunctions(fNCoefficients, j);
}
// First test, but only if didn't user specify
if (!fIsUserFunction)
if (TMath::Sqrt(fOrthFunctionNorms(fNCoefficients) / (f2 + 1e-10))
- < TMath::Sin(fMinAngle*DEGRAD))
+ < TMath::Sin(fMinAngle*DEGRAD))
return 0;
// The result found by this code for the first residual is always
@@ -2941,9 +2941,9 @@ void TMultiDimFit::MakeHistograms(Option_t *option)
for (i = 0; i < fNVariables; i++)
if (!fHistograms->FindObject(Form("x_%d_orig",i)))
fHistograms->Add(new TH1D(Form("x_%d_orig",i),
- Form("Original variable # %d",i),
- fBinVarX, fMinVariables(i),
- fMaxVariables(i)));
+ Form("Original variable # %d",i),
+ fBinVarX, fMinVariables(i),
+ fMaxVariables(i)));
}
// Histogram of original dependent variable
@@ -2951,7 +2951,7 @@ void TMultiDimFit::MakeHistograms(Option_t *option)
SETBIT(fHistogramMask,HIST_DORIG);
if (!fHistograms->FindObject("d_orig"))
fHistograms->Add(new TH1D("d_orig", "Original Quantity",
- fBinVarX, fMinQuantity, fMaxQuantity));
+ fBinVarX, fMinQuantity, fMaxQuantity));
}
// Histograms of normalized variables
@@ -2960,8 +2960,8 @@ void TMultiDimFit::MakeHistograms(Option_t *option)
for (i = 0; i < fNVariables; i++)
if (!fHistograms->FindObject(Form("x_%d_norm",i)))
fHistograms->Add(new TH1D(Form("x_%d_norm",i),
- Form("Normalized variable # %d",i),
- fBinVarX, -1,1));
+ Form("Normalized variable # %d",i),
+ fBinVarX, -1,1));
}
// Histogram of shifted dependent variable
@@ -2969,8 +2969,8 @@ void TMultiDimFit::MakeHistograms(Option_t *option)
SETBIT(fHistogramMask,HIST_DSHIF);
if (!fHistograms->FindObject("d_shifted"))
fHistograms->Add(new TH1D("d_shifted", "Shifted Quantity",
- fBinVarX, fMinQuantity - fMeanQuantity,
- fMaxQuantity - fMeanQuantity));
+ fBinVarX, fMinQuantity - fMeanQuantity,
+ fMaxQuantity - fMeanQuantity));
}
// Residual from training sample versus independent variables
@@ -2979,11 +2979,11 @@ void TMultiDimFit::MakeHistograms(Option_t *option)
for (i = 0; i < fNVariables; i++)
if (!fHistograms->FindObject(Form("res_x_%d",i)))
fHistograms->Add(new TH2D(Form("res_x_%d",i),
- Form("Computed residual versus x_%d", i),
- fBinVarX, -1, 1,
- fBinVarY,
- fMinQuantity - fMeanQuantity,
- fMaxQuantity - fMeanQuantity));
+ Form("Computed residual versus x_%d", i),
+ fBinVarX, -1, 1,
+ fBinVarY,
+ fMinQuantity - fMeanQuantity,
+ fMaxQuantity - fMeanQuantity));
}
// Residual from training sample versus. dependent variable
@@ -2991,13 +2991,13 @@ void TMultiDimFit::MakeHistograms(Option_t *option)
SETBIT(fHistogramMask,HIST_RD);
if (!fHistograms->FindObject("res_d"))
fHistograms->Add(new TH2D("res_d",
- "Computed residuals vs Quantity",
- fBinVarX,
- fMinQuantity - fMeanQuantity,
- fMaxQuantity - fMeanQuantity,
- fBinVarY,
- fMinQuantity - fMeanQuantity,
- fMaxQuantity - fMeanQuantity));
+ "Computed residuals vs Quantity",
+ fBinVarX,
+ fMinQuantity - fMeanQuantity,
+ fMaxQuantity - fMeanQuantity,
+ fBinVarY,
+ fMinQuantity - fMeanQuantity,
+ fMaxQuantity - fMeanQuantity));
}
// Residual from training sample
@@ -3005,18 +3005,18 @@ void TMultiDimFit::MakeHistograms(Option_t *option)
SETBIT(fHistogramMask,HIST_RTRAI);
if (!fHistograms->FindObject("res_train"))
fHistograms->Add(new TH1D("res_train",
- "Computed residuals over training sample",
- fBinVarX, fMinQuantity - fMeanQuantity,
- fMaxQuantity - fMeanQuantity));
+ "Computed residuals over training sample",
+ fBinVarX, fMinQuantity - fMeanQuantity,
+ fMaxQuantity - fMeanQuantity));
}
if (opt.Contains("r4") || opt.Contains("a")) {
SETBIT(fHistogramMask,HIST_RTEST);
if (!fHistograms->FindObject("res_test"))
fHistograms->Add(new TH1D("res_test",
- "Distribution of residuals from test",
- fBinVarX,fMinQuantity - fMeanQuantity,
- fMaxQuantity - fMeanQuantity));
+ "Distribution of residuals from test",
+ fBinVarX,fMinQuantity - fMeanQuantity,
+ fMaxQuantity - fMeanQuantity));
}
}
@@ -3121,7 +3121,7 @@ void TMultiDimFit::MakeNormalized()
for (i = 0; i < fNVariables; i++) {
Double_t range = 1. / (fMaxVariables(i) - fMinVariables(i));
fMeanVariables(i) = 1 + 2 * range * (fMeanVariables(i)
- - fMaxVariables(i));
+ - fMaxVariables(i));
}
}
@@ -3234,7 +3234,7 @@ void TMultiDimFit::MakeParameterization()
// Calculate control parameter from this function
for (j = 0; j < fNVariables; j++) {
if (fNCoefficients == 1
- || fMaxPowersFinal[j] <= fPowers[i * fNVariables + j] - 1)
+ || fMaxPowersFinal[j] <= fPowers[i * fNVariables + j] - 1)
fMaxPowersFinal[j] = fPowers[i * fNVariables + j] - 1;
}
Double_t s = EvalControl(&fPowers[i * fNVariables]);
@@ -3242,16 +3242,16 @@ void TMultiDimFit::MakeParameterization()
// Print the statistics about this function
if (fIsVerbose) {
std::cout << std::setw(5) << fNCoefficients << " "
- << std::setw(10) << std::setprecision(4) << squareResidual << " "
- << std::setw(10) << std::setprecision(4) << dResidur << " "
- << std::setw(7) << std::setprecision(3) << fMaxAngle << " "
- << std::setw(7) << std::setprecision(3) << s << " "
- << std::setw(5) << i << " "
- << std::setw(10) << std::setprecision(4)
- << fOrthCoefficients(fNCoefficients-1) << " "
- << std::setw(10) << std::setprecision(4)
- << fOrthFunctionNorms(fNCoefficients-1) << " "
- << std::flush;
+ << std::setw(10) << std::setprecision(4) << squareResidual << " "
+ << std::setw(10) << std::setprecision(4) << dResidur << " "
+ << std::setw(7) << std::setprecision(3) << fMaxAngle << " "
+ << std::setw(7) << std::setprecision(3) << s << " "
+ << std::setw(5) << i << " "
+ << std::setw(10) << std::setprecision(4)
+ << fOrthCoefficients(fNCoefficients-1) << " "
+ << std::setw(10) << std::setprecision(4)
+ << fOrthFunctionNorms(fNCoefficients-1) << " "
+ << std::flush;
for (j = 0; j < fNVariables; j++)
std::cout << " " << fPowers[i * fNVariables + j] - 1 << std::flush;
std::cout << std::endl;
@@ -3263,7 +3263,7 @@ void TMultiDimFit::MakeParameterization()
}
Double_t err = TMath::Sqrt(TMath::Max(1e-20,squareResidual) /
- fSumSqAvgQuantity);
+ fSumSqAvgQuantity);
if (err < fMinRelativeError) {
fParameterisationCode = PARAM_RELERR;
break;
@@ -3309,24 +3309,24 @@ void TMultiDimFit::MakeRealCode(const char *filename,
outFile << "// -*- mode: c++ -*-" << std::endl;
// Info about creator
outFile << "// " << std::endl
- << "// File " << filename
- << " generated by TMultiDimFit::MakeRealCode" << std::endl;
+ << "// File " << filename
+ << " generated by TMultiDimFit::MakeRealCode" << std::endl;
// Time stamp
TDatime date;
outFile << "// on " << date.AsString() << std::endl;
// ROOT version info
outFile << "// ROOT version " << gROOT->GetVersion()
- << std::endl << "//" << std::endl;
+ << std::endl << "//" << std::endl;
// General information on the code
outFile << "// This file contains the function " << std::endl
- << "//" << std::endl
- << "// double " << prefix << "MDF(double *x); " << std::endl
- << "//" << std::endl
- << "// For evaluating the parameterization obtained" << std::endl
- << "// from TMultiDimFit and the point x" << std::endl
- << "// " << std::endl
- << "// See TMultiDimFit class documentation for more "
- << "information " << std::endl << "// " << std::endl;
+ << "//" << std::endl
+ << "// double " << prefix << "MDF(double *x); " << std::endl
+ << "//" << std::endl
+ << "// For evaluating the parameterization obtained" << std::endl
+ << "// from TMultiDimFit and the point x" << std::endl
+ << "// " << std::endl
+ << "// See TMultiDimFit class documentation for more "
+ << "information " << std::endl << "// " << std::endl;
// Header files
if (isMethod)
// If these are methods, we need the class header
@@ -3336,19 +3336,19 @@ void TMultiDimFit::MakeRealCode(const char *filename,
// Now for the data
//
outFile << "//" << std::endl
- << "// Static data variables" << std::endl
- << "//" << std::endl;
+ << "// Static data variables" << std::endl
+ << "//" << std::endl;
outFile << cv_qual << "int " << prefix << "gNVariables = "
- << fNVariables << ";" << std::endl;
+ << fNVariables << ";" << std::endl;
outFile << cv_qual << "int " << prefix << "gNCoefficients = "
- << fNCoefficients << ";" << std::endl;
+ << fNCoefficients << ";" << std::endl;
outFile << cv_qual << "double " << prefix << "gDMean = "
- << fMeanQuantity << ";" << std::endl;
+ << fMeanQuantity << ";" << std::endl;
// Assignment to mean vector.
outFile << "// Assignment to mean vector." << std::endl;
outFile << cv_qual << "double " << prefix
- << "gXMean[] = {" << std::endl;
+ << "gXMean[] = {" << std::endl;
for (i = 0; i < fNVariables; i++)
outFile << (i != 0 ? ", " : " ") << fMeanVariables(i) << std::flush;
outFile << " };" << std::endl << std::endl;
@@ -3356,7 +3356,7 @@ void TMultiDimFit::MakeRealCode(const char *filename,
// Assignment to minimum vector.
outFile << "// Assignment to minimum vector." << std::endl;
outFile << cv_qual << "double " << prefix
- << "gXMin[] = {" << std::endl;
+ << "gXMin[] = {" << std::endl;
for (i = 0; i < fNVariables; i++)
outFile << (i != 0 ? ", " : " ") << fMinVariables(i) << std::flush;
outFile << " };" << std::endl << std::endl;
@@ -3364,7 +3364,7 @@ void TMultiDimFit::MakeRealCode(const char *filename,
// Assignment to maximum vector.
outFile << "// Assignment to maximum vector." << std::endl;
outFile << cv_qual << "double " << prefix
- << "gXMax[] = {" << std::endl;
+ << "gXMax[] = {" << std::endl;
for (i = 0; i < fNVariables; i++)
outFile << (i != 0 ? ", " : " ") << fMaxVariables(i) << std::flush;
outFile << " };" << std::endl << std::endl;
@@ -3372,7 +3372,7 @@ void TMultiDimFit::MakeRealCode(const char *filename,
// Assignment to coefficients vector.
outFile << "// Assignment to coefficients vector." << std::endl;
outFile << cv_qual << "double " << prefix
- << "gCoefficient[] = {" << std::flush;
+ << "gCoefficient[] = {" << std::flush;
for (i = 0; i < fNCoefficients; i++)
outFile << (i != 0 ? "," : "") << std::endl
<< " " << fCoefficients(i) << std::flush;
@@ -3381,7 +3381,7 @@ void TMultiDimFit::MakeRealCode(const char *filename,
// Assignment to error coefficients vector.
outFile << "// Assignment to error coefficients vector." << std::endl;
outFile << cv_qual << "double " << prefix
- << "gCoefficientRMS[] = {" << std::flush;
+ << "gCoefficientRMS[] = {" << std::flush;
for (i = 0; i < fNCoefficients; i++)
outFile << (i != 0 ? "," : "") << std::endl
<< " " << fCoefficientsRMS(i) << std::flush;
@@ -3389,18 +3389,18 @@ void TMultiDimFit::MakeRealCode(const char *filename,
// Assignment to powers vector.
outFile << "// Assignment to powers vector." << std::endl
- << "// The powers are stored row-wise, that is" << std::endl
- << "// p_ij = " << prefix
- << "gPower[i * NVariables + j];" << std::endl;
+ << "// The powers are stored row-wise, that is" << std::endl
+ << "// p_ij = " << prefix
+ << "gPower[i * NVariables + j];" << std::endl;
outFile << cv_qual << "int " << prefix
- << "gPower[] = {" << std::flush;
+ << "gPower[] = {" << std::flush;
for (i = 0; i < fNCoefficients; i++) {
for (j = 0; j < fNVariables; j++) {
if (j != 0) outFile << std::flush << " ";
else outFile << std::endl << " ";
outFile << fPowers[fPowerIndex[i] * fNVariables + j]
<< (i == fNCoefficients - 1 && j == fNVariables - 1 ? "" : ",")
- << std::flush;
+ << std::flush;
}
}
outFile << std::endl << "};" << std::endl << std::endl;
@@ -3410,49 +3410,49 @@ void TMultiDimFit::MakeRealCode(const char *filename,
// Finally we reach the function itself
//
outFile << "// " << std::endl
- << "// The "
- << (isMethod ? "method " : "function ")
- << " double " << prefix
- << "MDF(double *x)"
- << std::endl << "// " << std::endl;
+ << "// The "
+ << (isMethod ? "method " : "function ")
+ << " double " << prefix
+ << "MDF(double *x)"
+ << std::endl << "// " << std::endl;
outFile << "double " << prefix
- << "MDF(double *x) {" << std::endl
- << " double returnValue = " << prefix << "gDMean;" << std::endl
- << " int i = 0, j = 0, k = 0;" << std::endl
- << " for (i = 0; i < " << prefix << "gNCoefficients ; i++) {"
- << std::endl
- << " // Evaluate the ith term in the expansion" << std::endl
- << " double term = " << prefix << "gCoefficient[i];"
- << std::endl
- << " for (j = 0; j < " << prefix << "gNVariables; j++) {"
- << std::endl
- << " // Evaluate the polynomial in the jth variable." << std::endl
- << " int power = "<< prefix << "gPower["
- << prefix << "gNVariables * i + j]; " << std::endl
- << " double p1 = 1, p2 = 0, p3 = 0, r = 0;" << std::endl
- << " double v = 1 + 2. / ("
- << prefix << "gXMax[j] - " << prefix
- << "gXMin[j]) * (x[j] - " << prefix << "gXMax[j]);" << std::endl
- << " // what is the power to use!" << std::endl
- << " switch(power) {" << std::endl
- << " case 1: r = 1; break; " << std::endl
- << " case 2: r = v; break; " << std::endl
- << " default: " << std::endl
- << " p2 = v; " << std::endl
- << " for (k = 3; k <= power; k++) { " << std::endl
- << " p3 = p2 * v;" << std::endl;
+ << "MDF(double *x) {" << std::endl
+ << " double returnValue = " << prefix << "gDMean;" << std::endl
+ << " int i = 0, j = 0, k = 0;" << std::endl
+ << " for (i = 0; i < " << prefix << "gNCoefficients ; i++) {"
+ << std::endl
+ << " // Evaluate the ith term in the expansion" << std::endl
+ << " double term = " << prefix << "gCoefficient[i];"
+ << std::endl
+ << " for (j = 0; j < " << prefix << "gNVariables; j++) {"
+ << std::endl
+ << " // Evaluate the polynomial in the jth variable." << std::endl
+ << " int power = "<< prefix << "gPower["
+ << prefix << "gNVariables * i + j]; " << std::endl
+ << " double p1 = 1, p2 = 0, p3 = 0, r = 0;" << std::endl
+ << " double v = 1 + 2. / ("
+ << prefix << "gXMax[j] - " << prefix
+ << "gXMin[j]) * (x[j] - " << prefix << "gXMax[j]);" << std::endl
+ << " // what is the power to use!" << std::endl
+ << " switch(power) {" << std::endl
+ << " case 1: r = 1; break; " << std::endl
+ << " case 2: r = v; break; " << std::endl
+ << " default: " << std::endl
+ << " p2 = v; " << std::endl
+ << " for (k = 3; k <= power; k++) { " << std::endl
+ << " p3 = p2 * v;" << std::endl;
if (fPolyType == kLegendre)
outFile << " p3 = ((2 * i - 3) * p2 * v - (i - 2) * p1)"
<< " / (i - 1);" << std::endl;
if (fPolyType == kChebyshev)
outFile << " p3 = 2 * v * p2 - p1; " << std::endl;
outFile << " p1 = p2; p2 = p3; " << std::endl << " }" << std::endl
- << " r = p3;" << std::endl << " }" << std::endl
- << " // multiply this term by the poly in the jth var" << std::endl
- << " term *= r; " << std::endl << " }" << std::endl
- << " // Add this term to the final result" << std::endl
- << " returnValue += term;" << std::endl << " }" << std::endl
- << " return returnValue;" << std::endl << "}" << std::endl << std::endl;
+ << " r = p3;" << std::endl << " }" << std::endl
+ << " // multiply this term by the poly in the jth var" << std::endl
+ << " term *= r; " << std::endl << " }" << std::endl
+ << " // Add this term to the final result" << std::endl
+ << " returnValue += term;" << std::endl << " }" << std::endl
+ << " return returnValue;" << std::endl << "}" << std::endl << std::endl;
// EOF
outFile << "// EOF for " << filename << std::endl;
@@ -3487,21 +3487,21 @@ void TMultiDimFit::Print(Option_t *option) const
if (opt.Contains("p")) {
// Print basic parameters for this object
std::cout << "User parameters:" << std::endl
- << "----------------" << std::endl
- << " Variables: " << fNVariables << std::endl
- << " Data points: " << fSampleSize << std::endl
- << " Max Terms: " << fMaxTerms << std::endl
- << " Power Limit Parameter: " << fPowerLimit << std::endl
- << " Max functions: " << fMaxFunctions << std::endl
- << " Max functions to study: " << fMaxStudy << std::endl
- << " Max angle (optional): " << fMaxAngle << std::endl
- << " Min angle: " << fMinAngle << std::endl
- << " Relative Error accepted: " << fMinRelativeError << std::endl
- << " Maximum Powers: " << std::flush;
+ << "----------------" << std::endl
+ << " Variables: " << fNVariables << std::endl
+ << " Data points: " << fSampleSize << std::endl
+ << " Max Terms: " << fMaxTerms << std::endl
+ << " Power Limit Parameter: " << fPowerLimit << std::endl
+ << " Max functions: " << fMaxFunctions << std::endl
+ << " Max functions to study: " << fMaxStudy << std::endl
+ << " Max angle (optional): " << fMaxAngle << std::endl
+ << " Min angle: " << fMinAngle << std::endl
+ << " Relative Error accepted: " << fMinRelativeError << std::endl
+ << " Maximum Powers: " << std::flush;
for (i = 0; i < fNVariables; i++)
std::cout << " " << fMaxPowers[i] - 1 << std::flush;
std::cout << std::endl << std::endl
- << " Parameterisation will be done using " << std::flush;
+ << " Parameterisation will be done using " << std::flush;
if (fPolyType == kChebyshev)
std::cout << "Chebyshev polynomials" << std::endl;
else if (fPolyType == kLegendre)
@@ -3514,56 +3514,56 @@ void TMultiDimFit::Print(Option_t *option) const
if (opt.Contains("s")) {
// Print statistics for read data
std::cout << "Sample statistics:" << std::endl
- << "------------------" << std::endl
- << " D" << std::flush;
+ << "------------------" << std::endl
+ << " D" << std::flush;
for (i = 0; i < fNVariables; i++)
std::cout << " " << std::setw(10) << i+1 << std::flush;
std::cout << std::endl << " Max: " << std::setw(10) << std::setprecision(7)
- << fMaxQuantity << std::flush;
+ << fMaxQuantity << std::flush;
for (i = 0; i < fNVariables; i++)
std::cout << " " << std::setw(10) << std::setprecision(4)
<< fMaxVariables(i) << std::flush;
std::cout << std::endl << " Min: " << std::setw(10) << std::setprecision(7)
- << fMinQuantity << std::flush;
+ << fMinQuantity << std::flush;
for (i = 0; i < fNVariables; i++)
std::cout << " " << std::setw(10) << std::setprecision(4)
<< fMinVariables(i) << std::flush;
std::cout << std::endl << " Mean: " << std::setw(10) << std::setprecision(7)
- << fMeanQuantity << std::flush;
+ << fMeanQuantity << std::flush;
for (i = 0; i < fNVariables; i++)
std::cout << " " << std::setw(10) << std::setprecision(4)
<< fMeanVariables(i) << std::flush;
std::cout << std::endl << " Function Sum Squares: " << fSumSqQuantity
- << std::endl << std::endl;
+ << std::endl << std::endl;
}
if (opt.Contains("r")) {
std::cout << "Results of Parameterisation:" << std::endl
- << "----------------------------" << std::endl
- << " Total reduction of square residuals "
- << fSumSqResidual << std::endl
- << " Relative precision obtained: "
- << fPrecision << std::endl
- << " Error obtained: "
- << fError << std::endl
- << " Multiple correlation coefficient: "
- << fCorrelationCoeff << std::endl
- << " Reduced Chi square over sample: "
- << fChi2 / (fSampleSize - fNCoefficients) << std::endl
- << " Maximum residual value: "
- << fMaxResidual << std::endl
- << " Minimum residual value: "
- << fMinResidual << std::endl
- << " Estimated root mean square: "
- << fRMS << std::endl
- << " Maximum powers used: " << std::flush;
+ << "----------------------------" << std::endl
+ << " Total reduction of square residuals "
+ << fSumSqResidual << std::endl
+ << " Relative precision obtained: "
+ << fPrecision << std::endl
+ << " Error obtained: "
+ << fError << std::endl
+ << " Multiple correlation coefficient: "
+ << fCorrelationCoeff << std::endl
+ << " Reduced Chi square over sample: "
+ << fChi2 / (fSampleSize - fNCoefficients) << std::endl
+ << " Maximum residual value: "
+ << fMaxResidual << std::endl
+ << " Minimum residual value: "
+ << fMinResidual << std::endl
+ << " Estimated root mean square: "
+ << fRMS << std::endl
+ << " Maximum powers used: " << std::flush;
for (j = 0; j < fNVariables; j++)
std::cout << fMaxPowersFinal[j] << " " << std::flush;
std::cout << std::endl
- << " Function codes of candidate functions." << std::endl
- << " 1: considered,"
- << " 2: too little contribution,"
- << " 3: accepted." << std::flush;
+ << " Function codes of candidate functions." << std::endl
+ << " 1: considered,"
+ << " 2: too little contribution,"
+ << " 3: accepted." << std::flush;
for (i = 0; i < fMaxFunctions; i++) {
if (i % 60 == 0)
std::cout << std::endl << " " << std::flush;
@@ -3590,18 +3590,18 @@ void TMultiDimFit::Print(Option_t *option) const
if (opt.Contains("f")) {
std::cout << "Results of Fit:" << std::endl
- << "---------------" << std::endl
- << " Test sample size: "
- << fTestSampleSize << std::endl
- << " Multiple correlation coefficient: "
- << fTestCorrelationCoeff << std::endl
- << " Relative precision obtained: "
- << fTestPrecision << std::endl
- << " Error obtained: "
- << fTestError << std::endl
- << " Reduced Chi square over sample: "
- << fChi2 / (fSampleSize - fNCoefficients) << std::endl
- << std::endl;
+ << "---------------" << std::endl
+ << " Test sample size: "
+ << fTestSampleSize << std::endl
+ << " Multiple correlation coefficient: "
+ << fTestCorrelationCoeff << std::endl
+ << " Relative precision obtained: "
+ << fTestPrecision << std::endl
+ << " Error obtained: "
+ << fTestError << std::endl
+ << " Reduced Chi square over sample: "
+ << fChi2 / (fSampleSize - fNCoefficients) << std::endl
+ << std::endl;
if (fFitter) {
fFitter->PrintResults(1,1);
std::cout << std::endl;
@@ -3610,13 +3610,13 @@ void TMultiDimFit::Print(Option_t *option) const
if (opt.Contains("c")){
std::cout << "Coefficients:" << std::endl
- << "-------------" << std::endl
- << " # Value Error Powers" << std::endl
- << " ---------------------------------------" << std::endl;
+ << "-------------" << std::endl
+ << " # Value Error Powers" << std::endl
+ << " ---------------------------------------" << std::endl;
for (i = 0; i < fNCoefficients; i++) {
std::cout << " " << std::setw(3) << i << " "
- << std::setw(12) << fCoefficients(i) << " "
- << std::setw(12) << fCoefficientsRMS(i) << " " << std::flush;
+ << std::setw(12) << fCoefficients(i) << " "
+ << std::setw(12) << fCoefficientsRMS(i) << " " << std::flush;
for (j = 0; j < fNVariables; j++)
std::cout << " " << std::setw(3)
<< fPowers[fPowerIndex[i] * fNVariables + j] - 1 << std::flush;
@@ -3626,21 +3626,21 @@ void TMultiDimFit::Print(Option_t *option) const
}
if (opt.Contains("k") && fCorrelationMatrix.IsValid()) {
std::cout << "Correlation Matrix:" << std::endl
- << "-------------------";
+ << "-------------------";
fCorrelationMatrix.Print();
}
if (opt.Contains("m")) {
std::cout << "Parameterization:" << std::endl
- << "-----------------" << std::endl
- << " Normalised variables: " << std::endl;
- for (i = 0; i < fNVariables; i++)
- std::cout << "\ty_" << i << "\t= 1 + 2 * (x_" << i << " - "
- << fMaxVariables(i) << ") / ("
- << fMaxVariables(i) << " - " << fMinVariables(i) << ")"
+ << "-----------------" << std::endl
+ << " Normalised variables: " << std::endl;
+ for (i = 0; i < fNVariables; i++)
+ std::cout << "\ty_" << i << "\t= 1 + 2 * (x_" << i << " - "
+ << fMaxVariables(i) << ") / ("
+ << fMaxVariables(i) << " - " << fMinVariables(i) << ")"
<< std::endl;
std::cout << std::endl
- << " f(";
+ << " f(";
for (i = 0; i < fNVariables; i++) {
std::cout << "y_" << i;
if (i != fNVariables-1) std::cout << ", ";
@@ -3648,13 +3648,13 @@ void TMultiDimFit::Print(Option_t *option) const
std::cout << ") = ";
for (i = 0; i < fNCoefficients; i++) {
if (i != 0)
- std::cout << std::endl << "\t" << (fCoefficients(i) < 0 ? "- " : "+ ")
+ std::cout << std::endl << "\t" << (fCoefficients(i) < 0 ? "- " : "+ ")
<< TMath::Abs(fCoefficients(i));
- else
+ else
std::cout << fCoefficients(i);
for (j = 0; j < fNVariables; j++) {
Int_t p = fPowers[fPowerIndex[i] * fNVariables + j];
- switch (p) {
+ switch (p) {
case 1: break;
case 2: std::cout << " * y_" << j; break;
default:
@@ -3759,7 +3759,7 @@ void TMultiDimFit::SetMaxPowers(const Int_t* powers)
// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
if (!powers)
return;
-
+
for (Int_t i = 0; i < fNVariables; i++)
fMaxPowers[i] = powers[i]+1;
}
@@ -3783,22 +3783,22 @@ Bool_t TMultiDimFit::TestFunction(Double_t squareResidual,
// Test whether the currently considered function contributes to the
// fit. See also
// Begin_Html<a href="#TMultiDimFit:description">class description</a>End_Html
-
+
if (fNCoefficients != 0) {
// Now for the second test:
if (fMaxAngle == 0) {
// If the user hasn't supplied a max angle do the test as,
if (dResidur <
- squareResidual / (fMaxTerms - fNCoefficients + 1 + 1E-10)) {
- return kFALSE;
+ squareResidual / (fMaxTerms - fNCoefficients + 1 + 1E-10)) {
+ return kFALSE;
}
}
else {
// If the user has provided a max angle, test if the calculated
// angle is less then the max angle.
if (TMath::Sqrt(dResidur/fSumSqAvgQuantity) <
- TMath::Cos(fMaxAngle*DEGRAD)) {
- return kFALSE;
+ TMath::Cos(fMaxAngle*DEGRAD)) {
+ return kFALSE;
}
}
}
@@ -3812,7 +3812,7 @@ void mdfHelper(int& /*npar*/, double* /*divs*/, double& chi2,
double* coeffs, int /*flag*/)
{
// Helper function for doing the minimisation of Chi2 using Minuit
-
+
// Get pointer to current TMultiDimFit object.
TMultiDimFit* mdf = TMultiDimFit::Instance();
chi2 = mdf->MakeChi2(coeffs);
diff --git a/hist/hist/src/TProfile.cxx b/hist/hist/src/TProfile.cxx
index 950dd8a84b0..4ebf50e9c99 100644
--- a/hist/hist/src/TProfile.cxx
+++ b/hist/hist/src/TProfile.cxx
@@ -27,7 +27,7 @@ ClassImp(TProfile)
//______________________________________________________________________________
//
// Profile histograms are used to display the mean
-// value of Y and its error for each bin in X. The displayed error is by default the
+// value of Y and its error for each bin in X. The displayed error is by default the
// standard error on the mean (i.e. the standard deviation divided by the sqrt(n) )
// Profile histograms are in many cases an
// elegant replacement of two-dimensional histograms : the inter-relation of two
@@ -43,14 +43,14 @@ ClassImp(TProfile)
// 2
// H(J) = sum Y E(J) = sum Y
// l(J) = sum l L(J) = sum l
-// h(J) = H(J)/L(J) mean of Y,
+// h(J) = H(J)/L(J) mean of Y,
// s(J) = sqrt(E(J)/L(J)- h(J)**2) standard deviation of Y (e.g. RMS)
// e(J) = s(J)/sqrt(L(J)) standard error on the mean
//
-// The displayed bin content for bin J of a TProfile is always h(J). The corresponding bin error is by default
-// e(J). In case the option "s" is used (in the constructor or by calling TProfile::BuildOptions)
-// the displayed error is s(J)
-//
+// The displayed bin content for bin J of a TProfile is always h(J). The corresponding bin error is by default
+// e(J). In case the option "s" is used (in the constructor or by calling TProfile::BuildOptions)
+// the displayed error is s(J)
+//
// In the special case where s(J) is zero (eg, case of 1 entry only in one bin)
// the bin error e(J) is computed from the average of the s(J) for all bins if
// the static function TProfile::Approximate has been called.
@@ -72,16 +72,16 @@ ClassImp(TProfile)
//}
//Begin_Html
/*
-<img src="gif/profile.gif">
-*/
+ <img src="gif/profile.gif">
+ */
//End_Html
//
//______________________________________________________________________________
TProfile::TProfile() : TH1D()
{
-//*-*-*-*-*-*Default constructor for Profile histograms*-*-*-*-*-*-*-*-*
-//*-* ==========================================
+ //*-*-*-*-*-*Default constructor for Profile histograms*-*-*-*-*-*-*-*-*
+ //*-* ==========================================
BuildOptions(0,0,"");
}
@@ -89,96 +89,96 @@ TProfile::TProfile() : TH1D()
//______________________________________________________________________________
TProfile::~TProfile()
{
-//*-*-*-*-*-*Default destructor for Profile histograms*-*-*-*-*-*-*-*-*
-//*-* =========================================
+ //*-*-*-*-*-*Default destructor for Profile histograms*-*-*-*-*-*-*-*-*
+ //*-* =========================================
}
//______________________________________________________________________________
TProfile::TProfile(const char *name,const char *title,Int_t nbins,Double_t xlow,Double_t xup,Option_t *option)
- : TH1D(name,title,nbins,xlow,xup)
+: TH1D(name,title,nbins,xlow,xup)
{
-//*-*-*-*-*-*Normal Constructor for Profile histograms*-*-*-*-*-*-*-*-*-*
-//*-* ==========================================
-//
-// The first five parameters are similar to TH1D::TH1D.
-// All values of y are accepted at filling time.
-// To fill a profile histogram, one must use TProfile::Fill function.
-//
-// Note that when filling the profile histogram the function Fill
-// checks if the variable y is betyween fYmin and fYmax.
-// If a minimum or maximum value is set for the Y scale before filling,
-// then all values below ymin or above ymax will be discarded.
-// Setting the minimum or maximum value for the Y scale before filling
-// has the same effect as calling the special TProfile constructor below
-// where ymin and ymax are specified.
-//
-// H(J) is printed as the channel contents. The errors displayed are s(J) if CHOPT='S'
-// (spread option), or e(J) if CHOPT=' ' (error on mean).
-//
-// See TProfile::BuildOptions for explanation of parameters
-//
-// see also comments in the TH1 base class constructors
+ //*-*-*-*-*-*Normal Constructor for Profile histograms*-*-*-*-*-*-*-*-*-*
+ //*-* ==========================================
+ //
+ // The first five parameters are similar to TH1D::TH1D.
+ // All values of y are accepted at filling time.
+ // To fill a profile histogram, one must use TProfile::Fill function.
+ //
+ // Note that when filling the profile histogram the function Fill
+ // checks if the variable y is betyween fYmin and fYmax.
+ // If a minimum or maximum value is set for the Y scale before filling,
+ // then all values below ymin or above ymax will be discarded.
+ // Setting the minimum or maximum value for the Y scale before filling
+ // has the same effect as calling the special TProfile constructor below
+ // where ymin and ymax are specified.
+ //
+ // H(J) is printed as the channel contents. The errors displayed are s(J) if CHOPT='S'
+ // (spread option), or e(J) if CHOPT=' ' (error on mean).
+ //
+ // See TProfile::BuildOptions for explanation of parameters
+ //
+ // see also comments in the TH1 base class constructors
BuildOptions(0,0,option);
}
//______________________________________________________________________________
TProfile::TProfile(const char *name,const char *title,Int_t nbins,const Float_t *xbins,Option_t *option)
- : TH1D(name,title,nbins,xbins)
+: TH1D(name,title,nbins,xbins)
{
-//*-*-*-*-*-*Constructor for Profile histograms with variable bin size*-*-*-*-*
-//*-* =========================================================
-//
-// See TProfile::BuildOptions for more explanations on errors
-//
-// see also comments in the TH1 base class constructors
+ //*-*-*-*-*-*Constructor for Profile histograms with variable bin size*-*-*-*-*
+ //*-* =========================================================
+ //
+ // See TProfile::BuildOptions for more explanations on errors
+ //
+ // see also comments in the TH1 base class constructors
BuildOptions(0,0,option);
}
//______________________________________________________________________________
TProfile::TProfile(const char *name,const char *title,Int_t nbins,const Double_t *xbins,Option_t *option)
- : TH1D(name,title,nbins,xbins)
+: TH1D(name,title,nbins,xbins)
{
-//*-*-*-*-*-*Constructor for Profile histograms with variable bin size*-*-*-*-*
-//*-* =========================================================
-//
-// See TProfile::BuildOptions for more explanations on errors
-//
-// see also comments in the TH1 base class constructors
+ //*-*-*-*-*-*Constructor for Profile histograms with variable bin size*-*-*-*-*
+ //*-* =========================================================
+ //
+ // See TProfile::BuildOptions for more explanations on errors
+ //
+ // see also comments in the TH1 base class constructors
BuildOptions(0,0,option);
}
//______________________________________________________________________________
TProfile::TProfile(const char *name,const char *title,Int_t nbins,const Double_t *xbins,Double_t ylow,Double_t yup,Option_t *option)
- : TH1D(name,title,nbins,xbins)
+: TH1D(name,title,nbins,xbins)
{
-//*-*-*-*-*-*Constructor for Profile histograms with variable bin size*-*-*-*-*
-//*-* =========================================================
-//
-// See TProfile::BuildOptions for more explanations on errors
-//
-// see also comments in the TH1 base class constructors
+ //*-*-*-*-*-*Constructor for Profile histograms with variable bin size*-*-*-*-*
+ //*-* =========================================================
+ //
+ // See TProfile::BuildOptions for more explanations on errors
+ //
+ // see also comments in the TH1 base class constructors
BuildOptions(ylow,yup,option);
}
//______________________________________________________________________________
TProfile::TProfile(const char *name,const char *title,Int_t nbins,Double_t xlow,Double_t xup,Double_t ylow,Double_t yup,Option_t *option)
- : TH1D(name,title,nbins,xlow,xup)
+: TH1D(name,title,nbins,xlow,xup)
{
-//*-*-*-*-*-*Constructor for Profile histograms with range in y*-*-*-*-*-*
-//*-* ==================================================
-// The first five parameters are similar to TH1D::TH1D.
-// Only the values of Y between ylow and yup will be considered at filling time.
-// ylow and yup will also be the maximum and minimum values
-// on the y scale when drawing the profile.
-//
-// See TProfile::BuildOptions for more explanations on errors
-//
-// see also comments in the TH1 base class constructors
+ //*-*-*-*-*-*Constructor for Profile histograms with range in y*-*-*-*-*-*
+ //*-* ==================================================
+ // The first five parameters are similar to TH1D::TH1D.
+ // Only the values of Y between ylow and yup will be considered at filling time.
+ // ylow and yup will also be the maximum and minimum values
+ // on the y scale when drawing the profile.
+ //
+ // See TProfile::BuildOptions for more explanations on errors
+ //
+ // see also comments in the TH1 base class constructors
BuildOptions(ylow,yup,option);
}
@@ -187,52 +187,52 @@ TProfile::TProfile(const char *name,const char *title,Int_t nbins,Double_t xlow,
//______________________________________________________________________________
void TProfile::BuildOptions(Double_t ymin, Double_t ymax, Option_t *option)
{
-//*-*-*-*-*-*-*Set Profile histogram structure and options*-*-*-*-*-*-*-*-*
-//*-* ===========================================
-// ymin: minimum value allowed for y
-// ymax: maximum value allowed for y
-// if (ymin = ymax = 0) there are no limits on the allowed y values (ymin = -inf, ymax = +inf)
-//
-// option: this is the option for the computation of the y error of the profile ( TProfile::GetBinError )
-// possible values for the options are:
-//
-//
-// ' ' (Default) the bin errors are the standard error on the mean of Y = S(Y)/SQRT(N)
-// where S(Y) is the standard deviation (RMS) of the Y data in the bin
-// and N is the number of bin entries (from TProfile::GetBinEntries(ibin) )
-// (i.e the errors are the standard error on the bin content of the profile)
-//
-// 's' Errors are the standard deviation of Y, S(Y)
-//
-// 'i' Errors are S(Y)/SQRT(N) (standard error on the mean as in the default)
-// The only difference is only when the standard deviation in Y is zero.
-// In this case the error a standard deviation = 1/SQRT(12) is assumed and the error is
-// 1./SQRT(12*N).
-// This approximation assumes that the Y values are integer (e.g. ADC counts)
-// and have an implicit uncertainty of y +/- 0.5. With the assumption that the probability that y
-// takes any value between y-0.5 and y+0.5 is uniform, its standard error is 1/SQRT(12)
-//
-// 'g' Errors are 1./SQRT(W) where W is the sum of the weights for the bin J
-// W is obtained as from TProfile::GetBinEntries(ibin)
-// This errors corresponds to the standard deviation of weighted mean where each
-// measurement Y is uncorrelated and has an error sigma, which is expressed in the
-// weight used to fill the Profile: w = 1/sigma^2
-// The resulting error in TProfile is then 1./SQRT( Sum(1./sigma^2) )
+ //*-*-*-*-*-*-*Set Profile histogram structure and options*-*-*-*-*-*-*-*-*
+ //*-* ===========================================
+ // ymin: minimum value allowed for y
+ // ymax: maximum value allowed for y
+ // if (ymin = ymax = 0) there are no limits on the allowed y values (ymin = -inf, ymax = +inf)
+ //
+ // option: this is the option for the computation of the y error of the profile ( TProfile::GetBinError )
+ // possible values for the options are:
+ //
+ //
+ // ' ' (Default) the bin errors are the standard error on the mean of Y = S(Y)/SQRT(N)
+ // where S(Y) is the standard deviation (RMS) of the Y data in the bin
+ // and N is the number of bin entries (from TProfile::GetBinEntries(ibin) )
+ // (i.e the errors are the standard error on the bin content of the profile)
+ //
+ // 's' Errors are the standard deviation of Y, S(Y)
+ //
+ // 'i' Errors are S(Y)/SQRT(N) (standard error on the mean as in the default)
+ // The only difference is only when the standard deviation in Y is zero.
+ // In this case the error a standard deviation = 1/SQRT(12) is assumed and the error is
+ // 1./SQRT(12*N).
+ // This approximation assumes that the Y values are integer (e.g. ADC counts)
+ // and have an implicit uncertainty of y +/- 0.5. With the assumption that the probability that y
+ // takes any value between y-0.5 and y+0.5 is uniform, its standard error is 1/SQRT(12)
+ //
+ // 'g' Errors are 1./SQRT(W) where W is the sum of the weights for the bin J
+ // W is obtained as from TProfile::GetBinEntries(ibin)
+ // This errors corresponds to the standard deviation of weighted mean where each
+ // measurement Y is uncorrelated and has an error sigma, which is expressed in the
+ // weight used to fill the Profile: w = 1/sigma^2
+ // The resulting error in TProfile is then 1./SQRT( Sum(1./sigma^2) )
-//
-// In the case of Profile filled weights and with TProfile::Sumw2() called,
-// STD(Y) is the standard deviation of the weighted sample Y and N is in this case the
-// number of effective entries (TProfile::GetBinEffectiveEntries(ibin) )
-//
-// If a bin has N data points all with the same value Y (especially
-// possible when dealing with integers), the spread in Y for that bin
-// is zero, and the uncertainty assigned is also zero, and the bin is
-// ignored in making subsequent fits.
-// To avoid this problem one can use an approximation for the standard deviation S(Y),
-// by using the average of all the S(Y) of the other Profile bins. To use this approximation
-// one must call before TProfile::Approximate
-// This approximayion applies only for the default and the 's' options
-//
+ //
+ // In the case of Profile filled weights and with TProfile::Sumw2() called,
+ // STD(Y) is the standard deviation of the weighted sample Y and N is in this case the
+ // number of effective entries (TProfile::GetBinEffectiveEntries(ibin) )
+ //
+ // If a bin has N data points all with the same value Y (especially
+ // possible when dealing with integers), the spread in Y for that bin
+ // is zero, and the uncertainty assigned is also zero, and the bin is
+ // ignored in making subsequent fits.
+ // To avoid this problem one can use an approximation for the standard deviation S(Y),
+ // by using the average of all the S(Y) of the other Profile bins. To use this approximation
+ // one must call before TProfile::Approximate
+ // This approximayion applies only for the default and the 's' options
+ //
SetErrorOption(option);
@@ -245,7 +245,7 @@ void TProfile::BuildOptions(Double_t ymin, Double_t ymax, Option_t *option)
fTsumwy = fTsumwy2 = 0;
}
-
+
//______________________________________________________________________________
TProfile::TProfile(const TProfile &profile) : TH1D()
{
@@ -278,21 +278,21 @@ Bool_t TProfile::Add(const TH1 *h1, Double_t c1)
Error("Add","Attempt to add a non-profile object");
return kFALSE;
}
-
+
return TProfileHelper::Add(this, this, h1, 1, c1);
}
//______________________________________________________________________________
Bool_t TProfile::Add(const TH1 *h1, const TH1 *h2, Double_t c1, Double_t c2)
{
-//*-*-*-*-*Replace contents of this profile by the addition of h1 and h2*-*-*
-//*-* =============================================================
-//
-// this = c1*h1 + c2*h2
-//
-// c1 and c2 are considered as weights applied to the two summed profiles.
-// The operation acts therefore like merging the two profiles with a weight c1 and c2
-//
+ //*-*-*-*-*Replace contents of this profile by the addition of h1 and h2*-*-*
+ //*-* =============================================================
+ //
+ // this = c1*h1 + c2*h2
+ //
+ // c1 and c2 are considered as weights applied to the two summed profiles.
+ // The operation acts therefore like merging the two profiles with a weight c1 and c2
+ //
if (!h1 || !h2) {
Error("Add","Attempt to add a non-existing profile");
@@ -313,14 +313,14 @@ Bool_t TProfile::Add(const TH1 *h1, const TH1 *h2, Double_t c1, Double_t c2)
//______________________________________________________________________________
void TProfile::Approximate(Bool_t approx)
{
-// static function
-// set the fgApproximate flag. When the flag is true, the function GetBinError
-// will approximate the bin error with the average profile error on all bins
-// in the following situation only
-// - the number of bins in the profile is less than 1002
-// - the bin number of entries is small ( <5)
-// - the estimated bin error is extremely small compared to the bin content
-// (see TProfile::GetBinError)
+ // static function
+ // set the fgApproximate flag. When the flag is true, the function GetBinError
+ // will approximate the bin error with the average profile error on all bins
+ // in the following situation only
+ // - the number of bins in the profile is less than 1002
+ // - the bin number of entries is small ( <5)
+ // - the estimated bin error is extremely small compared to the bin content
+ // (see TProfile::GetBinError)
fgApproximate = approx;
}
@@ -328,12 +328,12 @@ void TProfile::Approximate(Bool_t approx)
//______________________________________________________________________________
Int_t TProfile::BufferEmpty(Int_t action)
{
-// Fill histogram with all entries in the buffer.
-// action = -1 histogram is reset and refilled from the buffer (called by THistPainter::Paint)
-// action = 0 histogram is filled from the buffer
-// action = 1 histogram is filled and buffer is deleted
-// The buffer is automatically deleted when the number of entries
-// in the buffer is greater than the number of entries in the histogram
+ // Fill histogram with all entries in the buffer.
+ // action = -1 histogram is reset and refilled from the buffer (called by THistPainter::Paint)
+ // action = 0 histogram is filled from the buffer
+ // action = 1 histogram is filled and buffer is deleted
+ // The buffer is automatically deleted when the number of entries
+ // in the buffer is greater than the number of entries in the histogram
// do we need to compute the bin size?
if (!fBuffer) return 0;
@@ -386,11 +386,11 @@ Int_t TProfile::BufferEmpty(Int_t action)
//______________________________________________________________________________
Int_t TProfile::BufferFill(Double_t x, Double_t y, Double_t w)
{
-// accumulate arguments in buffer. When buffer is full, empty the buffer
-// fBuffer[0] = number of entries in buffer
-// fBuffer[1] = w of first entry
-// fBuffer[2] = x of first entry
-// fBuffer[3] = y of first entry
+ // accumulate arguments in buffer. When buffer is full, empty the buffer
+ // fBuffer[0] = number of entries in buffer
+ // fBuffer[1] = w of first entry
+ // fBuffer[2] = x of first entry
+ // fBuffer[3] = y of first entry
if (!fBuffer) return -2;
Int_t nbentries = (Int_t)fBuffer[0];
@@ -417,10 +417,10 @@ Int_t TProfile::BufferFill(Double_t x, Double_t y, Double_t w)
//______________________________________________________________________________
void TProfile::Copy(TObject &obj) const
{
-//*-*-*-*-*-*-*-*Copy a Profile histogram to a new profile histogram*-*-*-*-*
-//*-* ===================================================
+ //*-*-*-*-*-*-*-*Copy a Profile histogram to a new profile histogram*-*-*-*-*
+ //*-* ===================================================
- try {
+ try {
TProfile & pobj = dynamic_cast<TProfile&>(obj);
TH1D::Copy(pobj);
fBinEntries.Copy(pobj.fBinEntries);
@@ -429,18 +429,18 @@ void TProfile::Copy(TObject &obj) const
pobj.fArray[bin] = fArray[bin];
pobj.fSumw2.fArray[bin] = fSumw2.fArray[bin];
}
-
+
pobj.fYmin = fYmin;
pobj.fYmax = fYmax;
pobj.fScaling = fScaling;
pobj.fErrorMode = fErrorMode;
pobj.fTsumwy = fTsumwy;
pobj.fTsumwy2 = fTsumwy2;
-
+
} catch(...) {
Fatal("Copy","Cannot copy a TProfile in a %s",obj.IsA()->GetName());
}
-
+
}
@@ -457,13 +457,13 @@ Bool_t TProfile::Divide(TF1 *, Double_t )
//______________________________________________________________________________
Bool_t TProfile::Divide(const TH1 *h1)
{
-//*-*-*-*-*-*-*-*-*-*-*Divide this profile by h1*-*-*-*-*-*-*-*-*-*-*-*-*
-//*-* =========================
-//
-// this = this/h1
-// This function accepts to divide a TProfile by a histogram
-//
-// The function return kFALSE if the divide operation failed
+ //*-*-*-*-*-*-*-*-*-*-*Divide this profile by h1*-*-*-*-*-*-*-*-*-*-*-*-*
+ //*-* =========================
+ //
+ // this = this/h1
+ // This function accepts to divide a TProfile by a histogram
+ //
+ // The function return kFALSE if the divide operation failed
if (!h1) {
Error("Divide","Attempt to divide a non-existing profile");
@@ -480,16 +480,16 @@ Bool_t TProfile::Divide(const TH1 *h1)
Int_t nbinsx = GetNbinsX();
-//*-*- Check profile compatibility
+ //*-*- Check profile compatibility
if (nbinsx != p1->GetNbinsX()) {
Error("Divide","Attempt to divide profiles with different number of bins");
return kFALSE;
}
-//*-*- Reset statistics
+ //*-*- Reset statistics
fEntries = fTsumw = fTsumw2 = fTsumwx = fTsumwx2 = fTsumwy = fTsumwy2 = 0;
-//*-*- Loop on bins (including underflows/overflows)
+ //*-*- Loop on bins (including underflows/overflows)
Int_t bin;
Double_t *cu1=0, *er1=0, *en1=0;
Double_t e0,e1,c12;
@@ -526,12 +526,12 @@ Bool_t TProfile::Divide(const TH1 *h1)
else fBinEntries.fArray[bin] /= en1[bin];
}
// mantaining the correct sum of weights square is not supported when dividing
- // bin error resulting from division of profile needs to be checked
- if (fBinSumw2.fN) {
+ // bin error resulting from division of profile needs to be checked
+ if (fBinSumw2.fN) {
Warning("Divide","Cannot preserve during the division of profiles the sum of bin weight square");
fBinSumw2 = TArrayD();
}
-
+
return kTRUE;
}
@@ -539,12 +539,12 @@ Bool_t TProfile::Divide(const TH1 *h1)
//______________________________________________________________________________
Bool_t TProfile::Divide(const TH1 *h1, const TH1 *h2, Double_t c1, Double_t c2, Option_t *option)
{
-//*-*-*-*-*Replace contents of this profile by the division of h1 by h2*-*-*
-//*-* ============================================================
-//
-// this = c1*h1/(c2*h2)
-//
-// The function return kFALSE if the divide operation failed
+ //*-*-*-*-*Replace contents of this profile by the division of h1 by h2*-*-*
+ //*-* ============================================================
+ //
+ // this = c1*h1/(c2*h2)
+ //
+ // The function return kFALSE if the divide operation failed
TString opt = option;
opt.ToLower();
@@ -569,7 +569,7 @@ Bool_t TProfile::Divide(const TH1 *h1, const TH1 *h2, Double_t c1, Double_t c2,
if (fBuffer) BufferEmpty(1);
Int_t nbinsx = GetNbinsX();
-//*-*- Check histogram compatibility
+ //*-*- Check histogram compatibility
if (nbinsx != p1->GetNbinsX() || nbinsx != p2->GetNbinsX()) {
Error("Divide","Attempt to divide profiles with different number of bins");
return kFALSE;
@@ -586,10 +586,10 @@ Bool_t TProfile::Divide(const TH1 *h1, const TH1 *h2, Double_t c1, Double_t c2,
printf(" TH1D *p2 = h2->ProjectionX();\n");
printf(" p1->Divide(p2);\n");
-//*-*- Reset statistics
+ //*-*- Reset statistics
fEntries = fTsumw = fTsumw2 = fTsumwx = fTsumwx2 = 0;
-//*-*- Loop on bins (including underflows/overflows)
+ //*-*- Loop on bins (including underflows/overflows)
Int_t bin;
Double_t *cu1 = p1->GetW();
Double_t *cu2 = p2->GetW();
@@ -619,14 +619,14 @@ Bool_t TProfile::Divide(const TH1 *h1, const TH1 *h2, Double_t c1, Double_t c2,
//fTsumwy2 += z*x*x;
Double_t e1 = er1[bin];
Double_t e2 = er2[bin];
- //Double_t b22= b2*b2*d2;
+ //Double_t b22= b2*b2*d2;
Double_t b22= b2*b2*TMath::Abs(c2);
if (!b2) fSumw2.fArray[bin] = 0;
else {
if (binomial) {
fSumw2.fArray[bin] = TMath::Abs(w*(1-w)/b2);
} else {
- //fSumw2.fArray[bin] = d1*d2*(e1*b2*b2 + e2*b1*b1)/(b22*b22);
+ //fSumw2.fArray[bin] = d1*d2*(e1*b2*b2 + e2*b1*b1)/(b22*b22);
fSumw2.fArray[bin] = ac1*ac2*(e1*b2*b2 + e2*b1*b1)/(b22*b22);
}
}
@@ -635,8 +635,8 @@ Bool_t TProfile::Divide(const TH1 *h1, const TH1 *h2, Double_t c1, Double_t c2,
}
// mantaining the correct sum of weights square is not supported when dividing
- // bin error resulting from division of profile needs to be checked
- if (fBinSumw2.fN) {
+ // bin error resulting from division of profile needs to be checked
+ if (fBinSumw2.fN) {
Warning("Divide","Cannot preserve during the division of profiles the sum of bin weight square");
fBinSumw2 = TArrayD();
}
@@ -647,8 +647,8 @@ Bool_t TProfile::Divide(const TH1 *h1, const TH1 *h2, Double_t c1, Double_t c2,
//______________________________________________________________________________
Int_t TProfile::Fill(Double_t x, Double_t y)
{
-//*-*-*-*-*-*-*-*-*-*-*Fill a Profile histogram (no weights)*-*-*-*-*-*-*-*
-//*-* =====================================
+ //*-*-*-*-*-*-*-*-*-*-*Fill a Profile histogram (no weights)*-*-*-*-*-*-*-*
+ //*-* =====================================
if (fBuffer) return BufferFill(x,y,1);
@@ -678,8 +678,8 @@ Int_t TProfile::Fill(Double_t x, Double_t y)
//______________________________________________________________________________
Int_t TProfile::Fill(const char *namex, Double_t y)
{
-// Fill a Profile histogram (no weights)
-//
+ // Fill a Profile histogram (no weights)
+ //
Int_t bin;
if (fYmin != fYmax) {
if (y <fYmin || y> fYmax || TMath::IsNaN(y) ) return -1;
@@ -707,8 +707,8 @@ Int_t TProfile::Fill(const char *namex, Double_t y)
//______________________________________________________________________________
Int_t TProfile::Fill(Double_t x, Double_t y, Double_t w)
{
-//*-*-*-*-*-*-*-*-*-*-*Fill a Profile histogram with weights*-*-*-*-*-*-*-*
-//*-* =====================================
+ //*-*-*-*-*-*-*-*-*-*-*Fill a Profile histogram with weights*-*-*-*-*-*-*-*
+ //*-* =====================================
if (fBuffer) return BufferFill(x,y,w);
@@ -740,8 +740,8 @@ Int_t TProfile::Fill(Double_t x, Double_t y, Double_t w)
//______________________________________________________________________________
Int_t TProfile::Fill(const char *namex, Double_t y, Double_t w)
{
-// Fill a Profile histogram with weights
-//
+ // Fill a Profile histogram with weights
+ //
Int_t bin;
if (fYmin != fYmax) {
@@ -773,8 +773,8 @@ Int_t TProfile::Fill(const char *namex, Double_t y, Double_t w)
//______________________________________________________________________________
void TProfile::FillN(Int_t ntimes, const Double_t *x, const Double_t *y, const Double_t *w, Int_t stride)
{
-//*-*-*-*-*-*-*-*-*-*-*Fill a Profile histogram with weights*-*-*-*-*-*-*-*
-//*-* =====================================
+ //*-*-*-*-*-*-*-*-*-*-*Fill a Profile histogram with weights*-*-*-*-*-*-*-*
+ //*-* =====================================
Int_t bin,i;
ntimes *= stride;
for (i=0;i<ntimes;i+=stride) {
@@ -805,8 +805,8 @@ void TProfile::FillN(Int_t ntimes, const Double_t *x, const Double_t *y, const D
//______________________________________________________________________________
Double_t TProfile::GetBinContent(Int_t bin) const
{
-//*-*-*-*-*-*-*Return bin content of a Profile histogram*-*-*-*-*-*-*-*-*-*
-//*-* =========================================
+ //*-*-*-*-*-*-*Return bin content of a Profile histogram*-*-*-*-*-*-*-*-*-*
+ //*-* =========================================
if (fBuffer) ((TProfile*)this)->BufferEmpty();
@@ -819,8 +819,8 @@ Double_t TProfile::GetBinContent(Int_t bin) const
//______________________________________________________________________________
Double_t TProfile::GetBinEntries(Int_t bin) const
{
-//*-*-*-*-*-*-*Return bin entries of a Profile histogram*-*-*-*-*-*-*-*-*-*
-//*-* =========================================
+ //*-*-*-*-*-*-*Return bin entries of a Profile histogram*-*-*-*-*-*-*-*-*-*
+ //*-* =========================================
if (fBuffer) ((TProfile*)this)->BufferEmpty();
@@ -831,14 +831,14 @@ Double_t TProfile::GetBinEntries(Int_t bin) const
//______________________________________________________________________________
Double_t TProfile::GetBinEffectiveEntries(Int_t bin) const
{
-// Return bin effective entries for a weighted filled Profile histogram.
-// In case of an unweighted profile, it is equivalent to the number of entries per bin
-// The effective entries is defined as the square of the sum of the weights divided by the
-// sum of the weights square.
-// TProfile::Sumw2() must be called before filling the profile with weights.
-// Only by calling this method the sum of the square of the weights per bin is stored.
-//
-//*-* =========================================
+ // Return bin effective entries for a weighted filled Profile histogram.
+ // In case of an unweighted profile, it is equivalent to the number of entries per bin
+ // The effective entries is defined as the square of the sum of the weights divided by the
+ // sum of the weights square.
+ // TProfile::Sumw2() must be called before filling the profile with weights.
+ // Only by calling this method the sum of the square of the weights per bin is stored.
+ //
+ //*-* =========================================
return TProfileHelper::GetBinEffectiveEntries((TProfile*)this, bin);
}
@@ -846,34 +846,34 @@ Double_t TProfile::GetBinEffectiveEntries(Int_t bin) const
//______________________________________________________________________________
Double_t TProfile::GetBinError(Int_t bin) const
{
-// *-*-*-*-*-*-*Return bin error of a Profile histogram*-*-*-*-*-*-*-*-*-*
-// *-* =======================================
-//
-// Computing errors: A moving field
-// =================================
-// The computation of errors for a TProfile has evolved with the versions
-// of ROOT. The difficulty is in computing errors for bins with low statistics.
-// - prior to version 3.00, we had no special treatment of low statistic bins.
-// As a result, these bins had huge errors. The reason is that the
-// expression eprim2 is very close to 0 (rounding problems) or 0.
-// - in version 3.00 (18 Dec 2000), the algorithm is protected for values of
-// eprim2 very small and the bin errors set to the average bin errors, following
-// recommendations from a group of users.
-// - in version 3.01 (19 Apr 2001), it is realized that the algorithm above
-// should be applied only to low statistic bins.
-// - in version 3.02 (26 Sep 2001), the same group of users recommend instead
-// to take two times the average error on all bins for these low
-// statistics bins giving a very small value for eprim2.
-// - in version 3.04 (Nov 2002), the algorithm is modified/protected for the case
-// when a TProfile is projected (ProjectionX). The previous algorithm
-// generated a N^2 problem when projecting a TProfile with a large number of
-// bins (eg 100000).
-// - in version 3.05/06, a new static function TProfile::Approximate
-// is introduced to enable or disable (default) the approximation.
-//
-// Ideas for improvements of this algorithm are welcome. No suggestions
-// received since our call for advice to roottalk in Jul 2002.
-// see for instance: http://root.cern.ch/root/roottalk/roottalk02/2916.html
+ // *-*-*-*-*-*-*Return bin error of a Profile histogram*-*-*-*-*-*-*-*-*-*
+ // *-* =======================================
+ //
+ // Computing errors: A moving field
+ // =================================
+ // The computation of errors for a TProfile has evolved with the versions
+ // of ROOT. The difficulty is in computing errors for bins with low statistics.
+ // - prior to version 3.00, we had no special treatment of low statistic bins.
+ // As a result, these bins had huge errors. The reason is that the
+ // expression eprim2 is very close to 0 (rounding problems) or 0.
+ // - in version 3.00 (18 Dec 2000), the algorithm is protected for values of
+ // eprim2 very small and the bin errors set to the average bin errors, following
+ // recommendations from a group of users.
+ // - in version 3.01 (19 Apr 2001), it is realized that the algorithm above
+ // should be applied only to low statistic bins.
+ // - in version 3.02 (26 Sep 2001), the same group of users recommend instead
+ // to take two times the average error on all bins for these low
+ // statistics bins giving a very small value for eprim2.
+ // - in version 3.04 (Nov 2002), the algorithm is modified/protected for the case
+ // when a TProfile is projected (ProjectionX). The previous algorithm
+ // generated a N^2 problem when projecting a TProfile with a large number of
+ // bins (eg 100000).
+ // - in version 3.05/06, a new static function TProfile::Approximate
+ // is introduced to enable or disable (default) the approximation.
+ //
+ // Ideas for improvements of this algorithm are welcome. No suggestions
+ // received since our call for advice to roottalk in Jul 2002.
+ // see for instance: http://root.cern.ch/root/roottalk/roottalk02/2916.html
return TProfileHelper::GetBinError((TProfile*)this, bin);
}
@@ -881,8 +881,8 @@ Double_t TProfile::GetBinError(Int_t bin) const
//______________________________________________________________________________
Option_t *TProfile::GetErrorOption() const
{
-//*-*-*-*-*-*-*-*-*-*Return option to compute profile errors*-*-*-*-*-*-*-*-*
-//*-* =======================================
+ //*-*-*-*-*-*-*-*-*-*Return option to compute profile errors*-*-*-*-*-*-*-*-*
+ //*-* =======================================
if (fErrorMode == kERRORSPREAD) return "s";
if (fErrorMode == kERRORSPREADI) return "i";
@@ -923,7 +923,7 @@ void TProfile::GetStats(Double_t *stats) const
}
for (binx = firstBinX; binx <= lastBinX; binx++) {
Double_t w = fBinEntries.fArray[binx];
- Double_t w2 = (fBinSumw2.fN ? fBinSumw2.fArray[binx] : w);
+ Double_t w2 = (fBinSumw2.fN ? fBinSumw2.fArray[binx] : w);
Double_t x = fXaxis.GetBinCenter(binx);
stats[0] += w;
stats[1] += w2;
@@ -953,7 +953,7 @@ void TProfile::GetStats(Double_t *stats) const
//___________________________________________________________________________
void TProfile::LabelsDeflate(Option_t *option)
{
-// Reduce the number of bins for this axis to the number of bins having a label.
+ // Reduce the number of bins for this axis to the number of bins having a label.
TProfileHelper::LabelsDeflate(this, option);
}
@@ -961,24 +961,24 @@ void TProfile::LabelsDeflate(Option_t *option)
//___________________________________________________________________________
void TProfile::LabelsInflate(Option_t *options)
{
-// Double the number of bins for axis.
-// Refill histogram
-// This function is called by TAxis::FindBin(const char *label)
+ // Double the number of bins for axis.
+ // Refill histogram
+ // This function is called by TAxis::FindBin(const char *label)
- TProfileHelper::LabelsInflate(this, options);
+ TProfileHelper::LabelsInflate(this, options);
}
//___________________________________________________________________________
void TProfile::LabelsOption(Option_t *option, Option_t * /*ax */)
{
-// Set option(s) to draw axis with labels
-// option = "a" sort by alphabetic order
-// = ">" sort by decreasing values
-// = "<" sort by increasing values
-// = "h" draw labels horizonthal
-// = "v" draw labels vertical
-// = "u" draw labels up (end of label right adjusted)
-// = "d" draw labels down (start of label left adjusted)
+ // Set option(s) to draw axis with labels
+ // option = "a" sort by alphabetic order
+ // = ">" sort by decreasing values
+ // = "<" sort by increasing values
+ // = "h" draw labels horizonthal
+ // = "v" draw labels vertical
+ // = "u" draw labels up (end of label right adjusted)
+ // = "d" draw labels down (start of label left adjusted)
THashList *labels = fXaxis.GetLabels();
if (!labels) {
@@ -1136,7 +1136,7 @@ Bool_t TProfile::Multiply(TF1 *f1, Double_t c1)
Int_t nbinsx = GetNbinsX();
-//*-*- Add statistics
+ //*-*- Add statistics
Double_t xx[1], cf1, ac1 = TMath::Abs(c1);
Double_t s1[10];
Int_t i;
@@ -1146,7 +1146,7 @@ Bool_t TProfile::Multiply(TF1 *f1, Double_t c1)
SetMinimum();
SetMaximum();
-//*-*- Loop on bins (including underflows/overflows)
+ //*-*- Loop on bins (including underflows/overflows)
Int_t bin;
for (bin=0;bin<=nbinsx+1;bin++) {
xx[0] = fXaxis.GetBinCenter(bin);
@@ -1166,11 +1166,11 @@ Bool_t TProfile::Multiply(TF1 *f1, Double_t c1)
//______________________________________________________________________________
Bool_t TProfile::Multiply(const TH1 *)
{
-//*-*-*-*-*-*-*-*-*-*-*Multiply this profile by h1*-*-*-*-*-*-*-*-*-*-*-*-*
-//*-* =============================
-//
-// this = this*h1
-//
+ //*-*-*-*-*-*-*-*-*-*-*Multiply this profile by h1*-*-*-*-*-*-*-*-*-*-*-*-*
+ //*-* =============================
+ //
+ // this = this*h1
+ //
Error("Multiply","Multiplication of profile histograms not implemented");
return kFALSE;
}
@@ -1179,11 +1179,11 @@ Bool_t TProfile::Multiply(const TH1 *)
//______________________________________________________________________________
Bool_t TProfile::Multiply(const TH1 *, const TH1 *, Double_t, Double_t, Option_t *)
{
-//*-*-*-*-*Replace contents of this profile by multiplication of h1 by h2*-*
-//*-* ================================================================
-//
-// this = (c1*h1)*(c2*h2)
-//
+ //*-*-*-*-*Replace contents of this profile by multiplication of h1 by h2*-*
+ //*-* ================================================================
+ //
+ // this = (c1*h1)*(c2*h2)
+ //
Error("Multiply","Multiplication of profile histograms not implemented");
return kFALSE;
}
@@ -1191,36 +1191,36 @@ Bool_t TProfile::Multiply(const TH1 *, const TH1 *, Double_t, Double_t, Option_t
//______________________________________________________________________________
TH1D *TProfile::ProjectionX(const char *name, Option_t *option) const
{
-//*-*-*-*-*Project this profile into a 1-D histogram along X*-*-*-*-*-*-*
-//*-* =================================================
-//
-// The projection is always of the type TH1D.
-//
-// if option "E" is specified the errors of the projected histogram are computed and set
-// to be equal to the errors of the profile.
-// Option "E" is defined as the default one in the header file.
-// if option "" is specified the histogram errors are simply the sqrt of its content
-// if option "B" is specified, the content of bin of the returned histogram
-// will be equal to the GetBinEntries(bin) of the profile,
-// otherwise (default) it will be equal to GetBinContent(bin)
-// if option "C=E" the bin contents of the projection are set to the
-// bin errors of the profile
-// if option "W" is specified the bin content of the projected histogram is set to the
-// product of the bin content of the profile and the entries.
-// With this option the returned histogram will be equivalent to the one obtained by
-// filling directly a TH1D using the 2-nd value as a weight.
-// This makes sense only for profile filled with weights =1. If not, the error of the
-// projected histogram obtained with this option will not be correct.
+ //*-*-*-*-*Project this profile into a 1-D histogram along X*-*-*-*-*-*-*
+ //*-* =================================================
+ //
+ // The projection is always of the type TH1D.
+ //
+ // if option "E" is specified the errors of the projected histogram are computed and set
+ // to be equal to the errors of the profile.
+ // Option "E" is defined as the default one in the header file.
+ // if option "" is specified the histogram errors are simply the sqrt of its content
+ // if option "B" is specified, the content of bin of the returned histogram
+ // will be equal to the GetBinEntries(bin) of the profile,
+ // otherwise (default) it will be equal to GetBinContent(bin)
+ // if option "C=E" the bin contents of the projection are set to the
+ // bin errors of the profile
+ // if option "W" is specified the bin content of the projected histogram is set to the
+ // product of the bin content of the profile and the entries.
+ // With this option the returned histogram will be equivalent to the one obtained by
+ // filling directly a TH1D using the 2-nd value as a weight.
+ // This makes sense only for profile filled with weights =1. If not, the error of the
+ // projected histogram obtained with this option will not be correct.
TString opt = option;
opt.ToLower();
Int_t nx = fXaxis.GetNbins();
-// Create the projection histogram
- TString pname = name;
- if (pname == "_px") {
- pname = GetName();
+ // Create the projection histogram
+ TString pname = name;
+ if (pname == "_px") {
+ pname = GetName();
pname.Append("_px");
}
TH1D *h1;
@@ -1248,7 +1248,7 @@ TH1D *TProfile::ProjectionX(const char *name, Option_t *option) const
else if (cequalErrors) cont = GetBinError(bin);
else if (binWeight) cont = fArray[bin]; // bin content * bin entries
else cont = GetBinContent(bin); // default case
-
+
h1->SetBinContent(bin ,cont);
// if option E projected histogram errors are same as profile
@@ -1259,7 +1259,7 @@ TH1D *TProfile::ProjectionX(const char *name, Option_t *option) const
// in case of bin entries and profile is weighted, we need to set also the bin error
if (binEntries && fBinSumw2.fN ) {
R__ASSERT( h1->GetSumw2() );
- h1->GetSumw2()->fArray[bin] = fBinSumw2.fArray[bin];
+ h1->GetSumw2()->fArray[bin] = fBinSumw2.fArray[bin];
}
}
@@ -1277,7 +1277,7 @@ TH1D *TProfile::ProjectionX(const char *name, Option_t *option) const
i++;
}
}
-
+
h1->SetEntries(fEntries);
return h1;
}
@@ -1298,40 +1298,40 @@ void TProfile::PutStats(Double_t *stats)
//______________________________________________________________________________
TH1 *TProfile::Rebin(Int_t ngroup, const char*newname, const Double_t *xbins)
{
-//*-*-*-*-*Rebin this profile grouping ngroup bins together*-*-*-*-*-*-*-*-*
-//*-* ================================================
-// -case 1 xbins=0
-// if newname is not blank a new temporary profile hnew is created.
-// else the current profile is modified (default)
-// The parameter ngroup indicates how many bins of this have to me merged
-// into one bin of hnew
-// If the original profile has errors stored (via Sumw2), the resulting
-// profile has new errors correctly calculated.
-//
-// examples: if hp is an existing TProfile histogram with 100 bins
-// hp->Rebin(); //merges two bins in one in hp: previous contents of hp are lost
-// hp->Rebin(5); //merges five bins in one in hp
-// TProfile *hnew = hp->Rebin(5,"hnew"); // creates a new profile hnew
-// //merging 5 bins of hp in one bin
-//
-// NOTE: If ngroup is not an exact divider of the number of bins,
-// the top limit of the rebinned profile is changed
-// to the upper edge of the bin=newbins*ngroup and the corresponding
-// bins are added to the overflow bin.
-// Statistics will be recomputed from the new bin contents.
-//
-// -case 2 xbins!=0
-// a new profile is created (you should specify newname).
-// The parameter ngroup is the number of variable size bins in the created profile
-// The array xbins must contain ngroup+1 elements that represent the low-edge
-// of the bins.
-// The data of the old bins are added to the new bin which contains the bin center
-// of the old bins. It is possible that information from the old binning are attached
-// to the under-/overflow bins of the new binning.
-//
-// examples: if hp is an existing TProfile with 100 bins
-// Double_t xbins[25] = {...} array of low-edges (xbins[25] is the upper edge of last bin
-// hp->Rebin(24,"hpnew",xbins); //creates a new variable bin size profile hpnew
+ //*-*-*-*-*Rebin this profile grouping ngroup bins together*-*-*-*-*-*-*-*-*
+ //*-* ================================================
+ // -case 1 xbins=0
+ // if newname is not blank a new temporary profile hnew is created.
+ // else the current profile is modified (default)
+ // The parameter ngroup indicates how many bins of this have to me merged
+ // into one bin of hnew
+ // If the original profile has errors stored (via Sumw2), the resulting
+ // profile has new errors correctly calculated.
+ //
+ // examples: if hp is an existing TProfile histogram with 100 bins
+ // hp->Rebin(); //merges two bins in one in hp: previous contents of hp are lost
+ // hp->Rebin(5); //merges five bins in one in hp
+ // TProfile *hnew = hp->Rebin(5,"hnew"); // creates a new profile hnew
+ // //merging 5 bins of hp in one bin
+ //
+ // NOTE: If ngroup is not an exact divider of the number of bins,
+ // the top limit of the rebinned profile is changed
+ // to the upper edge of the bin=newbins*ngroup and the corresponding
+ // bins are added to the overflow bin.
+ // Statistics will be recomputed from the new bin contents.
+ //
+ // -case 2 xbins!=0
+ // a new profile is created (you should specify newname).
+ // The parameter ngroup is the number of variable size bins in the created profile
+ // The array xbins must contain ngroup+1 elements that represent the low-edge
+ // of the bins.
+ // The data of the old bins are added to the new bin which contains the bin center
+ // of the old bins. It is possible that information from the old binning are attached
+ // to the under-/overflow bins of the new binning.
+ //
+ // examples: if hp is an existing TProfile with 100 bins
+ // Double_t xbins[25] = {...} array of low-edges (xbins[25] is the upper edge of last bin
+ // hp->Rebin(24,"hpnew",xbins); //creates a new variable bin size profile hpnew
Int_t nbins = fXaxis.GetNbins();
Double_t xmin = fXaxis.GetXmin();
@@ -1346,17 +1346,17 @@ TH1 *TProfile::Rebin(Int_t ngroup, const char*newname, const Double_t *xbins)
}
Int_t newbins = nbins/ngroup;
- if (!xbins) {
+ if (!xbins) {
Int_t nbg = nbins/ngroup;
if (nbg*ngroup != nbins) {
Warning("Rebin", "ngroup=%d must be an exact divider of nbins=%d",ngroup,nbins);
}
}
- else {
- // in the case of xbins given (rebinning in variable bins) ngroup is the new number of bins.
- // and number of grouped bins is not constant.
- // when looping for setting the contents for the new histogram we
- // need to loop on all bins of original histogram. Set then ngroup=nbins
+ else {
+ // in the case of xbins given (rebinning in variable bins) ngroup is the new number of bins.
+ // and number of grouped bins is not constant.
+ // when looping for setting the contents for the new histogram we
+ // need to loop on all bins of original histogram. Set then ngroup=nbins
newbins = ngroup;
ngroup = nbins;
}
@@ -1365,13 +1365,13 @@ TH1 *TProfile::Rebin(Int_t ngroup, const char*newname, const Double_t *xbins)
Double_t *oldBins = new Double_t[nbins+2];
Double_t *oldCount = new Double_t[nbins+2];
Double_t *oldErrors = new Double_t[nbins+2];
- Double_t *oldBinw2 = (fBinSumw2.fN ? new Double_t[nbins+2] : 0 );
+ Double_t *oldBinw2 = (fBinSumw2.fN ? new Double_t[nbins+2] : 0 );
Int_t bin, i;
Double_t *cu1 = GetW();
Double_t *er1 = GetW2();
Double_t *en1 = GetB();
Double_t *ew1 = GetB2();
-
+
for (bin=0;bin<=nbins+1;bin++) {
oldBins[bin] = cu1[bin];
oldCount[bin] = en1[bin];
@@ -1385,21 +1385,21 @@ TH1 *TProfile::Rebin(Int_t ngroup, const char*newname, const Double_t *xbins)
hnew = (TProfile*)Clone(newname);
}
- // in case of ngroup not an excat divider of nbins,
- // top limit is changed (see NOTE in method comment)
+ // in case of ngroup not an excat divider of nbins,
+ // top limit is changed (see NOTE in method comment)
if(!xbins && (newbins*ngroup != nbins)) {
xmax = fXaxis.GetBinUpEdge(newbins*ngroup);
hnew->fTsumw = 0; //stats must be reset because top bins will be moved to overflow bin
}
// set correctly the axis and resizes the bin arrays
- if(!xbins && (fXaxis.GetXbins()->GetSize() > 0)){
- // for rebinning of variable bins in a constant group
+ if(!xbins && (fXaxis.GetXbins()->GetSize() > 0)){
+ // for rebinning of variable bins in a constant group
Double_t *bins = new Double_t[newbins+1];
for(i = 0; i <= newbins; ++i) bins[i] = fXaxis.GetBinLowEdge(1+i*ngroup);
hnew->SetBins(newbins,bins); //this also changes the bin array's
delete [] bins;
- } else if (xbins) {
+ } else if (xbins) {
// when rebinning in variable bins
hnew->SetBins(newbins,xbins);
} else {
@@ -1415,7 +1415,7 @@ TH1 *TProfile::Rebin(Int_t ngroup, const char*newname, const Double_t *xbins)
while( fXaxis.GetBinCenter(startbin) < newxmin && startbin <= nbins ) {
startbin++;
}
-
+
Double_t *cu2 = hnew->GetW();
Double_t *er2 = hnew->GetW2();
Double_t *en2 = hnew->GetB();
@@ -1432,19 +1432,19 @@ TH1 *TProfile::Rebin(Int_t ngroup, const char*newname, const Double_t *xbins)
Int_t imax = ngroup;
Double_t xbinmax = hnew->GetXaxis()->GetBinUpEdge(bin);
for (i=0;i<ngroup;i++) {
- if((hnew == this && (oldbin+i > nbins)) ||
- (hnew != this && (fXaxis.GetBinCenter(oldbin+i) > xbinmax)))
- {
- imax = i;
- break;
- }
-
- binContent += oldBins[oldbin+i];
- binCount += oldCount[oldbin+i];
- binError += oldErrors[oldbin+i];
- if (fBinSumw2.fN) binSumw2 += oldBinw2[oldbin+i];
+ if((hnew == this && (oldbin+i > nbins)) ||
+ (hnew != this && (fXaxis.GetBinCenter(oldbin+i) > xbinmax)))
+ {
+ imax = i;
+ break;
+ }
+
+ binContent += oldBins[oldbin+i];
+ binCount += oldCount[oldbin+i];
+ binError += oldErrors[oldbin+i];
+ if (fBinSumw2.fN) binSumw2 += oldBinw2[oldbin+i];
}
-
+
cu2[bin] = binContent;
er2[bin] = binError;
en2[bin] = binCount;
@@ -1481,7 +1481,7 @@ TH1 *TProfile::Rebin(Int_t ngroup, const char*newname, const Double_t *xbins)
if (fBinSumw2.fN) binSumw2 += oldBinw2[i];
}
hnew->fArray[newbins+1] = binContent;
- hnew->fBinEntries[newbins+1] = binCount;
+ hnew->fBinEntries[newbins+1] = binCount;
hnew->fSumw2[newbins+1] = binError;
if ( fBinSumw2.fN ) hnew->fBinSumw2[newbins+1] = binSumw2;
@@ -1489,7 +1489,7 @@ TH1 *TProfile::Rebin(Int_t ngroup, const char*newname, const Double_t *xbins)
delete [] oldBins;
delete [] oldCount;
delete [] oldErrors;
- if (oldBinw2) delete [] oldBinw2;
+ if (oldBinw2) delete [] oldBinw2;
return hnew;
}
@@ -1509,7 +1509,7 @@ void TProfile::ExtendAxis(Double_t x, TAxis *axis)
if ( hold ) {
fTsumwy = hold->fTsumwy;
fTsumwy2 = hold->fTsumwy2;
-
+
delete hold;
}
}
@@ -1517,8 +1517,8 @@ void TProfile::ExtendAxis(Double_t x, TAxis *axis)
//______________________________________________________________________________
void TProfile::Reset(Option_t *option)
{
-//*-*-*-*-*-*-*-*-*-*Reset contents of a Profile histogram*-*-*-*-*-*-*-*-*
-//*-* =====================================
+ //*-*-*-*-*-*-*-*-*-*Reset contents of a Profile histogram*-*-*-*-*-*-*-*-*
+ //*-* =====================================
TH1D::Reset(option);
fBinEntries.Reset();
fBinSumw2.Reset();
@@ -1532,7 +1532,7 @@ void TProfile::Reset(Option_t *option)
//______________________________________________________________________________
void TProfile::SavePrimitive(std::ostream &out, Option_t *option /*= ""*/)
{
- // Save primitive as a C++ statement(s) on output stream out
+ // Save primitive as a C++ statement(s) on output stream out
//Note the following restrictions in the code generated:
// - variable bin size not implemented
@@ -1545,7 +1545,7 @@ void TProfile::SavePrimitive(std::ostream &out, Option_t *option /*= ""*/)
if (GetXaxis()->GetXbins()->fN && GetXaxis()->GetXbins()->fArray) {
nonEqiX = kTRUE;
out << " Double_t xAxis[" << GetXaxis()->GetXbins()->fN
- << "] = {";
+ << "] = {";
for (i = 0; i < GetXaxis()->GetXbins()->fN; i++) {
if (i != 0) out << ", ";
out << GetXaxis()->GetXbins()->fArray[i];
@@ -1567,9 +1567,9 @@ void TProfile::SavePrimitive(std::ostream &out, Option_t *option /*= ""*/)
histName += hcounter;
}
const char *hname = histName.Data();
-
+
out<<hname<<" = new "<<ClassName()<<"("<<quote<<GetName()<<quote<<","<<quote<<GetTitle()<<quote
- <<","<<GetXaxis()->GetNbins();
+ <<","<<GetXaxis()->GetNbins();
if (nonEqiX)
out << ", xAxis";
else
@@ -1608,31 +1608,31 @@ void TProfile::SavePrimitive(std::ostream &out, Option_t *option /*= ""*/)
//______________________________________________________________________________
void TProfile::Scale(Double_t c1, Option_t * option)
{
-// *-*-*-*-*Multiply this profile by a constant c1*-*-*-*-*-*-*-*-*
-// *-* ======================================
-//
-// this = c1*this
-//
-// This function uses the services of TProfile::Add
-//
-
+ // *-*-*-*-*Multiply this profile by a constant c1*-*-*-*-*-*-*-*-*
+ // *-* ======================================
+ //
+ // this = c1*this
+ //
+ // This function uses the services of TProfile::Add
+ //
+
TProfileHelper::Scale(this, c1, option);
}
//______________________________________________________________________________
void TProfile::SetBinEntries(Int_t bin, Double_t w)
{
-//*-*-*-*-*-*-*-*-*Set the number of entries in bin*-*-*-*-*-*-*-*-*-*-*-*
-//*-* ================================
-
+ //*-*-*-*-*-*-*-*-*Set the number of entries in bin*-*-*-*-*-*-*-*-*-*-*-*
+ //*-* ================================
+
TProfileHelper::SetBinEntries(this, bin, w);
}
//______________________________________________________________________________
void TProfile::SetBins(Int_t nx, Double_t xmin, Double_t xmax)
{
-//*-*-*-*-*-*-*-*-*Redefine x axis parameters*-*-*-*-*-*-*-*-*-*-*-*
-//*-* ===========================
+ //*-*-*-*-*-*-*-*-*Redefine x axis parameters*-*-*-*-*-*-*-*-*-*-*-*
+ //*-* ===========================
fXaxis.Set(nx,xmin,xmax);
fNcells = nx+2;
@@ -1642,8 +1642,8 @@ void TProfile::SetBins(Int_t nx, Double_t xmin, Double_t xmax)
//______________________________________________________________________________
void TProfile::SetBins(Int_t nx, const Double_t *xbins)
{
-//*-*-*-*-*-*-*-*-*Redefine x axis parameters*-*-*-*-*-*-*-*-*-*-*-*
-//*-* ===========================
+ //*-*-*-*-*-*-*-*-*Redefine x axis parameters*-*-*-*-*-*-*-*-*-*-*-*
+ //*-* ===========================
fXaxis.Set(nx,xbins);
fNcells = nx+2;
@@ -1656,13 +1656,13 @@ void TProfile::SetBinsLength(Int_t n)
// Set total number of bins including under/overflow
// Reallocate bin contents array
TH1D::SetBinsLength(n);
- TProfileHelper::BuildArray(this);
+ TProfileHelper::BuildArray(this);
}
//______________________________________________________________________________
void TProfile::SetBuffer(Int_t buffersize, Option_t *)
{
-// set the buffer size in units of 8 bytes (double)
+ // set the buffer size in units of 8 bytes (double)
if (fBuffer) {
BufferEmpty();
@@ -1682,30 +1682,30 @@ void TProfile::SetBuffer(Int_t buffersize, Option_t *)
//______________________________________________________________________________
void TProfile::SetErrorOption(Option_t *option)
{
-//*-*-*-*-*-*-*-*-*-*Set option to compute profile errors*-*-*-*-*-*-*-*-*
-//*-* =====================================
-//
-// The computation of the bin errors is based on the parameter option:
-// option:
-// ' ' (Default) The bin errors are the standard error on the mean of the bin profiled values (Y),
-// i.e. the standard error of the bin contents.
-// Note that if TProfile::Approximate() is called, an approximation is used when
-// the spread in Y is 0 and the number of bin entries is > 0
-//
-// 's' The bin errors are the standard deviations of the Y bin values
-// Note that if TProfile::Approximate() is called, an approximation is used when
-// the spread in Y is 0 and the number of bin entries is > 0
-//
-// 'i' Errors are as in default case (standard errors of the bin contents)
-// The only difference is for the case when the spread in Y is zero.
-// In this case for N > 0 the error is 1./SQRT(12.*N)
-//
-// 'g' Errors are 1./SQRT(W) for W not equal to 0 and 0 for W = 0.
-// W is the sum in the bin of the weights of the profile.
-// This option is for combining measurements y +/- dy,
-// and the profile is filled with values y and weights w = 1/dy**2
-//
-// See TProfile::BuildOptions for a detailed explanation of all options
+ //*-*-*-*-*-*-*-*-*-*Set option to compute profile errors*-*-*-*-*-*-*-*-*
+ //*-* =====================================
+ //
+ // The computation of the bin errors is based on the parameter option:
+ // option:
+ // ' ' (Default) The bin errors are the standard error on the mean of the bin profiled values (Y),
+ // i.e. the standard error of the bin contents.
+ // Note that if TProfile::Approximate() is called, an approximation is used when
+ // the spread in Y is 0 and the number of bin entries is > 0
+ //
+ // 's' The bin errors are the standard deviations of the Y bin values
+ // Note that if TProfile::Approximate() is called, an approximation is used when
+ // the spread in Y is 0 and the number of bin entries is > 0
+ //
+ // 'i' Errors are as in default case (standard errors of the bin contents)
+ // The only difference is for the case when the spread in Y is zero.
+ // In this case for N > 0 the error is 1./SQRT(12.*N)
+ //
+ // 'g' Errors are 1./SQRT(W) for W not equal to 0 and 0 for W = 0.
+ // W is the sum in the bin of the weights of the profile.
+ // This option is for combining measurements y +/- dy,
+ // and the profile is filled with values y and weights w = 1/dy**2
+ //
+ // See TProfile::BuildOptions for a detailed explanation of all options
TProfileHelper::SetErrorOption(this, option);
}
@@ -1738,7 +1738,7 @@ void TProfile::Streamer(TBuffer &R__b)
}
R__b.CheckByteCount(R__s, R__c, TProfile::IsA());
//====end of old versions
-
+
} else {
R__b.WriteClassBuffer(TProfile::Class(),this);
}
@@ -1754,6 +1754,6 @@ void TProfile::Sumw2(Bool_t flag)
// This function is automatically called when the histogram is created
// if the static function TH1::SetDefaultSumw2 has been called before.
// If flag is false the structure is deleted
-
+
TProfileHelper::Sumw2(this, flag);
}
diff --git a/hist/hist/src/TProfile2D.cxx b/hist/hist/src/TProfile2D.cxx
index 0d9b9569494..11a41f19997 100644
--- a/hist/hist/src/TProfile2D.cxx
+++ b/hist/hist/src/TProfile2D.cxx
@@ -45,8 +45,8 @@ ClassImp(TProfile2D)
// e(I,J) = s(I,J)/sqrt(L(I,J))
//
// In the special case where s(I,J) is zero (eg, case of 1 entry only in one cell)
-// the bin error e(I,J) is computed from the average of the s(I,J) for all cells
-// if the static function TProfile2D::Approximate has been called.
+// the bin error e(I,J) is computed from the average of the s(I,J) for all cells
+// if the static function TProfile2D::Approximate has been called.
// This simple/crude approximation was suggested in order to keep the cell
// during a fit operation. But note that this approximation is not the default behaviour.
//
@@ -67,8 +67,8 @@ ClassImp(TProfile2D)
//______________________________________________________________________________
TProfile2D::TProfile2D() : TH2D()
{
-//*-*-*-*-*-*Default constructor for Profile2D histograms*-*-*-*-*-*-*-*-*
-//*-* ============================================
+ //*-*-*-*-*-*Default constructor for Profile2D histograms*-*-*-*-*-*-*-*-*
+ //*-* ============================================
fTsumwz = fTsumwz2 = 0;
fScaling = kFALSE;
BuildOptions(0,0,"");
@@ -77,37 +77,37 @@ TProfile2D::TProfile2D() : TH2D()
//______________________________________________________________________________
TProfile2D::~TProfile2D()
{
-//*-*-*-*-*-*Default destructor for Profile2D histograms*-*-*-*-*-*-*-*-*
-//*-* ===========================================
+ //*-*-*-*-*-*Default destructor for Profile2D histograms*-*-*-*-*-*-*-*-*
+ //*-* ===========================================
}
//______________________________________________________________________________
TProfile2D::TProfile2D(const char *name,const char *title,Int_t nx,Double_t xlow,Double_t xup,Int_t ny,Double_t ylow,Double_t yup,Option_t *option)
- : TH2D(name,title,nx,xlow,xup,ny,ylow,yup)
+: TH2D(name,title,nx,xlow,xup,ny,ylow,yup)
{
-//*-*-*-*-*-*Normal Constructor for Profile histograms*-*-*-*-*-*-*-*-*-*
-//*-* ==========================================
-//
-// The first eight parameters are similar to TH2D::TH2D.
-// All values of z are accepted at filling time.
-// To fill a profile2D histogram, one must use TProfile2D::Fill function.
-//
-// Note that when filling the profile histogram the function Fill
-// checks if the variable z is betyween fZmin and fZmax.
-// If a minimum or maximum value is set for the Z scale before filling,
-// then all values below zmin or above zmax will be discarded.
-// Setting the minimum or maximum value for the Z scale before filling
-// has the same effect as calling the special TProfile2D constructor below
-// where zmin and zmax are specified.
-//
-// H(I,J) is printed as the cell contents. The errors computed are s(I,J) if CHOPT='S'
-// (spread option), or e(I,J) if CHOPT=' ' (error on mean).
-//
-// See TProfile2D::BuildOptions for explanation of parameters
-//
-// see other constructors below with all possible combinations of
-// fix and variable bin size like in TH2D.
+ //*-*-*-*-*-*Normal Constructor for Profile histograms*-*-*-*-*-*-*-*-*-*
+ //*-* ==========================================
+ //
+ // The first eight parameters are similar to TH2D::TH2D.
+ // All values of z are accepted at filling time.
+ // To fill a profile2D histogram, one must use TProfile2D::Fill function.
+ //
+ // Note that when filling the profile histogram the function Fill
+ // checks if the variable z is betyween fZmin and fZmax.
+ // If a minimum or maximum value is set for the Z scale before filling,
+ // then all values below zmin or above zmax will be discarded.
+ // Setting the minimum or maximum value for the Z scale before filling
+ // has the same effect as calling the special TProfile2D constructor below
+ // where zmin and zmax are specified.
+ //
+ // H(I,J) is printed as the cell contents. The errors computed are s(I,J) if CHOPT='S'
+ // (spread option), or e(I,J) if CHOPT=' ' (error on mean).
+ //
+ // See TProfile2D::BuildOptions for explanation of parameters
+ //
+ // see other constructors below with all possible combinations of
+ // fix and variable bin size like in TH2D.
BuildOptions(0,0,option);
if (xlow >= xup || ylow >= yup) SetBuffer(fgBufferSize);
@@ -115,27 +115,27 @@ TProfile2D::TProfile2D(const char *name,const char *title,Int_t nx,Double_t xlow
//______________________________________________________________________________
TProfile2D::TProfile2D(const char *name,const char *title,Int_t nx,const Double_t *xbins,Int_t ny,Double_t ylow,Double_t yup,Option_t *option)
- : TH2D(name,title,nx,xbins,ny,ylow,yup)
+: TH2D(name,title,nx,xbins,ny,ylow,yup)
{
-// Create a 2-D Profile with variable bins in X and fix bins in Y
+ // Create a 2-D Profile with variable bins in X and fix bins in Y
BuildOptions(0,0,option);
}
//______________________________________________________________________________
TProfile2D::TProfile2D(const char *name,const char *title,Int_t nx,Double_t xlow,Double_t xup,Int_t ny,const Double_t *ybins,Option_t *option)
- : TH2D(name,title,nx,xlow,xup,ny,ybins)
+: TH2D(name,title,nx,xlow,xup,ny,ybins)
{
-// Create a 2-D Profile with fix bins in X and variable bins in Y
+ // Create a 2-D Profile with fix bins in X and variable bins in Y
BuildOptions(0,0,option);
}
//______________________________________________________________________________
TProfile2D::TProfile2D(const char *name,const char *title,Int_t nx,const Double_t *xbins,Int_t ny,const Double_t *ybins,Option_t *option)
- : TH2D(name,title,nx,xbins,ny,ybins)
+: TH2D(name,title,nx,xbins,ny,ybins)
{
-// Create a 2-D Profile with variable bins in X and variable bins in Y
+ // Create a 2-D Profile with variable bins in X and variable bins in Y
BuildOptions(0,0,option);
}
@@ -143,17 +143,17 @@ TProfile2D::TProfile2D(const char *name,const char *title,Int_t nx,const Double_
//______________________________________________________________________________
TProfile2D::TProfile2D(const char *name,const char *title,Int_t nx,Double_t xlow,Double_t xup,Int_t ny, Double_t ylow,Double_t yup,Double_t zlow,Double_t zup,Option_t *option)
- : TH2D(name,title,nx,xlow,xup,ny,ylow,yup)
+: TH2D(name,title,nx,xlow,xup,ny,ylow,yup)
{
-//*-*-*-*-*-*Constructor for Profile2D histograms with range in z*-*-*-*-*-*
-//*-* ====================================================
-// The first eight parameters are similar to TH2D::TH2D.
-// Only the values of Z between ZMIN and ZMAX will be considered at filling time.
-// zmin and zmax will also be the maximum and minimum values
-// on the z scale when drawing the profile2D.
-//
-// See TProfile2D::BuildOptions for more explanations on errors
-//
+ //*-*-*-*-*-*Constructor for Profile2D histograms with range in z*-*-*-*-*-*
+ //*-* ====================================================
+ // The first eight parameters are similar to TH2D::TH2D.
+ // Only the values of Z between ZMIN and ZMAX will be considered at filling time.
+ // zmin and zmax will also be the maximum and minimum values
+ // on the z scale when drawing the profile2D.
+ //
+ // See TProfile2D::BuildOptions for more explanations on errors
+ //
BuildOptions(zlow,zup,option);
if (xlow >= xup || ylow >= yup) SetBuffer(fgBufferSize);
@@ -163,19 +163,19 @@ TProfile2D::TProfile2D(const char *name,const char *title,Int_t nx,Double_t xlow
//______________________________________________________________________________
void TProfile2D::BuildOptions(Double_t zmin, Double_t zmax, Option_t *option)
{
-//*-*-*-*-*-*-*Set Profile2D histogram structure and options*-*-*-*-*-*-*-*-*
-//*-* =============================================
-//
-// zmin: minimum value allowed for z
-// zmax: maximum value allowed for z
-// if (zmin = zmax = 0) there are no limits on the allowed z values (zmin = -inf, zmax = +inf)
-//
-// option: this is the option for the computation of the t error of the profile ( TProfile2D::GetBinError )
-// possible values for the options are documented in TProfile2D::SetErrorOption
+ //*-*-*-*-*-*-*Set Profile2D histogram structure and options*-*-*-*-*-*-*-*-*
+ //*-* =============================================
+ //
+ // zmin: minimum value allowed for z
+ // zmax: maximum value allowed for z
+ // if (zmin = zmax = 0) there are no limits on the allowed z values (zmin = -inf, zmax = +inf)
+ //
+ // option: this is the option for the computation of the t error of the profile ( TProfile2D::GetBinError )
+ // possible values for the options are documented in TProfile2D::SetErrorOption
-// See TProfile::BuildOptions for a detailed deescription
-//
-//
+ // See TProfile::BuildOptions for a detailed deescription
+ //
+ //
SetErrorOption(option);
@@ -227,11 +227,11 @@ Bool_t TProfile2D::Add(const TH1 *h1, Double_t c1)
//______________________________________________________________________________
Bool_t TProfile2D::Add(const TH1 *h1, const TH1 *h2, Double_t c1, Double_t c2)
{
-//*-*-*-*-*Replace contents of this profile2D by the addition of h1 and h2*-*-*
-//*-* ===============================================================
-//
-// this = c1*h1 + c2*h2
-//
+ //*-*-*-*-*Replace contents of this profile2D by the addition of h1 and h2*-*-*
+ //*-* ===============================================================
+ //
+ // this = c1*h1 + c2*h2
+ //
if (!h1 || !h2) {
Error("Add","Attempt to add a non-existing profile");
@@ -252,14 +252,14 @@ Bool_t TProfile2D::Add(const TH1 *h1, const TH1 *h2, Double_t c1, Double_t c2)
//______________________________________________________________________________
void TProfile2D::Approximate(Bool_t approx)
{
-// static function
-// set the fgApproximate flag. When the flag is true, the function GetBinError
-// will approximate the bin error with the average profile error on all bins
-// in the following situation only
-// - the number of bins in the profile2D is less than 10404 (eg 100x100)
-// - the bin number of entries is small ( <5)
-// - the estimated bin error is extremely small compared to the bin content
-// (see TProfile2D::GetBinError)
+ // static function
+ // set the fgApproximate flag. When the flag is true, the function GetBinError
+ // will approximate the bin error with the average profile error on all bins
+ // in the following situation only
+ // - the number of bins in the profile2D is less than 10404 (eg 100x100)
+ // - the bin number of entries is small ( <5)
+ // - the estimated bin error is extremely small compared to the bin content
+ // (see TProfile2D::GetBinError)
fgApproximate = approx;
}
@@ -268,12 +268,12 @@ void TProfile2D::Approximate(Bool_t approx)
//______________________________________________________________________________
Int_t TProfile2D::BufferEmpty(Int_t action)
{
-// Fill histogram with all entries in the buffer.
-// action = -1 histogram is reset and refilled from the buffer (called by THistPainter::Paint)
-// action = 0 histogram is filled from the buffer
-// action = 1 histogram is filled and buffer is deleted
-// The buffer is automatically deleted when the number of entries
-// in the buffer is greater than the number of entries in the histogram
+ // Fill histogram with all entries in the buffer.
+ // action = -1 histogram is reset and refilled from the buffer (called by THistPainter::Paint)
+ // action = 0 histogram is filled from the buffer
+ // action = 1 histogram is filled and buffer is deleted
+ // The buffer is automatically deleted when the number of entries
+ // in the buffer is greater than the number of entries in the histogram
// do we need to compute the bin size?
if (!fBuffer) return 0;
@@ -332,12 +332,12 @@ Int_t TProfile2D::BufferEmpty(Int_t action)
//______________________________________________________________________________
Int_t TProfile2D::BufferFill(Double_t x, Double_t y, Double_t z, Double_t w)
{
-// accumulate arguments in buffer. When buffer is full, empty the buffer
-// fBuffer[0] = number of entries in buffer
-// fBuffer[1] = w of first entry
-// fBuffer[2] = x of first entry
-// fBuffer[3] = y of first entry
-// fBuffer[4] = z of first entry
+ // accumulate arguments in buffer. When buffer is full, empty the buffer
+ // fBuffer[0] = number of entries in buffer
+ // fBuffer[1] = w of first entry
+ // fBuffer[2] = x of first entry
+ // fBuffer[3] = y of first entry
+ // fBuffer[4] = z of first entry
if (!fBuffer) return -3;
Int_t nbentries = (Int_t)fBuffer[0];
@@ -365,10 +365,10 @@ Int_t TProfile2D::BufferFill(Double_t x, Double_t y, Double_t z, Double_t w)
//______________________________________________________________________________
void TProfile2D::Copy(TObject &obj) const
{
-//*-*-*-*-*-*-*-*Copy a Profile2D histogram to a new profile2D histogram*-*-*-*
-//*-* =======================================================
+ //*-*-*-*-*-*-*-*Copy a Profile2D histogram to a new profile2D histogram*-*-*-*
+ //*-* =======================================================
- try {
+ try {
TProfile2D & pobj = dynamic_cast<TProfile2D&>(obj);
TH2D::Copy(pobj);
@@ -384,7 +384,7 @@ void TProfile2D::Copy(TObject &obj) const
pobj.fErrorMode = fErrorMode;
pobj.fTsumwz = fTsumwz;
pobj.fTsumwz2 = fTsumwz2;
-
+
} catch(...) {
Fatal("Copy","Cannot copy a TProfile2D in a %s",obj.IsA()->GetName());
}
@@ -405,12 +405,12 @@ Bool_t TProfile2D::Divide(TF1 *, Double_t )
//______________________________________________________________________________
Bool_t TProfile2D::Divide(const TH1 *h1)
{
-//*-*-*-*-*-*-*-*-*-*-*Divide this profile2D by h1*-*-*-*-*-*-*-*-*-*-*-*-*
-//*-* ===========================
-//
-// this = this/h1
-//
-// This function return kFALSE if the divide operation failed
+ //*-*-*-*-*-*-*-*-*-*-*Divide this profile2D by h1*-*-*-*-*-*-*-*-*-*-*-*-*
+ //*-* ===========================
+ //
+ // this = this/h1
+ //
+ // This function return kFALSE if the divide operation failed
if (!h1) {
@@ -426,7 +426,7 @@ Bool_t TProfile2D::Divide(const TH1 *h1)
// delete buffer if it is there since it will become invalid
if (fBuffer) BufferEmpty(1);
-//*-*- Check profile compatibility
+ //*-*- Check profile compatibility
Int_t nx = GetNbinsX();
if (nx != p1->GetNbinsX()) {
Error("Divide","Attempt to divide profiles with different number of bins");
@@ -438,10 +438,10 @@ Bool_t TProfile2D::Divide(const TH1 *h1)
return kFALSE;
}
-//*-*- Reset statistics
+ //*-*- Reset statistics
fEntries = fTsumw = fTsumw2 = fTsumwx = fTsumwx2 = 0;
-//*-*- Loop on bins (including underflows/overflows)
+ //*-*- Loop on bins (including underflows/overflows)
Int_t bin,binx,biny;
Double_t *cu1 = p1->GetW();
Double_t *er1 = p1->GetW2();
@@ -478,8 +478,8 @@ Bool_t TProfile2D::Divide(const TH1 *h1)
}
}
// mantaining the correct sum of weights square is not supported when dividing
- // bin error resulting from division of profile needs to be checked
- if (fBinSumw2.fN) {
+ // bin error resulting from division of profile needs to be checked
+ if (fBinSumw2.fN) {
Warning("Divide","Cannot preserve during the division of profiles the sum of bin weight square");
fBinSumw2 = TArrayD();
}
@@ -490,12 +490,12 @@ Bool_t TProfile2D::Divide(const TH1 *h1)
//______________________________________________________________________________
Bool_t TProfile2D::Divide(const TH1 *h1, const TH1 *h2, Double_t c1, Double_t c2, Option_t *option)
{
-//*-*-*-*-*Replace contents of this profile2D by the division of h1 by h2*-*-*
-//*-* ==============================================================
-//
-// this = c1*h1/(c2*h2)
-//
-// This function return kFALSE if the divide operation failed
+ //*-*-*-*-*Replace contents of this profile2D by the division of h1 by h2*-*-*
+ //*-* ==============================================================
+ //
+ // this = c1*h1/(c2*h2)
+ //
+ // This function return kFALSE if the divide operation failed
TString opt = option;
opt.ToLower();
@@ -519,7 +519,7 @@ Bool_t TProfile2D::Divide(const TH1 *h1, const TH1 *h2, Double_t c1, Double_t c2
// delete buffer if it is there since it will become invalid
if (fBuffer) BufferEmpty(1);
-//*-*- Check histogram compatibility
+ //*-*- Check histogram compatibility
Int_t nx = GetNbinsX();
if (nx != p1->GetNbinsX() || nx != p2->GetNbinsX()) {
Error("Divide","Attempt to divide profiles with different number of bins");
@@ -535,10 +535,10 @@ Bool_t TProfile2D::Divide(const TH1 *h1, const TH1 *h2, Double_t c1, Double_t c2
return kFALSE;
}
-//*-*- Reset statistics
+ //*-*- Reset statistics
fEntries = fTsumw = fTsumw2 = fTsumwx = fTsumwx2 = 0;
-//*-*- Loop on bins (including underflows/overflows)
+ //*-*- Loop on bins (including underflows/overflows)
Int_t bin,binx,biny;
Double_t *cu1 = p1->GetW();
Double_t *cu2 = p2->GetW();
@@ -572,7 +572,7 @@ Bool_t TProfile2D::Divide(const TH1 *h1, const TH1 *h2, Double_t c1, Double_t c2
fTsumwz2 += z*z;
Double_t e1 = er1[bin];
Double_t e2 = er2[bin];
- //Double_t b22= b2*b2*d2;
+ //Double_t b22= b2*b2*d2;
Double_t b22= b2*b2*TMath::Abs(c2);
if (!b2) fSumw2.fArray[bin] = 0;
else {
@@ -592,8 +592,8 @@ Bool_t TProfile2D::Divide(const TH1 *h1, const TH1 *h2, Double_t c1, Double_t c2
//______________________________________________________________________________
Int_t TProfile2D::Fill(Double_t x, Double_t y, Double_t z)
{
-//*-*-*-*-*-*-*-*-*-*-*Fill a Profile2D histogram (no weights)*-*-*-*-*-*-*-*
-//*-* =======================================
+ //*-*-*-*-*-*-*-*-*-*-*Fill a Profile2D histogram (no weights)*-*-*-*-*-*-*-*
+ //*-* =======================================
if (fBuffer) return BufferFill(x,y,z,1);
@@ -607,8 +607,8 @@ Int_t TProfile2D::Fill(Double_t x, Double_t y, Double_t z)
binx =fXaxis.FindBin(x);
biny =fYaxis.FindBin(y);
if (binx <0 || biny <0) return -1;
- bin = GetBin(binx, biny);
- fArray[bin] += z;
+ bin = GetBin(binx, biny);
+ fArray[bin] += z;
fSumw2.fArray[bin] += z*z;
fBinEntries.fArray[bin] += 1;
if (fBinSumw2.fN) fBinSumw2.fArray[bin] += 1;
@@ -633,8 +633,8 @@ Int_t TProfile2D::Fill(Double_t x, Double_t y, Double_t z)
//______________________________________________________________________________
Int_t TProfile2D::Fill(Double_t x, const char *namey, Double_t z)
{
-// Fill a Profile2D histogram (no weights)
-//
+ // Fill a Profile2D histogram (no weights)
+ //
Int_t bin,binx,biny;
if (fZmin != fZmax) {
@@ -670,8 +670,8 @@ Int_t TProfile2D::Fill(Double_t x, const char *namey, Double_t z)
//______________________________________________________________________________
Int_t TProfile2D::Fill(const char *namex, const char *namey, Double_t z)
{
-// Fill a Profile2D histogram (no weights)
-//
+ // Fill a Profile2D histogram (no weights)
+ //
Int_t bin,binx,biny;
if (fZmin != fZmax) {
@@ -706,8 +706,8 @@ Int_t TProfile2D::Fill(const char *namex, const char *namey, Double_t z)
//______________________________________________________________________________
Int_t TProfile2D::Fill(const char *namex, Double_t y, Double_t z)
{
-// Fill a Profile2D histogram (no weights)
-//
+ // Fill a Profile2D histogram (no weights)
+ //
Int_t bin,binx,biny;
if (fZmin != fZmax) {
@@ -743,8 +743,8 @@ Int_t TProfile2D::Fill(const char *namex, Double_t y, Double_t z)
//______________________________________________________________________________
Int_t TProfile2D::Fill(Double_t x, Double_t y, Double_t z, Double_t w)
{
-//*-*-*-*-*-*-*-*-*-*-*Fill a Profile2D histogram with weights*-*-*-*-*-*-*-*
-//*-* =======================================
+ //*-*-*-*-*-*-*-*-*-*-*Fill a Profile2D histogram with weights*-*-*-*-*-*-*-*
+ //*-* =======================================
if (fBuffer) return BufferFill(x,y,z,w);
@@ -786,8 +786,8 @@ Int_t TProfile2D::Fill(Double_t x, Double_t y, Double_t z, Double_t w)
//______________________________________________________________________________
Double_t TProfile2D::GetBinContent(Int_t bin) const
{
-//*-*-*-*-*-*-*Return bin content of a Profile2D histogram*-*-*-*-*-*-*-*-*
-//*-* ===========================================
+ //*-*-*-*-*-*-*Return bin content of a Profile2D histogram*-*-*-*-*-*-*-*-*
+ //*-* ===========================================
if (fBuffer) ((TProfile2D*)this)->BufferEmpty();
@@ -800,8 +800,8 @@ Double_t TProfile2D::GetBinContent(Int_t bin) const
//______________________________________________________________________________
Double_t TProfile2D::GetBinEntries(Int_t bin) const
{
-//*-*-*-*-*-*-*Return bin entries of a Profile2D histogram*-*-*-*-*-*-*-*-*
-//*-* ===========================================
+ //*-*-*-*-*-*-*Return bin entries of a Profile2D histogram*-*-*-*-*-*-*-*-*
+ //*-* ===========================================
if (fBuffer) ((TProfile2D*)this)->BufferEmpty();
@@ -812,14 +812,14 @@ Double_t TProfile2D::GetBinEntries(Int_t bin) const
//______________________________________________________________________________
Double_t TProfile2D::GetBinEffectiveEntries(Int_t bin)
{
-// Return bin effective entries for a weighted filled Profile histogram.
-// In case of an unweighted profile, it is equivalent to the number of entries per bin
-// The effective entries is defined as the square of the sum of the weights divided by the
-// sum of the weights square.
-// TProfile::Sumw2() must be called before filling the profile with weights.
-// Only by calling this method the sum of the square of the weights per bin is stored.
-//
-//*-* =========================================
+ // Return bin effective entries for a weighted filled Profile histogram.
+ // In case of an unweighted profile, it is equivalent to the number of entries per bin
+ // The effective entries is defined as the square of the sum of the weights divided by the
+ // sum of the weights square.
+ // TProfile::Sumw2() must be called before filling the profile with weights.
+ // Only by calling this method the sum of the square of the weights per bin is stored.
+ //
+ //*-* =========================================
return TProfileHelper::GetBinEffectiveEntries(this, bin);
}
@@ -827,22 +827,22 @@ Double_t TProfile2D::GetBinEffectiveEntries(Int_t bin)
//______________________________________________________________________________
Double_t TProfile2D::GetBinError(Int_t bin) const
{
-// *-*-*-*-*-*-*Return bin error of a Profile2D histogram*-*-*-*-*-*-*-*-*
-//
-// Computing errors: A moving field
-// =================================
-// The computation of errors for a TProfile2D has evolved with the versions
-// of ROOT. The difficulty is in computing errors for bins with low statistics.
-// - prior to version 3.10, we had no special treatment of low statistic bins.
-// As a result, these bins had huge errors. The reason is that the
-// expression eprim2 is very close to 0 (rounding problems) or 0.
-// - The algorithm is modified/protected for the case
-// when a TProfile2D is projected (ProjectionX). The previous algorithm
-// generated a N^2 problem when projecting a TProfile2D with a large number of
-// bins (eg 100000).
-// - in version 3.10/02, a new static function TProfile::Approximate
-// is introduced to enable or disable (default) the approximation.
-// (see also comments in TProfile::GetBinError)
+ // *-*-*-*-*-*-*Return bin error of a Profile2D histogram*-*-*-*-*-*-*-*-*
+ //
+ // Computing errors: A moving field
+ // =================================
+ // The computation of errors for a TProfile2D has evolved with the versions
+ // of ROOT. The difficulty is in computing errors for bins with low statistics.
+ // - prior to version 3.10, we had no special treatment of low statistic bins.
+ // As a result, these bins had huge errors. The reason is that the
+ // expression eprim2 is very close to 0 (rounding problems) or 0.
+ // - The algorithm is modified/protected for the case
+ // when a TProfile2D is projected (ProjectionX). The previous algorithm
+ // generated a N^2 problem when projecting a TProfile2D with a large number of
+ // bins (eg 100000).
+ // - in version 3.10/02, a new static function TProfile::Approximate
+ // is introduced to enable or disable (default) the approximation.
+ // (see also comments in TProfile::GetBinError)
return TProfileHelper::GetBinError((TProfile2D*)this, bin);
}
@@ -850,8 +850,8 @@ Double_t TProfile2D::GetBinError(Int_t bin) const
//______________________________________________________________________________
Option_t *TProfile2D::GetErrorOption() const
{
-//*-*-*-*-*-*-*-*-*-*Return option to compute profile2D errors*-*-*-*-*-*-*-*
-//*-* =========================================
+ //*-*-*-*-*-*-*-*-*-*Return option to compute profile2D errors*-*-*-*-*-*-*-*
+ //*-* =========================================
if (fErrorMode == kERRORSPREAD) return "s";
if (fErrorMode == kERRORSPREADI) return "i";
@@ -894,7 +894,7 @@ void TProfile2D::GetStats(Double_t *stats) const
Int_t lastBinY = fYaxis.GetLast();
// include underflow/overflow if TH1::StatOverflows(kTRUE) in case no range is set on the axis
if (fgStatOverflows) {
- if ( !fXaxis.TestBit(TAxis::kAxisRange) ) {
+ if ( !fXaxis.TestBit(TAxis::kAxisRange) ) {
if (firstBinX == 1) firstBinX = 0;
if (lastBinX == fXaxis.GetNbins() ) lastBinX += 1;
}
@@ -908,7 +908,7 @@ void TProfile2D::GetStats(Double_t *stats) const
for (binx = firstBinX; binx <= lastBinX; binx++) {
bin = GetBin(binx,biny);
w = fBinEntries.fArray[bin];
- w2 = (fBinSumw2.fN ? fBinSumw2.fArray[bin] : w );
+ w2 = (fBinSumw2.fN ? fBinSumw2.fArray[bin] : w );
x = fXaxis.GetBinCenter(binx);
stats[0] += w;
stats[1] += w2;
@@ -937,7 +937,7 @@ void TProfile2D::GetStats(Double_t *stats) const
//___________________________________________________________________________
void TProfile2D::LabelsDeflate(Option_t *ax)
{
-// Reduce the number of bins for this axis to the number of bins having a label.
+ // Reduce the number of bins for this axis to the number of bins having a label.
TProfileHelper::LabelsDeflate(this, ax);
}
@@ -945,9 +945,9 @@ void TProfile2D::LabelsDeflate(Option_t *ax)
//___________________________________________________________________________
void TProfile2D::LabelsInflate(Option_t *ax)
{
-// Double the number of bins for axis.
-// Refill histogram
-// This function is called by TAxis::FindBin(const char *label)
+ // Double the number of bins for axis.
+ // Refill histogram
+ // This function is called by TAxis::FindBin(const char *label)
TProfileHelper::LabelsInflate(this, ax);
}
@@ -955,14 +955,14 @@ void TProfile2D::LabelsInflate(Option_t *ax)
//___________________________________________________________________________
void TProfile2D::LabelsOption(Option_t *option, Option_t *ax)
{
-// Set option(s) to draw axis with labels
-// option = "a" sort by alphabetic order
-// = ">" sort by decreasing values
-// = "<" sort by increasing values
-// = "h" draw labels horizonthal
-// = "v" draw labels vertical
-// = "u" draw labels up (end of label right adjusted)
-// = "d" draw labels down (start of label left adjusted)
+ // Set option(s) to draw axis with labels
+ // option = "a" sort by alphabetic order
+ // = ">" sort by decreasing values
+ // = "<" sort by increasing values
+ // = "h" draw labels horizonthal
+ // = "v" draw labels vertical
+ // = "u" draw labels up (end of label right adjusted)
+ // = "d" draw labels down (start of label left adjusted)
TAxis *axis = GetXaxis();
@@ -1146,11 +1146,11 @@ Bool_t TProfile2D::Multiply(TF1 *, Double_t )
//______________________________________________________________________________
Bool_t TProfile2D::Multiply(const TH1 *)
{
-//*-*-*-*-*-*-*-*-*-*-*Multiply this profile2D by h1*-*-*-*-*-*-*-*-*-*-*-*
-//*-* =============================
-//
-// this = this*h1
-//
+ //*-*-*-*-*-*-*-*-*-*-*Multiply this profile2D by h1*-*-*-*-*-*-*-*-*-*-*-*
+ //*-* =============================
+ //
+ // this = this*h1
+ //
Error("Multiply","Multiplication of profile2D histograms not implemented");
return kFALSE;
}
@@ -1159,11 +1159,11 @@ Bool_t TProfile2D::Multiply(const TH1 *)
//______________________________________________________________________________
Bool_t TProfile2D::Multiply(const TH1 *, const TH1 *, Double_t, Double_t, Option_t *)
{
-//*-*-*-*-*Replace contents of this profile2D by multiplication of h1 by h2*-*
-//*-* ================================================================
-//
-// this = (c1*h1)*(c2*h2)
-//
+ //*-*-*-*-*Replace contents of this profile2D by multiplication of h1 by h2*-*
+ //*-* ================================================================
+ //
+ // this = (c1*h1)*(c2*h2)
+ //
Error("Multiply","Multiplication of profile2D histograms not implemented");
return kFALSE;
@@ -1172,39 +1172,39 @@ Bool_t TProfile2D::Multiply(const TH1 *, const TH1 *, Double_t, Double_t, Option
//______________________________________________________________________________
TH2D *TProfile2D::ProjectionXY(const char *name, Option_t *option) const
{
-//*-*-*-*-*Project this profile2D into a 2-D histogram along X,Y*-*-*-*-*-*-*
-//*-* =====================================================
-//
-// The projection is always of the type TH2D.
-//
-// if option "E" is specified the errors of the projected histogram are computed and set
-// to be equal to the errors of the profile.
-// Option "E" is defined as the default one in the header file.
-// if option "" is specified the histogram errors are simply the sqrt of its content
-// if option "B" is specified, the content of bin of the returned histogram
-// will be equal to the GetBinEntries(bin) of the profile,
-// if option "C=E" the bin contents of the projection are set to the
-// bin errors of the profile
-// if option "W" is specified the bin content of the projected histogram is set to the
-// product of the bin content of the profile and the entries.
-// With this option the returned histogram will be equivalent to the one obtained by
-// filling directly a TH2D using the 3-rd value as a weight.
-// This option makes sense only for profile filled with all weights =1.
-// When the profile is weighted (filled with weights different than 1) the
-// bin error of the projected histogram (obtained using this option "W") cannot be
-// correctly computed from the information stored in the profile. In that case the
-// obtained histogram contains as bin error square the weighted sum of the square of the
-// profiled observable (TProfile2D::fSumw2[bin] )
+ //*-*-*-*-*Project this profile2D into a 2-D histogram along X,Y*-*-*-*-*-*-*
+ //*-* =====================================================
+ //
+ // The projection is always of the type TH2D.
+ //
+ // if option "E" is specified the errors of the projected histogram are computed and set
+ // to be equal to the errors of the profile.
+ // Option "E" is defined as the default one in the header file.
+ // if option "" is specified the histogram errors are simply the sqrt of its content
+ // if option "B" is specified, the content of bin of the returned histogram
+ // will be equal to the GetBinEntries(bin) of the profile,
+ // if option "C=E" the bin contents of the projection are set to the
+ // bin errors of the profile
+ // if option "W" is specified the bin content of the projected histogram is set to the
+ // product of the bin content of the profile and the entries.
+ // With this option the returned histogram will be equivalent to the one obtained by
+ // filling directly a TH2D using the 3-rd value as a weight.
+ // This option makes sense only for profile filled with all weights =1.
+ // When the profile is weighted (filled with weights different than 1) the
+ // bin error of the projected histogram (obtained using this option "W") cannot be
+ // correctly computed from the information stored in the profile. In that case the
+ // obtained histogram contains as bin error square the weighted sum of the square of the
+ // profiled observable (TProfile2D::fSumw2[bin] )
TString opt = option;
opt.ToLower();
-
+
// Create the projection histogram
// name of projected histogram is by default name of orginal histogram + _pxy
- TString pname(name);
+ TString pname(name);
if (pname.IsNull() || pname == "_pxy")
- pname = TString(GetName() ) + TString("_pxy");
+ pname = TString(GetName() ) + TString("_pxy");
Int_t nx = fXaxis.GetNbins();
@@ -1237,7 +1237,7 @@ TH2D *TProfile2D::ProjectionXY(const char *name, Option_t *option) const
for (binx =0;binx<=nx+1;binx++) {
for (biny =0;biny<=ny+1;biny++) {
bin = GetBin(binx,biny);
-
+
if (binEntries) cont = GetBinEntries(bin);
else if (cequalErrors) cont = GetBinError(bin);
else if (binWeight) cont = GetBinContent(bin) * GetBinEntries(bin);
@@ -1248,12 +1248,12 @@ TH2D *TProfile2D::ProjectionXY(const char *name, Option_t *option) const
// if option E projected histogram errors are same as profile
if (computeErrors ) h1->SetBinError(bin , GetBinError(bin) );
// in case of option W bin error is deduced from bin sum of z**2 values of profile
- // this is correct only if the profile is unweighted
+ // this is correct only if the profile is unweighted
if (binWeight) h1->GetSumw2()->fArray[bin] = fSumw2.fArray[bin];
// in case of bin entries and profile is weighted, we need to set also the bin error
if (binEntries && fBinSumw2.fN ) {
R__ASSERT( h1->GetSumw2() );
- h1->GetSumw2()->fArray[bin] = fBinSumw2.fArray[bin];
+ h1->GetSumw2()->fArray[bin] = fBinSumw2.fArray[bin];
}
}
}
@@ -1305,7 +1305,7 @@ TProfile *TProfile2D::ProfileY(const char *name, Int_t firstxbin, Int_t lastxbin
}
//______________________________________________________________________________
-TProfile * TProfile2D::DoProfile(bool onX, const char *name, Int_t firstbin, Int_t lastbin, Option_t *option) const {
+TProfile * TProfile2D::DoProfile(bool onX, const char *name, Int_t firstbin, Int_t lastbin, Option_t *option) const {
// implementation of ProfileX or ProfileY for a TProfile2D
// Do correctly the combination of the bin averages when doing the projection
@@ -1315,25 +1315,25 @@ TProfile * TProfile2D::DoProfile(bool onX, const char *name, Int_t firstbin, Int
TString expectedName = ( onX ? "_pfx" : "_pfy" );
- TString pname(name);
+ TString pname(name);
if (pname.IsNull() || name == expectedName)
- pname = TString(GetName() ) + expectedName;
+ pname = TString(GetName() ) + expectedName;
const TAxis& outAxis = ( onX ? fXaxis : fYaxis );
const TArrayD *bins = outAxis.GetXbins();
Int_t firstOutBin = outAxis.GetFirst();
Int_t lastOutBin = outAxis.GetLast();
- TProfile * p1 = 0;
- // case of fixed bins
+ TProfile * p1 = 0;
+ // case of fixed bins
if (bins->fN == 0) {
- if (originalRange)
+ if (originalRange)
p1 = new TProfile(pname,GetTitle(), outAxis.GetNbins(), outAxis.GetXmin(), outAxis.GetXmax(), opt );
- else
+ else
p1 = new TProfile(pname,GetTitle(), lastOutBin-firstOutBin+1,
outAxis.GetBinLowEdge(firstOutBin),outAxis.GetBinUpEdge(lastOutBin), opt);
- } else {
- // case of variable bins
+ } else {
+ // case of variable bins
if (originalRange )
p1 = new TProfile(pname,GetTitle(),outAxis.GetNbins(),bins->fArray,opt);
else
@@ -1341,15 +1341,15 @@ TProfile * TProfile2D::DoProfile(bool onX, const char *name, Int_t firstbin, Int
}
- if (fBinSumw2.fN) p1->Sumw2();
+ if (fBinSumw2.fN) p1->Sumw2();
- // make projection in a 2D first
+ // make projection in a 2D first
TH2D * h2dW = ProjectionXY("h2temp-W","W");
TH2D * h2dN = ProjectionXY("h2temp-N","B");
h2dW->SetDirectory(0); h2dN->SetDirectory(0);
-
+
TString opt1 = (originalRange) ? "o" : "";
TH1D * h1W = (onX) ? h2dW->ProjectionX("h1temp-W",firstbin,lastbin,opt1) : h2dW->ProjectionY("h1temp-W",firstbin,lastbin,opt1);
TH1D * h1N = (onX) ? h2dN->ProjectionX("h1temp-N",firstbin,lastbin,opt1) : h2dN->ProjectionY("h1temp-N",firstbin,lastbin,opt1);
@@ -1357,26 +1357,26 @@ TProfile * TProfile2D::DoProfile(bool onX, const char *name, Int_t firstbin, Int
// fill the bin content
- R__ASSERT( h1W->fN == p1->fN );
- R__ASSERT( h1N->fN == p1->fN );
+ R__ASSERT( h1W->fN == p1->fN );
+ R__ASSERT( h1N->fN == p1->fN );
R__ASSERT( h1W->GetSumw2()->fN != 0); // h1W should always be a weighted histogram since h2dW is
for (int i = 0; i < p1->fN ; ++i) {
p1->fArray[i] = h1W->GetBinContent(i); // array of profile is sum of all values
p1->GetSumw2()->fArray[i] = h1W->GetSumw2()->fArray[i]; // array of content square of profile is weight square of the W projected histogram
- p1->SetBinEntries(i, h1N->GetBinContent(i) );
+ p1->SetBinEntries(i, h1N->GetBinContent(i) );
if (fBinSumw2.fN) p1->GetBinSumw2()->fArray[i] = h1N->GetSumw2()->fArray[i]; // sum of weight squares are stored to compute errors in h1N histogram
}
// delete the created histograms
- delete h2dW;
- delete h2dN;
- delete h1W;
- delete h1N;
+ delete h2dW;
+ delete h2dN;
+ delete h1W;
+ delete h1N;
// Also we need to set the entries since they have not been correctly calculated during the projection
// we can only set them to the effective entries
p1->SetEntries( p1->GetEffectiveEntries() );
- return p1;
+ return p1;
}
@@ -1399,8 +1399,8 @@ void TProfile2D::PutStats(Double_t *stats)
//______________________________________________________________________________
void TProfile2D::Reset(Option_t *option)
{
-//*-*-*-*-*-*-*-*-*-*Reset contents of a Profile2D histogram*-*-*-*-*-*-*-*
-//*-* =======================================
+ //*-*-*-*-*-*-*-*-*-*Reset contents of a Profile2D histogram*-*-*-*-*-*-*-*
+ //*-* =======================================
TH2D::Reset(option);
fBinEntries.Reset();
fBinSumw2.Reset();
@@ -1467,12 +1467,12 @@ TProfile2D * TProfile2D::Rebin2D(Int_t nxgroup ,Int_t nygroup,const char * newna
Double_t ymin = fYaxis.GetXmin();
Double_t ymax = fYaxis.GetXmax();
if ((nxgroup <= 0) || (nxgroup > nxbins)) {
- Error("Rebin", "Illegal value of nxgroup=%d",nxgroup);
- return 0;
+ Error("Rebin", "Illegal value of nxgroup=%d",nxgroup);
+ return 0;
}
if ((nygroup <= 0) || (nygroup > nybins)) {
- Error("Rebin", "Illegal value of nygroup=%d",nygroup);
- return 0;
+ Error("Rebin", "Illegal value of nygroup=%d",nygroup);
+ return 0;
}
Int_t newxbins = nxbins/nxgroup;
@@ -1480,10 +1480,10 @@ TProfile2D * TProfile2D::Rebin2D(Int_t nxgroup ,Int_t nygroup,const char * newna
//warning if bins are added to the overflow bin
if(newxbins*nxgroup != nxbins) {
- Warning("Rebin", "nxgroup=%d should be an exact divider of nxbins=%d",nxgroup,nxbins);
+ Warning("Rebin", "nxgroup=%d should be an exact divider of nxbins=%d",nxgroup,nxbins);
}
if(newybins*nygroup != nybins) {
- Warning("Rebin", "nygroup=%d should be an exact divider of nybins=%d",nygroup,nybins);
+ Warning("Rebin", "nygroup=%d should be an exact divider of nybins=%d",nygroup,nybins);
}
//save old bin contents in new arrays
@@ -1496,44 +1496,44 @@ TProfile2D * TProfile2D::Rebin2D(Int_t nxgroup ,Int_t nygroup,const char * newna
Double_t *en1 = GetB();
Double_t *ew1 = GetB2();
for(Int_t ibin=0; ibin < (nxbins+2)*(nybins+2); ibin++){
- oldBins[ibin] = cu1[ibin];
- oldCount[ibin] = en1[ibin];
- oldErrors[ibin] = er1[ibin];
- if (ew1 && fBinSumw2.fN) oldBinw2[ibin] = ew1[ibin];
+ oldBins[ibin] = cu1[ibin];
+ oldCount[ibin] = en1[ibin];
+ oldErrors[ibin] = er1[ibin];
+ if (ew1 && fBinSumw2.fN) oldBinw2[ibin] = ew1[ibin];
}
// create a clone of the old profile if newname is specified
TProfile2D *hnew = this;
if(newname && strlen(newname) > 0) {
- hnew = (TProfile2D*)Clone(newname);
+ hnew = (TProfile2D*)Clone(newname);
}
- // in case of nxgroup/nygroup not an exact divider of nxbins/nybins,
- // top limit is changed (see NOTE in method comment)
+ // in case of nxgroup/nygroup not an exact divider of nxbins/nybins,
+ // top limit is changed (see NOTE in method comment)
if(newxbins*nxgroup != nxbins) {
- xmax = fXaxis.GetBinUpEdge(newxbins*nxgroup);
- hnew->fTsumw = 0; //stats must be reset because top bins will be moved to overflow bin
+ xmax = fXaxis.GetBinUpEdge(newxbins*nxgroup);
+ hnew->fTsumw = 0; //stats must be reset because top bins will be moved to overflow bin
}
if(newybins*nygroup != nybins) {
- ymax = fYaxis.GetBinUpEdge(newybins*nygroup);
- hnew->fTsumw = 0; //stats must be reset because top bins will be moved to overflow bin
+ ymax = fYaxis.GetBinUpEdge(newybins*nygroup);
+ hnew->fTsumw = 0; //stats must be reset because top bins will be moved to overflow bin
}
//rebin the axis
if((fXaxis.GetXbins()->GetSize() > 0) || (fYaxis.GetXbins()->GetSize() > 0)){
- Double_t* xbins = new Double_t[newxbins+1];
- Double_t* ybins = new Double_t[newybins+1];
- for(Int_t i=0; i < newxbins+1; i++)
- xbins[i] = fXaxis.GetBinLowEdge(1+i*nxgroup);
- for(Int_t j=0; j < newybins+1; j++)
- ybins[j] = fYaxis.GetBinLowEdge(1+j*nygroup);
- hnew->SetBins(newxbins,xbins,newybins,ybins);
- delete [] xbins;
- delete [] ybins;
+ Double_t* xbins = new Double_t[newxbins+1];
+ Double_t* ybins = new Double_t[newybins+1];
+ for(Int_t i=0; i < newxbins+1; i++)
+ xbins[i] = fXaxis.GetBinLowEdge(1+i*nxgroup);
+ for(Int_t j=0; j < newybins+1; j++)
+ ybins[j] = fYaxis.GetBinLowEdge(1+j*nygroup);
+ hnew->SetBins(newxbins,xbins,newybins,ybins);
+ delete [] xbins;
+ delete [] ybins;
}
//fixed bin size
else{
- hnew->SetBins(newxbins,xmin,xmax,newybins,ymin,ymax);
+ hnew->SetBins(newxbins,xmin,xmax,newybins,ymin,ymax);
}
//merge bins
@@ -1549,31 +1549,31 @@ TProfile2D * TProfile2D::Rebin2D(Int_t nxgroup ,Int_t nygroup,const char * newna
//global bin number
Int_t bin;
for(Int_t xbin = 1; xbin <= newxbins; xbin++){
- oldybin = 1;
- for(Int_t ybin = 1; ybin <= newybins; ybin++){
- binContent = 0;
- binCount = 0;
- binError = 0;
- binSumw2 = 0;
- for(Int_t i=0; i < nxgroup; i++){
- if(oldxbin + i > nxbins) break;
- for(Int_t j=0; j < nygroup; j++){
- if(oldybin + j > nybins) break;
- bin = oldxbin + i + (nxbins+2)*(oldybin+j);
- binContent += oldBins[bin];
- binCount += oldCount[bin];
- binError += oldErrors[bin];
- if(fBinSumw2.fN) binSumw2 += oldBinw2[bin];
- }
- }
- bin = xbin + (newxbins + 2)*ybin;
- cu2[bin] = binContent;
- er2[bin] = binError;
- en2[bin] = binCount;
- if(fBinSumw2.fN) ew2[bin] = binSumw2;
- oldybin += nygroup;
- }
- oldxbin += nxgroup;
+ oldybin = 1;
+ for(Int_t ybin = 1; ybin <= newybins; ybin++){
+ binContent = 0;
+ binCount = 0;
+ binError = 0;
+ binSumw2 = 0;
+ for(Int_t i=0; i < nxgroup; i++){
+ if(oldxbin + i > nxbins) break;
+ for(Int_t j=0; j < nygroup; j++){
+ if(oldybin + j > nybins) break;
+ bin = oldxbin + i + (nxbins+2)*(oldybin+j);
+ binContent += oldBins[bin];
+ binCount += oldCount[bin];
+ binError += oldErrors[bin];
+ if(fBinSumw2.fN) binSumw2 += oldBinw2[bin];
+ }
+ }
+ bin = xbin + (newxbins + 2)*ybin;
+ cu2[bin] = binContent;
+ er2[bin] = binError;
+ en2[bin] = binCount;
+ if(fBinSumw2.fN) ew2[bin] = binSumw2;
+ oldybin += nygroup;
+ }
+ oldxbin += nxgroup;
}
//copy the underflow bin in x and y (0,0)
@@ -1588,14 +1588,14 @@ TProfile2D * TProfile2D::Rebin2D(Int_t nxgroup ,Int_t nygroup,const char * newna
binError = 0;
binSumw2 = 0;
for(Int_t i=oldxbin; i <= nxbins+1; i++){
- for(Int_t j=oldybin; j <= nybins+1; j++){
- //global bin number
- bin = i + (nxbins+2)*j;
- binContent += oldBins[bin];
- binCount += oldCount[bin];
- binError += oldErrors[bin];
- if(fBinSumw2.fN) binSumw2 += oldBinw2[bin];
- }
+ for(Int_t j=oldybin; j <= nybins+1; j++){
+ //global bin number
+ bin = i + (nxbins+2)*j;
+ binContent += oldBins[bin];
+ binCount += oldCount[bin];
+ binError += oldErrors[bin];
+ if(fBinSumw2.fN) binSumw2 += oldBinw2[bin];
+ }
}
bin = (newxbins+2)*(newybins+2)-1;
cu2[bin] = binContent;
@@ -1608,11 +1608,11 @@ TProfile2D * TProfile2D::Rebin2D(Int_t nxgroup ,Int_t nygroup,const char * newna
binError = 0;
binSumw2 = 0;
for(Int_t i=oldxbin; i <= nxbins+1; i++){
- bin = i;
- binContent += oldBins[bin];
- binCount += oldCount[bin];
- binError += oldErrors[bin];
- if(fBinSumw2.fN) binSumw2 += oldBinw2[bin];
+ bin = i;
+ binContent += oldBins[bin];
+ binCount += oldCount[bin];
+ binError += oldErrors[bin];
+ if(fBinSumw2.fN) binSumw2 += oldBinw2[bin];
}
bin = newxbins + 1;
cu2[bin] = binContent;
@@ -1625,11 +1625,11 @@ TProfile2D * TProfile2D::Rebin2D(Int_t nxgroup ,Int_t nygroup,const char * newna
binError = 0;
binSumw2 = 0;
for(Int_t i=oldybin; i <= nybins+1; i++){
- bin = i*(nxbins + 2);
- binContent += oldBins[bin];
- binCount += oldCount[bin];
- binError += oldErrors[bin];
- if(fBinSumw2.fN) binSumw2 += oldBinw2[bin];
+ bin = i*(nxbins + 2);
+ binContent += oldBins[bin];
+ binCount += oldCount[bin];
+ binError += oldErrors[bin];
+ if(fBinSumw2.fN) binSumw2 += oldBinw2[bin];
}
bin = (newxbins + 2)*(newybins + 1);
cu2[bin] = binContent;
@@ -1642,85 +1642,85 @@ TProfile2D * TProfile2D::Rebin2D(Int_t nxgroup ,Int_t nygroup,const char * newna
Int_t ufbin, ofbin;
Int_t oldxbin2 = 1;
for(Int_t xbin = 1; xbin <= newxbins; xbin++){
- binContentuf = 0;
- binCountuf = 0;
- binErroruf = 0;
- binSumw2uf = 0;
- binContentof = 0;
- binCountof = 0;
- binErrorof = 0;
- binSumw2of = 0;
- for(Int_t i = 0; i < nxgroup; i++){
- //index of under/overflow bin for y in old binning
- ufbin = (oldxbin2 + i);
- binContentuf += oldBins[ufbin];
- binCountuf += oldCount[ufbin];
- binErroruf += oldErrors[ufbin];
- if(fBinSumw2.fN) binSumw2uf += oldBinw2[ufbin];
- for(Int_t j = oldybin; j <= nybins+1; j++)
- {
- ofbin = ufbin + j*(nxbins + 2);
- binContentof += oldBins[ofbin];
- binCountof += oldCount[ofbin];
- binErrorof += oldErrors[ofbin];
- if(fBinSumw2.fN) binSumw2of += oldBinw2[ofbin];
- }
- }
- //index of under/overflow bin for y in new binning
- ufbin = xbin;
- ofbin = ufbin + (newybins + 1)*(newxbins + 2);
- cu2[ufbin] = binContentuf;
- er2[ufbin] = binErroruf;
- en2[ufbin] = binCountuf;
- if(fBinSumw2.fN) ew2[ufbin] = binSumw2uf;
- cu2[ofbin] = binContentof;
- er2[ofbin] = binErrorof;
- en2[ofbin] = binCountof;
- if(fBinSumw2.fN) ew2[ofbin] = binSumw2of;
-
- oldxbin2 += nxgroup;
+ binContentuf = 0;
+ binCountuf = 0;
+ binErroruf = 0;
+ binSumw2uf = 0;
+ binContentof = 0;
+ binCountof = 0;
+ binErrorof = 0;
+ binSumw2of = 0;
+ for(Int_t i = 0; i < nxgroup; i++){
+ //index of under/overflow bin for y in old binning
+ ufbin = (oldxbin2 + i);
+ binContentuf += oldBins[ufbin];
+ binCountuf += oldCount[ufbin];
+ binErroruf += oldErrors[ufbin];
+ if(fBinSumw2.fN) binSumw2uf += oldBinw2[ufbin];
+ for(Int_t j = oldybin; j <= nybins+1; j++)
+ {
+ ofbin = ufbin + j*(nxbins + 2);
+ binContentof += oldBins[ofbin];
+ binCountof += oldCount[ofbin];
+ binErrorof += oldErrors[ofbin];
+ if(fBinSumw2.fN) binSumw2of += oldBinw2[ofbin];
+ }
+ }
+ //index of under/overflow bin for y in new binning
+ ufbin = xbin;
+ ofbin = ufbin + (newybins + 1)*(newxbins + 2);
+ cu2[ufbin] = binContentuf;
+ er2[ufbin] = binErroruf;
+ en2[ufbin] = binCountuf;
+ if(fBinSumw2.fN) ew2[ufbin] = binSumw2uf;
+ cu2[ofbin] = binContentof;
+ er2[ofbin] = binErrorof;
+ en2[ofbin] = binCountof;
+ if(fBinSumw2.fN) ew2[ofbin] = binSumw2of;
+
+ oldxbin2 += nxgroup;
}
//calculate under/overflow contents in x for the new y bins
Int_t oldybin2 = 1;
for(Int_t ybin = 1; ybin <= newybins; ybin++){
- binContentuf = 0;
- binCountuf = 0;
- binErroruf = 0;
- binSumw2uf = 0;
- binContentof = 0;
- binCountof = 0;
- binErrorof = 0;
- binSumw2of = 0;
- for(Int_t i = 0; i < nygroup; i++){
- //index of under/overflow bin for x in old binning
- ufbin = (oldybin2 + i)*(nxbins+2);
- binContentuf += oldBins[ufbin];
- binCountuf += oldCount[ufbin];
- binErroruf += oldErrors[ufbin];
- if(fBinSumw2.fN) binSumw2uf += oldBinw2[ufbin];
- for(Int_t j = oldxbin; j <= nxbins+1; j++)
- {
- ofbin = j + ufbin;
- binContentof += oldBins[ofbin];
- binCountof += oldCount[ofbin];
- binErrorof += oldErrors[ofbin];
- if(fBinSumw2.fN) binSumw2of += oldBinw2[ofbin];
- }
- }
- //index of under/overflow bin for x in new binning
- ufbin = ybin * (newxbins + 2);
- ofbin = newxbins + 1 + ufbin;
- cu2[ufbin] = binContentuf;
- er2[ufbin] = binErroruf;
- en2[ufbin] = binCountuf;
- if(fBinSumw2.fN) ew2[ufbin] = binSumw2uf;
- cu2[ofbin] = binContentof;
- er2[ofbin] = binErrorof;
- en2[ofbin] = binCountof;
- if(fBinSumw2.fN) ew2[ofbin] = binSumw2of;
-
- oldybin2 += nygroup;
- }
+ binContentuf = 0;
+ binCountuf = 0;
+ binErroruf = 0;
+ binSumw2uf = 0;
+ binContentof = 0;
+ binCountof = 0;
+ binErrorof = 0;
+ binSumw2of = 0;
+ for(Int_t i = 0; i < nygroup; i++){
+ //index of under/overflow bin for x in old binning
+ ufbin = (oldybin2 + i)*(nxbins+2);
+ binContentuf += oldBins[ufbin];
+ binCountuf += oldCount[ufbin];
+ binErroruf += oldErrors[ufbin];
+ if(fBinSumw2.fN) binSumw2uf += oldBinw2[ufbin];
+ for(Int_t j = oldxbin; j <= nxbins+1; j++)
+ {
+ ofbin = j + ufbin;
+ binContentof += oldBins[ofbin];
+ binCountof += oldCount[ofbin];
+ binErrorof += oldErrors[ofbin];
+ if(fBinSumw2.fN) binSumw2of += oldBinw2[ofbin];
+ }
+ }
+ //index of under/overflow bin for x in new binning
+ ufbin = ybin * (newxbins + 2);
+ ofbin = newxbins + 1 + ufbin;
+ cu2[ufbin] = binContentuf;
+ er2[ufbin] = binErroruf;
+ en2[ufbin] = binCountuf;
+ if(fBinSumw2.fN) ew2[ufbin] = binSumw2uf;
+ cu2[ofbin] = binContentof;
+ er2[ofbin] = binErrorof;
+ en2[ofbin] = binCountof;
+ if(fBinSumw2.fN) ew2[ofbin] = binSumw2of;
+
+ oldybin2 += nygroup;
+ }
delete [] oldBins;
delete [] oldCount;
@@ -1732,24 +1732,24 @@ TProfile2D * TProfile2D::Rebin2D(Int_t nxgroup ,Int_t nygroup,const char * newna
//nxgroup == nygroup == 1
else{
if((newname) && (strlen(newname) > 0))
- return (TProfile2D*)Clone(newname);
+ return (TProfile2D*)Clone(newname);
else
- return this;
- }
+ return this;
+ }
}
//______________________________________________________________________________
TProfile2D * TProfile2D::RebinX(Int_t ngroup,const char * newname ) {
-// Rebin only the X axis
-// see Rebin2D
+ // Rebin only the X axis
+ // see Rebin2D
return Rebin2D(ngroup,1,newname);
}
//______________________________________________________________________________
TProfile2D * TProfile2D::RebinY(Int_t ngroup,const char * newname ) {
-// Rebin only the Y axis
-// see Rebin2D
+ // Rebin only the Y axis
+ // see Rebin2D
return Rebin2D(1,ngroup,newname);
}
@@ -1769,13 +1769,13 @@ void TProfile2D::SavePrimitive(std::ostream &out, Option_t *option /*= ""*/)
out <<" "<<ClassName()<<" *";
out << GetName() << " = new " << ClassName() << "(" << quote
- << GetName() << quote << "," << quote<< GetTitle() << quote
- << "," << GetXaxis()->GetNbins();
+ << GetName() << quote << "," << quote<< GetTitle() << quote
+ << "," << GetXaxis()->GetNbins();
out << "," << GetXaxis()->GetXmin()
- << "," << GetXaxis()->GetXmax();
+ << "," << GetXaxis()->GetXmax();
out << "," << GetYaxis()->GetNbins();
out << "," << GetYaxis()->GetXmin()
- << "," << GetYaxis()->GetXmax();
+ << "," << GetYaxis()->GetXmax();
out << "," << fZmin
<< "," << fZmax;
out << ");" << std::endl;
@@ -1812,13 +1812,13 @@ void TProfile2D::SavePrimitive(std::ostream &out, Option_t *option /*= ""*/)
//______________________________________________________________________________
void TProfile2D::Scale(Double_t c1, Option_t * option)
{
-// *-*-*-*-*Multiply this profile2D by a constant c1*-*-*-*-*-*-*-*-*
-// *-* ========================================
-//
-// this = c1*this
-//
-// This function uses the services of TProfile2D::Add
-//
+ // *-*-*-*-*Multiply this profile2D by a constant c1*-*-*-*-*-*-*-*-*
+ // *-* ========================================
+ //
+ // this = c1*this
+ //
+ // This function uses the services of TProfile2D::Add
+ //
TProfileHelper::Scale(this, c1, option);
}
@@ -1826,8 +1826,8 @@ void TProfile2D::Scale(Double_t c1, Option_t * option)
//______________________________________________________________________________
void TProfile2D::SetBinEntries(Int_t bin, Double_t w)
{
-//*-*-*-*-*-*-*-*-*Set the number of entries in bin*-*-*-*-*-*-*-*-*-*-*-*
-//*-* ================================
+ //*-*-*-*-*-*-*-*-*Set the number of entries in bin*-*-*-*-*-*-*-*-*-*-*-*
+ //*-* ================================
TProfileHelper::SetBinEntries(this, bin, w);
}
@@ -1835,8 +1835,8 @@ void TProfile2D::SetBinEntries(Int_t bin, Double_t w)
//______________________________________________________________________________
void TProfile2D::SetBins(Int_t nx, Double_t xmin, Double_t xmax, Int_t ny, Double_t ymin, Double_t ymax)
{
-//*-*-*-*-*-*-*-*-*Redefine x and y axis parameters*-*-*-*-*-*-*-*-*-*-*-*
-//*-* ===========================
+ //*-*-*-*-*-*-*-*-*Redefine x and y axis parameters*-*-*-*-*-*-*-*-*-*-*-*
+ //*-* ===========================
TH1::SetBins(nx,xmin, xmax,ny, ymin,ymax);
fBinEntries.Set(fNcells);
@@ -1846,8 +1846,8 @@ void TProfile2D::SetBins(Int_t nx, Double_t xmin, Double_t xmax, Int_t ny, Doubl
//______________________________________________________________________________
void TProfile2D::SetBins(Int_t nx, const Double_t *xbins, Int_t ny, const Double_t *ybins)
{
-//*-*-*-*-*-*-*-*-*Redefine x and y axis parameters for variable bin sizes -*-*-*-*-*-*-*
-//*-* ===========================
+ //*-*-*-*-*-*-*-*-*Redefine x and y axis parameters for variable bin sizes -*-*-*-*-*-*-*
+ //*-* ===========================
TH1::SetBins(nx,xbins,ny,ybins);
fBinEntries.Set(fNcells);
if (fBinSumw2.fN) fBinSumw2.Set(fNcells);
@@ -1859,13 +1859,13 @@ void TProfile2D::SetBinsLength(Int_t n)
// Set total number of bins including under/overflow
// Reallocate bin contents array
TH2D::SetBinsLength(n);
- TProfileHelper::BuildArray(this);
+ TProfileHelper::BuildArray(this);
}
//______________________________________________________________________________
void TProfile2D::SetBuffer(Int_t buffersize, Option_t *)
{
-// set the buffer size in units of 8 bytes (double)
+ // set the buffer size in units of 8 bytes (double)
if (fBuffer) {
BufferEmpty();
@@ -1885,30 +1885,30 @@ void TProfile2D::SetBuffer(Int_t buffersize, Option_t *)
//______________________________________________________________________________
void TProfile2D::SetErrorOption(Option_t *option)
{
-//*-*-*-*-*-*-*-*-*-*Set option to compute profile2D errors*-*-*-*-*-*-*-*
-//*-* =======================================
-// The computation of the bin errors is based on the parameter option:
-// option:
-// ' ' (Default) The bin errors are the standard error on the mean of the bin profiled values (Z),
-// i.e. the standard error of the bin contents.
-// Note that if TProfile::Approximate() is called, an approximation is used when
-// the spread in Z is 0 and the number of bin entries is > 0
-//
-// 's' The bin errors are the standard deviations of the Z bin values
-// Note that if TProfile::Approximate() is called, an approximation is used when
-// the spread in Z is 0 and the number of bin entries is > 0
-//
-// 'i' Errors are as in default case (standard errors of the bin contents)
-// The only difference is for the case when the spread in Z is zero.
-// In this case for N > 0 the error is 1./SQRT(12.*N)
-//
-// 'g' Errors are 1./SQRT(W) for W not equal to 0 and 0 for W = 0.
-// W is the sum in the bin of the weights of the profile.
-// This option is for combining measurements z +/- dz,
-// and the profile is filled with values y and weights z = 1/dz**2
-//
-// See TProfile::BuildOptions for a detailed explanation of all options
-
+ //*-*-*-*-*-*-*-*-*-*Set option to compute profile2D errors*-*-*-*-*-*-*-*
+ //*-* =======================================
+ // The computation of the bin errors is based on the parameter option:
+ // option:
+ // ' ' (Default) The bin errors are the standard error on the mean of the bin profiled values (Z),
+ // i.e. the standard error of the bin contents.
+ // Note that if TProfile::Approximate() is called, an approximation is used when
+ // the spread in Z is 0 and the number of bin entries is > 0
+ //
+ // 's' The bin errors are the standard deviations of the Z bin values
+ // Note that if TProfile::Approximate() is called, an approximation is used when
+ // the spread in Z is 0 and the number of bin entries is > 0
+ //
+ // 'i' Errors are as in default case (standard errors of the bin contents)
+ // The only difference is for the case when the spread in Z is zero.
+ // In this case for N > 0 the error is 1./SQRT(12.*N)
+ //
+ // 'g' Errors are 1./SQRT(W) for W not equal to 0 and 0 for W = 0.
+ // W is the sum in the bin of the weights of the profile.
+ // This option is for combining measurements z +/- dz,
+ // and the profile is filled with values y and weights z = 1/dz**2
+ //
+ // See TProfile::BuildOptions for a detailed explanation of all options
+
TProfileHelper::SetErrorOption(this, option);
}
@@ -1916,7 +1916,7 @@ void TProfile2D::SetErrorOption(Option_t *option)
void TProfile2D::Streamer(TBuffer &R__b)
{
// Stream an object of class TProfile2D.
-
+
if (R__b.IsReading()) {
UInt_t R__s, R__c;
Version_t R__v = R__b.ReadVersion(&R__s, &R__c);
@@ -1940,7 +1940,7 @@ void TProfile2D::Streamer(TBuffer &R__b)
}
R__b.CheckByteCount(R__s, R__c, TProfile2D::IsA());
//====end of old versions
-
+
} else {
R__b.WriteClassBuffer(TProfile2D::Class(),this);
}
@@ -1957,6 +1957,6 @@ void TProfile2D::Sumw2(Bool_t flag)
// This function is automatically called when the histogram is created
// if the static function TH1::SetDefaultSumw2 has been called before.
// If flag is false the structure is deleted
-
+
TProfileHelper::Sumw2(this, flag);
}
diff --git a/hist/hist/src/TSVDUnfold.cxx b/hist/hist/src/TSVDUnfold.cxx
index 93838197f30..c772c234998 100644
--- a/hist/hist/src/TSVDUnfold.cxx
+++ b/hist/hist/src/TSVDUnfold.cxx
@@ -25,37 +25,37 @@
//_______________________________________________________________________
/* Begin_Html
-<center><h2>SVD Approach to Data Unfolding</h2></center>
-<p>
-Reference: <a href="http://arXiv.org/abs/hep-ph/9509307">Nucl. Instrum. Meth. A372, 469 (1996) [hep-ph/9509307]</a>
-<p>
-TSVDUnfold implements the singular value decomposition based unfolding method (see reference). Currently, the unfolding of one-dimensional histograms is supported, with the same number of bins for the measured and the unfolded spectrum.
-<p>
-The unfolding procedure is based on singular value decomposition of the response matrix. The regularisation of the unfolding is implemented via a discrete minimum-curvature condition.
-<p>
-Monte Carlo inputs:
-<ul>
-<li><tt>xini</tt>: true underlying spectrum (TH1D, n bins)
-<li><tt>bini</tt>: reconstructed spectrum (TH1D, n bins)
-<li><tt>Adet</tt>: response matrix (TH2D, nxn bins)
-</ul>
-Consider the unfolding of a measured spectrum <tt>bdat</tt> with covariance matrix <tt>Bcov</tt> (if not passed explicitly, a diagonal covariance will be built given the errors of <tt>bdat</tt>). The corresponding spectrum in the Monte Carlo is given by <tt>bini</tt>, with the true underlying spectrum given by <tt>xini</tt>. The detector response is described by <tt>Adet</tt>, with <tt>Adet</tt> filled with events (not probabilities) with the true observable on the y-axis and the reconstructed observable on the x-axis.
-<p>
-The measured distribution can be unfolded for any combination of resolution, efficiency and acceptance effects, provided an appropriate definition of <tt>xini</tt> and <tt>Adet</tt>.<br><br>
-<p>
-The unfolding can be performed by
-<ul>
-<pre>
-TSVDUnfold *tsvdunf = new TSVDUnfold( bdat, Bcov, bini, xini, Adet );
-TH1D* unfresult = tsvdunf->Unfold( kreg );
-</pre>
-</ul>
-where <tt>kreg</tt> determines the regularisation of the unfolding. In general, overregularisation (too small <tt>kreg</tt>) will bias the unfolded spectrum towards the Monte Carlo input, while underregularisation (too large <tt>kreg</tt>) will lead to large fluctuations in the unfolded spectrum. The optimal regularisation can be determined following guidelines in <a href="http://arXiv.org/abs/hep-ph/9509307">Nucl. Instrum. Meth. A372, 469 (1996) [hep-ph/9509307]</a> using the distribution of the <tt>|d_i|<\tt> that can be obtained by <tt>tsvdunf->GetD()</tt> and/or using pseudo-experiments.
-<p>
-Covariance matrices on the measured spectrum (for either the total uncertainties or individual sources of uncertainties) can be propagated to covariance matrices using the <tt>GetUnfoldCovMatrix</tt> method, which uses pseudo experiments for the propagation. In addition, <tt>GetAdetCovMatrix</tt> allows for the propagation of the statistical uncertainties on the response matrix using pseudo experiments. The covariance matrix corresponding to <tt>Bcov</tt> is also computed as described in <a href="http://arXiv.org/abs/hep-ph/9509307">Nucl. Instrum. Meth. A372, 469 (1996) [hep-ph/9509307]</a> and can be obtained from <tt>tsvdunf->GetXtau()</tt> and its (regularisation independent) inverse from <tt>tsvdunf->GetXinv()</tt>. The distribution of singular values can be retrieved using <tt>tsvdunf->GetSV()</tt>.
-<p>
-See also the tutorial for a toy example.
-End_Html */
+ <center><h2>SVD Approach to Data Unfolding</h2></center>
+ <p>
+ Reference: <a href="http://arXiv.org/abs/hep-ph/9509307">Nucl. Instrum. Meth. A372, 469 (1996) [hep-ph/9509307]</a>
+ <p>
+ TSVDUnfold implements the singular value decomposition based unfolding method (see reference). Currently, the unfolding of one-dimensional histograms is supported, with the same number of bins for the measured and the unfolded spectrum.
+ <p>
+ The unfolding procedure is based on singular value decomposition of the response matrix. The regularisation of the unfolding is implemented via a discrete minimum-curvature condition.
+ <p>
+ Monte Carlo inputs:
+ <ul>
+ <li><tt>xini</tt>: true underlying spectrum (TH1D, n bins)
+ <li><tt>bini</tt>: reconstructed spectrum (TH1D, n bins)
+ <li><tt>Adet</tt>: response matrix (TH2D, nxn bins)
+ </ul>
+ Consider the unfolding of a measured spectrum <tt>bdat</tt> with covariance matrix <tt>Bcov</tt> (if not passed explicitly, a diagonal covariance will be built given the errors of <tt>bdat</tt>). The corresponding spectrum in the Monte Carlo is given by <tt>bini</tt>, with the true underlying spectrum given by <tt>xini</tt>. The detector response is described by <tt>Adet</tt>, with <tt>Adet</tt> filled with events (not probabilities) with the true observable on the y-axis and the reconstructed observable on the x-axis.
+ <p>
+ The measured distribution can be unfolded for any combination of resolution, efficiency and acceptance effects, provided an appropriate definition of <tt>xini</tt> and <tt>Adet</tt>.<br><br>
+ <p>
+ The unfolding can be performed by
+ <ul>
+ <pre>
+ TSVDUnfold *tsvdunf = new TSVDUnfold( bdat, Bcov, bini, xini, Adet );
+ TH1D* unfresult = tsvdunf->Unfold( kreg );
+ </pre>
+ </ul>
+ where <tt>kreg</tt> determines the regularisation of the unfolding. In general, overregularisation (too small <tt>kreg</tt>) will bias the unfolded spectrum towards the Monte Carlo input, while underregularisation (too large <tt>kreg</tt>) will lead to large fluctuations in the unfolded spectrum. The optimal regularisation can be determined following guidelines in <a href="http://arXiv.org/abs/hep-ph/9509307">Nucl. Instrum. Meth. A372, 469 (1996) [hep-ph/9509307]</a> using the distribution of the <tt>|d_i|<\tt> that can be obtained by <tt>tsvdunf->GetD()</tt> and/or using pseudo-experiments.
+ <p>
+ Covariance matrices on the measured spectrum (for either the total uncertainties or individual sources of uncertainties) can be propagated to covariance matrices using the <tt>GetUnfoldCovMatrix</tt> method, which uses pseudo experiments for the propagation. In addition, <tt>GetAdetCovMatrix</tt> allows for the propagation of the statistical uncertainties on the response matrix using pseudo experiments. The covariance matrix corresponding to <tt>Bcov</tt> is also computed as described in <a href="http://arXiv.org/abs/hep-ph/9509307">Nucl. Instrum. Meth. A372, 469 (1996) [hep-ph/9509307]</a> and can be obtained from <tt>tsvdunf->GetXtau()</tt> and its (regularisation independent) inverse from <tt>tsvdunf->GetXinv()</tt>. The distribution of singular values can be retrieved using <tt>tsvdunf->GetSV()</tt>.
+ <p>
+ See also the tutorial for a toy example.
+ End_Html */
//_______________________________________________________________________
@@ -74,27 +74,27 @@ using namespace std;
//_______________________________________________________________________
TSVDUnfold::TSVDUnfold( const TH1D *bdat, const TH1D *bini, const TH1D *xini, const TH2D *Adet )
- : TObject (),
- fNdim (0),
- fDdim (2),
- fNormalize (kFALSE),
- fKReg (-1),
- fDHist (NULL),
- fSVHist (NULL),
- fXtau (NULL),
- fXinv (NULL),
- fBdat (bdat),
- fBini (bini),
- fXini (xini),
- fAdet (Adet),
- fToyhisto (NULL),
- fToymat (NULL),
- fToyMode (kFALSE),
- fMatToyMode (kFALSE)
+: TObject (),
+fNdim (0),
+fDdim (2),
+fNormalize (kFALSE),
+fKReg (-1),
+fDHist (NULL),
+fSVHist (NULL),
+fXtau (NULL),
+fXinv (NULL),
+fBdat (bdat),
+fBini (bini),
+fXini (xini),
+fAdet (Adet),
+fToyhisto (NULL),
+fToymat (NULL),
+fToyMode (kFALSE),
+fMatToyMode (kFALSE)
{
- // Alternative constructor
- // User provides data and MC test spectra, as well as detector response matrix, diagonal covariance matrix of measured spectrum built from the uncertainties on measured spectrum
- if (bdat->GetNbinsX() != bini->GetNbinsX() ||
+ // Alternative constructor
+ // User provides data and MC test spectra, as well as detector response matrix, diagonal covariance matrix of measured spectrum built from the uncertainties on measured spectrum
+ if (bdat->GetNbinsX() != bini->GetNbinsX() ||
bdat->GetNbinsX() != xini->GetNbinsX() ||
bdat->GetNbinsX() != Adet->GetNbinsX() ||
bdat->GetNbinsX() != Adet->GetNbinsY()) {
@@ -109,13 +109,13 @@ TSVDUnfold::TSVDUnfold( const TH1D *bdat, const TH1D *bini, const TH1D *xini, co
}
fBcov = (TH2D*)fAdet->Clone("bcov");
-
+
for(int i=1; i<=fBdat->GetNbinsX(); i++){
- fBcov->SetBinContent(i, i, fBdat->GetBinError(i)*fBdat->GetBinError(i));
- for(int j=1; j<=fBdat->GetNbinsX(); j++){
- if(i==j) continue;
- fBcov->SetBinContent(i,j,0.);
- }
+ fBcov->SetBinContent(i, i, fBdat->GetBinError(i)*fBdat->GetBinError(i));
+ for(int j=1; j<=fBdat->GetNbinsX(); j++){
+ if(i==j) continue;
+ fBcov->SetBinContent(i,j,0.);
+ }
}
// Get the input histos
fNdim = bdat->GetNbinsX();
@@ -125,29 +125,29 @@ TSVDUnfold::TSVDUnfold( const TH1D *bdat, const TH1D *bini, const TH1D *xini, co
//_______________________________________________________________________
TSVDUnfold::TSVDUnfold( const TH1D *bdat, TH2D* Bcov, const TH1D *bini, const TH1D *xini, const TH2D *Adet )
- : TObject (),
- fNdim (0),
- fDdim (2),
- fNormalize (kFALSE),
- fKReg (-1),
- fDHist (NULL),
- fSVHist (NULL),
- fXtau (NULL),
- fXinv (NULL),
- fBdat (bdat),
- fBcov (Bcov),
- fBini (bini),
- fXini (xini),
- fAdet (Adet),
- fToyhisto (NULL),
- fToymat (NULL),
- fToyMode (kFALSE),
- fMatToyMode (kFALSE)
+: TObject (),
+fNdim (0),
+fDdim (2),
+fNormalize (kFALSE),
+fKReg (-1),
+fDHist (NULL),
+fSVHist (NULL),
+fXtau (NULL),
+fXinv (NULL),
+fBdat (bdat),
+fBcov (Bcov),
+fBini (bini),
+fXini (xini),
+fAdet (Adet),
+fToyhisto (NULL),
+fToymat (NULL),
+fToyMode (kFALSE),
+fMatToyMode (kFALSE)
{
// Default constructor
// Initialisation of TSVDUnfold
// User provides data and MC test spectra, as well as detector response matrix and the covariance matrix of the measured distribution
- if (bdat->GetNbinsX() != bini->GetNbinsX() ||
+ if (bdat->GetNbinsX() != bini->GetNbinsX() ||
bdat->GetNbinsX() != xini->GetNbinsX() ||
bdat->GetNbinsX() != Bcov->GetNbinsX() ||
bdat->GetNbinsX() != Bcov->GetNbinsY() ||
@@ -171,24 +171,24 @@ TSVDUnfold::TSVDUnfold( const TH1D *bdat, TH2D* Bcov, const TH1D *bini, const TH
//_______________________________________________________________________
TSVDUnfold::TSVDUnfold( const TSVDUnfold& other )
- : TObject ( other ),
- fNdim (other.fNdim),
- fDdim (other.fDdim),
- fNormalize (other.fNormalize),
- fKReg (other.fKReg),
- fDHist (other.fDHist),
- fSVHist (other.fSVHist),
- fXtau (other.fXtau),
- fXinv (other.fXinv),
- fBdat (other.fBdat),
- fBcov (other.fBcov),
- fBini (other.fBini),
- fXini (other.fXini),
- fAdet (other.fAdet),
- fToyhisto (other.fToyhisto),
- fToymat (other.fToymat),
- fToyMode (other.fToyMode),
- fMatToyMode (other.fMatToyMode)
+: TObject ( other ),
+fNdim (other.fNdim),
+fDdim (other.fDdim),
+fNormalize (other.fNormalize),
+fKReg (other.fKReg),
+fDHist (other.fDHist),
+fSVHist (other.fSVHist),
+fXtau (other.fXtau),
+fXinv (other.fXinv),
+fBdat (other.fBdat),
+fBcov (other.fBcov),
+fBini (other.fBini),
+fXini (other.fXini),
+fAdet (other.fAdet),
+fToyhisto (other.fToyhisto),
+fToymat (other.fToymat),
+fToyMode (other.fToyMode),
+fMatToyMode (other.fMatToyMode)
{
// Copy constructor
}
@@ -201,7 +201,7 @@ TSVDUnfold::~TSVDUnfold()
delete fToyhisto;
fToyhisto = 0;
}
-
+
if(fToymat){
delete fToymat;
fToymat = 0;
@@ -238,7 +238,7 @@ TH1D* TSVDUnfold::Unfold( Int_t kreg )
{
// Perform the unfolding with regularisation parameter kreg
fKReg = kreg;
-
+
// Make the histos
if (!fToyMode && !fMatToyMode) InitHistos( );
@@ -282,23 +282,23 @@ TH1D* TSVDUnfold::Unfold( Int_t kreg )
TVectorD BSV(B2SV);
for(int i=0; i<fNdim; i++){
- BSV(i) = TMath::Sqrt(B2SV(i));
+ BSV(i) = TMath::Sqrt(B2SV(i));
}
TMatrixD mAtmp(fNdim,fNdim);
TVectorD vbtmp(fNdim);
mAtmp *= 0;
vbtmp *= 0;
for(int i=0; i<fNdim; i++){
- for(int j=0; j<fNdim; j++){
- if(BSV(i)){
- vbtmp(i) += QT(i,j)*vb(j)/BSV(i);
- }
- for(int m=0; m<fNdim; m++){
- if(BSV(i)){
- mAtmp(i,j) += QT(i,m)*mA(m,j)/BSV(i);
- }
- }
- }
+ for(int j=0; j<fNdim; j++){
+ if(BSV(i)){
+ vbtmp(i) += QT(i,j)*vb(j)/BSV(i);
+ }
+ for(int m=0; m<fNdim; m++){
+ if(BSV(i)){
+ mAtmp(i,j) += QT(i,m)*mA(m,j)/BSV(i);
+ }
+ }
+ }
}
mA = mAtmp;
vb = vbtmp;
@@ -323,7 +323,7 @@ TH1D* TSVDUnfold::Unfold( Int_t kreg )
}
// Damping coefficient
- Int_t k = GetKReg()-1;
+ Int_t k = GetKReg()-1;
TVectorD vx(fNdim); // Return variable
@@ -331,13 +331,13 @@ TH1D* TSVDUnfold::Unfold( Int_t kreg )
TVectorD vdz(fNdim);
TMatrixD Z(fNdim, fNdim);
for (Int_t i=0; i<fNdim; i++) {
- if (ASV(i)<ASV(0)*eps) sreg = ASV(0)*eps;
- else sreg = ASV(i);
- vdz(i) = sreg/(sreg*sreg + ASV(k)*ASV(k));
- Z(i,i) = vdz(i)*vdz(i);
+ if (ASV(i)<ASV(0)*eps) sreg = ASV(0)*eps;
+ else sreg = ASV(i);
+ vdz(i) = sreg/(sreg*sreg + ASV(k)*ASV(k));
+ Z(i,i) = vdz(i)*vdz(i);
}
TVectorD vz = CompProd( vd, vdz );
-
+
TMatrixD VortT(Vort);
VortT.Transpose(VortT);
TMatrixD W = mCinv*Vort*Z*VortT*mCinv;
@@ -347,16 +347,16 @@ TH1D* TSVDUnfold::Unfold( Int_t kreg )
Xtau *= 0;
Xinv *= 0;
for (Int_t i=0; i<fNdim; i++) {
- for (Int_t j=0; j<fNdim; j++) {
- Xtau(i,j) = vxini(i) * vxini(j) * W(i,j);
+ for (Int_t j=0; j<fNdim; j++) {
+ Xtau(i,j) = vxini(i) * vxini(j) * W(i,j);
- double a=0;
- for (Int_t m=0; m<fNdim; m++) {
- a += mA(m,i)*mA(m,j);
- }
- if(vxini(i)*vxini(j))
- Xinv(i,j) = a/vxini(i)/vxini(j);
- }
+ double a=0;
+ for (Int_t m=0; m<fNdim; m++) {
+ a += mA(m,i)*mA(m,j);
+ }
+ if(vxini(i)*vxini(j))
+ Xinv(i,j) = a/vxini(i)/vxini(j);
+ }
}
// Compute the weights
@@ -364,25 +364,25 @@ TH1D* TSVDUnfold::Unfold( Int_t kreg )
// Rescale by xini
vx = CompProd( vw, vxini );
-
+
if(fNormalize){ // Scale result to unit area
- Double_t scale = vx.Sum();
- if (scale > 0){
- vx *= 1.0/scale;
- Xtau *= 1./scale/scale;
- Xinv *= scale*scale;
- }
+ Double_t scale = vx.Sum();
+ if (scale > 0){
+ vx *= 1.0/scale;
+ Xtau *= 1./scale/scale;
+ Xinv *= scale*scale;
+ }
}
if (!fToyMode && !fMatToyMode) {
M2H(Xtau, *fXtau);
M2H(Xinv, *fXinv);
}
-
+
// Get Curvature and also chi2 in case of MC unfolding
if (!fToyMode && !fMatToyMode) {
- Info( "Unfold", "Unfolding param: %i",k+1 );
- Info( "Unfold", "Curvature of weight distribution: %f", GetCurvature( vw, mCurv ) );
+ Info( "Unfold", "Unfolding param: %i",k+1 );
+ Info( "Unfold", "Curvature of weight distribution: %f", GetCurvature( vw, mCurv ) );
}
TH1D* h = (TH1D*)fBdat->Clone("unfoldingresult");
@@ -398,12 +398,12 @@ TH1D* TSVDUnfold::Unfold( Int_t kreg )
//_______________________________________________________________________
TH2D* TSVDUnfold::GetUnfoldCovMatrix( const TH2D* cov, Int_t ntoys, Int_t seed )
{
- // Determine for given input error matrix covariance matrix of unfolded
+ // Determine for given input error matrix covariance matrix of unfolded
// spectrum from toy simulation given the passed covariance matrix on measured spectrum
// "cov" - covariance matrix on the measured spectrum, to be propagated
// "ntoys" - number of pseudo experiments used for the propagation
// "seed" - seed for pseudo experiments
- // Note that this covariance matrix will contain effects of forced normalisation if spectrum is normalised to unit area.
+ // Note that this covariance matrix will contain effects of forced normalisation if spectrum is normalised to unit area.
fToyMode = true;
TH1D* unfres = 0;
@@ -412,10 +412,10 @@ TH2D* TSVDUnfold::GetUnfoldCovMatrix( const TH2D* cov, Int_t ntoys, Int_t seed )
for(int i=1; i<=fNdim; i++)
for(int j=1; j<=fNdim; j++)
unfcov->SetBinContent(i,j,0.);
-
+
// Code for generation of toys (taken from RooResult and modified)
// Calculate the elements of the upper-triangular matrix L that
- // gives Lt*L = C, where Lt is the transpose of L (the "square-root method")
+ // gives Lt*L = C, where Lt is the transpose of L (the "square-root method")
TMatrixD L(fNdim,fNdim); L *= 0;
for (Int_t iPar= 0; iPar < fNdim; iPar++) {
@@ -499,14 +499,14 @@ TH2D* TSVDUnfold::GetUnfoldCovMatrix( const TH2D* cov, Int_t ntoys, Int_t seed )
delete Lt;
delete toymean;
fToyMode = kFALSE;
-
+
return unfcov;
}
//_______________________________________________________________________
TH2D* TSVDUnfold::GetAdetCovMatrix( Int_t ntoys, Int_t seed )
{
- // Determine covariance matrix of unfolded spectrum from finite statistics in
+ // Determine covariance matrix of unfolded spectrum from finite statistics in
// response matrix using pseudo experiments
// "ntoys" - number of pseudo experiments used for the propagation
// "seed" - seed for pseudo experiments
@@ -526,7 +526,7 @@ TH2D* TSVDUnfold::GetAdetCovMatrix( Int_t ntoys, Int_t seed )
TH1D *toymean = (TH1D*)fXini->Clone("toymean");
for (Int_t j=1; j<=fNdim; j++) toymean->SetBinContent(j,0.);
- for (int i=1; i<=ntoys; i++) {
+ for (int i=1; i<=ntoys; i++) {
for (Int_t k=1; k<=fNdim; k++) {
for (Int_t m=1; m<=fNdim; m++) {
if (fAdet->GetBinContent(k,m)) {
@@ -567,47 +567,47 @@ TH2D* TSVDUnfold::GetAdetCovMatrix( Int_t ntoys, Int_t seed )
}
delete toymean;
fMatToyMode = kFALSE;
-
+
return unfcov;
}
//_______________________________________________________________________
-TH1D* TSVDUnfold::GetD() const
-{
+TH1D* TSVDUnfold::GetD() const
+{
// Returns d vector (for choosing appropriate regularisation)
for (int i=1; i<=fDHist->GetNbinsX(); i++) {
- if (fDHist->GetBinContent(i)<0.) fDHist->SetBinContent(i, TMath::Abs(fDHist->GetBinContent(i)));
+ if (fDHist->GetBinContent(i)<0.) fDHist->SetBinContent(i, TMath::Abs(fDHist->GetBinContent(i)));
}
- return fDHist;
+ return fDHist;
}
//_______________________________________________________________________
-TH1D* TSVDUnfold::GetSV() const
-{
+TH1D* TSVDUnfold::GetSV() const
+{
// Returns singular values vector
- return fSVHist;
+ return fSVHist;
}
//_______________________________________________________________________
-TH2D* TSVDUnfold::GetXtau() const
-{
+TH2D* TSVDUnfold::GetXtau() const
+{
// Returns the computed regularized covariance matrix corresponding to total uncertainties on measured spectrum as passed in the constructor.
- // Note that this covariance matrix will not contain the effects of forced normalization if spectrum is normalized to unit area.
- return fXtau;
+ // Note that this covariance matrix will not contain the effects of forced normalization if spectrum is normalized to unit area.
+ return fXtau;
}
//_______________________________________________________________________
-TH2D* TSVDUnfold::GetXinv() const
-{
+TH2D* TSVDUnfold::GetXinv() const
+{
// Returns the computed inverse of the covariance matrix
- return fXinv;
+ return fXinv;
}
//_______________________________________________________________________
-TH2D* TSVDUnfold::GetBCov() const
-{
+TH2D* TSVDUnfold::GetBCov() const
+{
// Returns the covariance matrix
- return fBcov;
+ return fBcov;
}
//_______________________________________________________________________
@@ -648,7 +648,7 @@ void TSVDUnfold::M2H( const TMatrixD& mat, TH2D& histo )
// Fill 2D histogram into matrix
for (Int_t j=0; j<mat.GetNcols(); j++) {
for (Int_t i=0; i<mat.GetNrows(); i++) {
- histo.SetBinContent(i+1,j+1, mat(i,j));
+ histo.SetBinContent(i+1,j+1, mat(i,j));
}
}
}
@@ -695,8 +695,8 @@ TVectorD TSVDUnfold::CompProd( const TVectorD& vec1, const TVectorD& vec2 )
}
//_______________________________________________________________________
-Double_t TSVDUnfold::GetCurvature(const TVectorD& vec, const TMatrixD& curv)
-{
+Double_t TSVDUnfold::GetCurvature(const TVectorD& vec, const TMatrixD& curv)
+{
// Compute curvature of vector
return vec*(curv*vec);
}
@@ -792,18 +792,18 @@ void TSVDUnfold::FillCurvatureMatrix( TMatrixD& tCurv, TMatrixD& tC ) const
void TSVDUnfold::InitHistos( )
{
- fDHist = new TH1D( "dd", "d vector after orthogonal transformation", fNdim, 0, fNdim );
+ fDHist = new TH1D( "dd", "d vector after orthogonal transformation", fNdim, 0, fNdim );
fDHist->Sumw2();
- fSVHist = new TH1D( "sv", "Singular values of AC^-1", fNdim, 0, fNdim );
+ fSVHist = new TH1D( "sv", "Singular values of AC^-1", fNdim, 0, fNdim );
fSVHist->Sumw2();
fXtau = (TH2D*)fAdet->Clone("Xtau");
- fXtau->SetTitle("Regularized covariance matrix");
+ fXtau->SetTitle("Regularized covariance matrix");
fXtau->Sumw2();
fXinv = (TH2D*)fAdet->Clone("Xinv");
- fXinv->SetTitle("Inverse covariance matrix");
+ fXinv->SetTitle("Inverse covariance matrix");
fXinv->Sumw2();
}
@@ -814,7 +814,7 @@ void TSVDUnfold::RegularisedSymMatInvert( TMatrixDSym& mat, Double_t eps )
// init reduced matrix
const UInt_t n = mat.GetNrows();
- UInt_t nn = 0;
+ UInt_t nn = 0;
UInt_t *ipos = new UInt_t[n];
// UInt_t ipos[n];
@@ -825,7 +825,7 @@ void TSVDUnfold::RegularisedSymMatInvert( TMatrixDSym& mat, Double_t eps )
for (UInt_t i=0; i<n; i++) {
- // save position of accepted entries
+ // save position of accepted entries
if (TMath::Abs(mat[i][i])/ymax > eps) ipos[nn++] = i;
}
@@ -871,10 +871,10 @@ Double_t TSVDUnfold::ComputeChiSquared( const TH1D& truspec, const TH1D& unfspec
for (UInt_t i=0; i<n; i++) {
for (UInt_t j=0; j<n; j++) {
chi2 += ( (truspec.GetBinContent( i+1 )-unfspec.GetBinContent( i+1 )) *
- (truspec.GetBinContent( j+1 )-unfspec.GetBinContent( j+1 )) * fXinv->GetBinContent(i+1,j+1) );
+ (truspec.GetBinContent( j+1 )-unfspec.GetBinContent( j+1 )) * fXinv->GetBinContent(i+1,j+1) );
}
}
-
+
return chi2;
}
diff --git a/hist/hist/src/TSpline.cxx b/hist/hist/src/TSpline.cxx
index e7a33857c1c..4f4a6984d07 100644
--- a/hist/hist/src/TSpline.cxx
+++ b/hist/hist/src/TSpline.cxx
@@ -1856,7 +1856,7 @@ void TSpline5::SetPoint(Int_t i, Double_t x, Double_t y)
//______________________________________________________________________________
void TSpline5::SetPointCoeff(Int_t i, Double_t b, Double_t c, Double_t d,
- Double_t e, Double_t f)
+ Double_t e, Double_t f)
{
// set point coefficient number i
diff --git a/hist/hist/src/TUnfold.cxx b/hist/hist/src/TUnfold.cxx
index 1410a435383..70b1745478c 100644
--- a/hist/hist/src/TUnfold.cxx
+++ b/hist/hist/src/TUnfold.cxx
@@ -101,7 +101,7 @@
// for fixed lambda=0
// or
// (b) constrained: stationary point is found as a function of x and lambda
-//
+//
// The constraint can be useful to reduce biases on the result x
// in cases where the vector y follows non-Gaussian probability densities
// (example: Poisson statistics at counting experiments in particle physics)
@@ -145,7 +145,7 @@
//
// epsilon_j = sum_i A_ij vector of efficiencies
//
-// E^-1 = ((A# Vyy^-1 A)+tau^2 Lsquared)
+// E^-1 = ((A# Vyy^-1 A)+tau^2 Lsquared)
//
// x = E (A# Vyy^-1 y + tau^2 Lsquared x0 +lambda/2 * epsilon) is the result
//
@@ -181,7 +181,7 @@
//
// Within TUnfold a simple version of the L-curve analysis is available.
// It tests a given number of points in a predefined tau-range and searches
-// for the maximum of the curvature in the L-curve (kink position).
+// for the maximum of the curvature in the L-curve (kink position).
// if no tau range is given, the range of the scan is determined automatically
//
// A nice overview of the L-curve method is given in:
@@ -189,7 +189,7 @@
// (2000) by P. C. Hansen, in Computational Inverse Problems in
// Electrocardiology, ed. P. Johnston,
// Advances in Computational Bioengineering
-// http://www.imm.dtu.dk/~pch/TR/Lcurve.ps
+// http://www.imm.dtu.dk/~pch/TR/Lcurve.ps
//
// Alternative Regularisation conditions
// =====================================
@@ -201,7 +201,7 @@
// x: unfolding output
// x0: the bias distribution, by default calculated from
// the input matrix A. There is a method SetBias() to change the
-// bias distribution.
+// bias distribution.
// The 3rd argument to DoUnfold() is a scale factor applied to the bias
// bias_default[j] = sum_i A[i][j]
// x0[j] = scaleBias*bias[j]
@@ -211,8 +211,8 @@
// and Monte Carlo
//
// If the regularisation is strong, i.e. large parameter tau,
-// then the distribution x or its derivatives will look like the bias
-// distribution. If the parameter tau is small, the distribution x is
+// then the distribution x or its derivatives will look like the bias
+// distribution. If the parameter tau is small, the distribution x is
// independent of the bias.
//
// Three basic types of regularisation are implemented in TUnfold
@@ -229,11 +229,11 @@
// Sometimes the bias is not discussed, equivalent to a bias scale factor
// of zero.
//
-// The regularisation schemes kRegModeDerivative and
+// The regularisation schemes kRegModeDerivative and
// kRegModeCurvature have the nice feature that they create correlations
-// between x-bins, whereas the non-regularized unfolding tends to create
+// between x-bins, whereas the non-regularized unfolding tends to create
// negative correlations between bins. For these regularisation schemes the
-// parameter tau could be tuned such that the correlations are smallest,
+// parameter tau could be tuned such that the correlations are smallest,
// as an alternative to the L-curve method.
//
// If kRegModeSize is chosen or if x is a smooth function through all bins,
@@ -254,7 +254,7 @@
// For ultimate flexibility, the regularisation condition can be set on each
// bin individually
// -> give kRegModeNone in the constructor and use
-// RegularizeSize() regularize one bin
+// RegularizeSize() regularize one bin
// RegularizeDerivative() regularize the slope given by two bins
// RegularizeCurvature() regularize the curvature given by three bins
// AddRegularisationCondition()
@@ -263,21 +263,21 @@
///////////////////////////////////////////////////////////////////////////
/*
- This file is part of TUnfold.
+ This file is part of TUnfold.
- TUnfold is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+ TUnfold is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- TUnfold is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ TUnfold is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with TUnfold. If not, see <http://www.gnu.org/licenses/>.
-*/
+ You should have received a copy of the GNU General Public License
+ along with TUnfold. If not, see <http://www.gnu.org/licenses/>.
+ */
#include <iostream>
#include <TMatrixD.h>
@@ -290,7 +290,7 @@
#include <map>
#include <vector>
-// this option saves the spline of the L curve curvature to a file
+// this option saves the spline of the L curve curvature to a file
// named splinec.ps for debugging
//#define DEBUG
@@ -434,7 +434,7 @@ Double_t TUnfold::DoUnfold(void)
if(!fVyyInv) {
GetInputInverseEmatrix(0);
if(fConstraint != kEConstraintNone) {
- fNdf--;
+ fNdf--;
}
}
//
@@ -451,7 +451,7 @@ Double_t TUnfold::DoUnfold(void)
TMatrixDSparse *rhs=MultiplyMSparseM(AtVyyinv,fY);
TMatrixDSparse *lSquared=MultiplyMSparseTranspMSparse(fL,fL);
if (fBiasScale != 0.0) {
- TMatrixDSparse *rhs2=MultiplyMSparseM(lSquared,fX0);
+ TMatrixDSparse *rhs2=MultiplyMSparseM(lSquared,fX0);
AddMSparse(rhs, fTauSquared * fBiasScale ,rhs2);
DeleteMatrix(&rhs2);
}
@@ -547,9 +547,9 @@ Double_t TUnfold::DoUnfold(void)
rows[i]=0;
cols[i]=i;
data[i]=one_over_epsEeps;
- }
+ }
TMatrixDSparse *temp=CreateSparseMatrix
- (1,GetNy(),GetNy(),rows,cols,data);
+ (1,GetNy(),GetNy(),rows,cols,data);
delete[] data;
delete[] rows;
delete[] cols;
@@ -642,7 +642,7 @@ Double_t TUnfold::DoUnfold(void)
if(fConstraint != kEConstraintNone) {
// add correction to fDXDAM[0]
TMatrixDSparse *temp1=MultiplyMSparseMSparseTranspVector
- (Eepsilon,Eepsilon,0);
+ (Eepsilon,Eepsilon,0);
AddMSparse(fDXDAM[0], -one_over_epsEeps,temp1);
DeleteMatrix(&temp1);
// add correction to fDXDAZ[0]
@@ -655,7 +655,7 @@ Double_t TUnfold::DoUnfold(void)
data[i]=lambda_half;
}
TMatrixDSparse *temp2=CreateSparseMatrix
- (GetNy(),1,GetNy(),rows,cols,data);
+ (GetNy(),1,GetNy(),rows,cols,data);
delete[] data;
delete[] rows;
delete[] cols;
@@ -696,12 +696,12 @@ Double_t TUnfold::DoUnfold(void)
for(int ik=Vxx_rows[ix];ik<Vxx_rows[ix+1];ik++) {
if(ix==Vxx_cols[ik]) {
Double_t rho_squared =
- 1. - 1. / (VxxInvDiag(ix) * Vxx_data[ik]);
+ 1. - 1. / (VxxInvDiag(ix) * Vxx_data[ik]);
if (rho_squared > rho_squared_max)
rho_squared_max = rho_squared;
if(rho_squared>0.0) {
rho_sum += TMath::Sqrt(rho_squared);
- n_rho++;
+ n_rho++;
}
break;
}
@@ -988,13 +988,13 @@ TMatrixDSparse *TUnfold::MultiplyMSparseMSparseTranspVector
Int_t v_index=v_rows[k1];
if(v_index<v_rows[k1+1]) {
data_r[num_r] += data_m1[index_m1] * data_m2[index_m2]
- * v_data[v_index];
+ * v_data[v_index];
} else {
data_r[num_r] =0.0;
}
} else if(v) {
data_r[num_r] += data_m1[index_m1] * data_m2[index_m2]
- * (*v)(k1,0);
+ * (*v)(k1,0);
} else {
data_r[num_r] += data_m1[index_m1] * data_m2[index_m2];
}
@@ -1043,10 +1043,10 @@ void TUnfold::AddMSparse(TMatrixDSparse *dest,Double_t f,
Int_t i_dest=dest_rows[row];
Int_t i_src=src_rows[row];
while((i_dest<dest_rows[row+1])||(i_src<src_rows[row+1])) {
- Int_t col_dest=(i_dest<dest_rows[row+1]) ?
- dest_cols[i_dest] : dest->GetNcols();
+ Int_t col_dest=(i_dest<dest_rows[row+1]) ?
+ dest_cols[i_dest] : dest->GetNcols();
Int_t col_src =(i_src <src_rows[row+1] ) ?
- src_cols [i_src] : src->GetNcols();
+ src_cols [i_src] : src->GetNcols();
result_rows[n]=row;
if(col_dest<col_src) {
result_cols[n]=col_dest;
@@ -1084,12 +1084,12 @@ TMatrixDSparse *TUnfold::InvertMSparseSymmPos
{
// get the inverse or pseudo-inverse of a sparse matrix
// A: the original matrix
- // rank:
+ // rank:
// if(rankPtr==0)
// rerturn the inverse if it exists, or return NULL
// else
// return the pseudo-invers
- // and return the rank of the matrix in *rankPtr
+ // and return the rank of the matrix in *rankPtr
// the matrix inversion is optimized for the case
// where a large submatrix of A is diagonal
@@ -1383,7 +1383,7 @@ TMatrixDSparse *TUnfold::InvertMSparseSymmPos
B_row[BnumEl]=i;
B_col[BnumEl]=j;
B_data[BnumEl]=a_data[indexA];
- BnumEl++;
+ BnumEl++;
}
}
}
@@ -1407,7 +1407,7 @@ TMatrixDSparse *TUnfold::InvertMSparseSymmPos
minusBD2inv=MultiplyMSparseMSparse(B,D2inv);
if(minusBD2inv) {
Int_t mbd2_nMax=minusBD2inv->GetRowIndexArray()
- [minusBD2inv->GetNrows()];
+ [minusBD2inv->GetNrows()];
Double_t *mbd2_data=minusBD2inv->GetMatrixArray();
for(Int_t i=0;i<mbd2_nMax;i++) {
mbd2_data[i] = - mbd2_data[i];
@@ -1416,7 +1416,7 @@ TMatrixDSparse *TUnfold::InvertMSparseSymmPos
}
if(minusBD2inv && F) {
TMatrixDSparse *minusBD2invBt=
- MultiplyMSparseMSparseTranspVector(minusBD2inv,B,0);
+ MultiplyMSparseMSparseTranspVector(minusBD2inv,B,0);
AddMSparse(F,1.,minusBD2invBt);
DeleteMatrix(&minusBD2invBt);
}
@@ -1434,7 +1434,7 @@ TMatrixDSparse *TUnfold::InvertMSparseSymmPos
if(f_cols[indexF]>=i) c(f_cols[indexF],i)=f_data[indexF];
}
// calculate diagonal element
- Double_t c_ii=c(i,i);
+ Double_t c_ii=c(i,i);
for(Int_t j=0;j<i;j++) {
Double_t c_ij=c(i,j);
c_ii -= c_ij*c_ij;
@@ -1443,8 +1443,8 @@ TMatrixDSparse *TUnfold::InvertMSparseSymmPos
nErrorF++;
break;
}
- c_ii=TMath::Sqrt(c_ii);
- c(i,i)=c_ii;
+ c_ii=TMath::Sqrt(c_ii);
+ c(i,i)=c_ii;
// off-diagonal elements
for(Int_t j=i+1;j<nF;j++) {
Double_t c_ji=c(j,i);
@@ -1485,7 +1485,7 @@ TMatrixDSparse *TUnfold::InvertMSparseSymmPos
}
TMatrixDSparse cInvSparse(cinv);
Finv=MultiplyMSparseTranspMSparse
- (&cInvSparse,&cInvSparse);
+ (&cInvSparse,&cInvSparse);
}
DeleteMatrix(&F);
}
@@ -1515,7 +1515,7 @@ TMatrixDSparse *TUnfold::InvertMSparseSymmPos
if(D2inv) E=new TMatrixDSparse(*D2inv);
if(G && minusBD2inv) {
TMatrixDSparse *minusBD2invTransG=
- MultiplyMSparseTranspMSparse(minusBD2inv,G);
+ MultiplyMSparseTranspMSparse(minusBD2inv,G);
if(E) {
AddMSparse(E,1.,minusBD2invTransG);
DeleteMatrix(&minusBD2invTransG);
@@ -1662,8 +1662,8 @@ TMatrixDSparse *TUnfold::InvertMSparseSymmPos
}
TMatrixDSparse V(Eigen.GetEigenVectors());
TMatrixDSparse *VDVt=MultiplyMSparseMSparseTranspVector
- (&V,&V,&inverseEV);
-
+ (&V,&V,&inverseEV);
+
// pack matrix VDVt to r
const Int_t *vdvt_rows=VDVt->GetRowIndexArray();
const Int_t *vdvt_cols=VDVt->GetColIndexArray();
@@ -1686,7 +1686,7 @@ TMatrixDSparse *TUnfold::InvertMSparseSymmPos
if(rankPtr) {
*rankPtr=rankD1+rankD2Block;
}
-
+
DeleteMatrix(&D2inv);
DeleteMatrix(&Finv);
@@ -1698,8 +1698,8 @@ TMatrixDSparse *TUnfold::InvertMSparseSymmPos
delete [] isZero;
TMatrixDSparse *r=(rNumEl>=0) ?
- CreateSparseMatrix(A->GetNrows(),A->GetNrows(),rNumEl,
- rEl_row,rEl_col,rEl_data) : 0;
+ CreateSparseMatrix(A->GetNrows(),A->GetNrows(),rNumEl,
+ rEl_row,rEl_col,rEl_data) : 0;
delete [] rEl_data;
delete [] rEl_col;
delete [] rEl_row;
@@ -1728,19 +1728,19 @@ TMatrixDSparse *TUnfold::InvertMSparseSymmPos
if(TMath::Abs(ar(i,j)-ar(j,i))>
epsilonA2*(TMath::Abs(ar(i,j))+TMath::Abs(ar(j,i)))) {
std::cout<<"Ar is not symmetric Ar("<<i<<","<<j<<")="<<ar(i,j)
- <<" Ar("<<j<<","<<i<<")="<<ar(j,i)<<"\n";
+ <<" Ar("<<j<<","<<i<<")="<<ar(j,i)<<"\n";
}
// ara should be equal a
if(TMath::Abs(ara(i,j)-a(i,j))>
epsilonA2*(TMath::Abs(ara(i,j))+TMath::Abs(a(i,j)))) {
std::cout<<"ArA is not equal A ArA("<<i<<","<<j<<")="<<ara(i,j)
- <<" A("<<i<<","<<j<<")="<<a(i,j)<<"\n";
+ <<" A("<<i<<","<<j<<")="<<a(i,j)<<"\n";
}
// ara should be equal a
if(TMath::Abs(rar(i,j)-R(i,j))>
epsilonA2*(TMath::Abs(rar(i,j))+TMath::Abs(R(i,j)))) {
std::cout<<"rAr is not equal r rAr("<<i<<","<<j<<")="<<rar(i,j)
- <<" r("<<i<<","<<j<<")="<<R(i,j)<<"\n";
+ <<" r("<<i<<","<<j<<")="<<R(i,j)<<"\n";
}
}
}
@@ -1766,7 +1766,7 @@ TUnfold::TUnfold(const TH2 *hist_A, EHistMap histmap, ERegMode regmode,
{
// set up unfolding matrix and initial regularisation scheme
// hist_A: matrix that describes the migrations
- // histmap: mapping of the histogram axes to the unfolding output
+ // histmap: mapping of the histogram axes to the unfolding output
// regmode: global regularisation mode
// constraint: type of constraint to use
// data members initialized to something different from zero:
@@ -1843,12 +1843,12 @@ TUnfold::TUnfold(const TH2 *hist_A, EHistMap histmap, ERegMode regmode,
fSumOverY[nx] = sum;
if (histmap == kHistMapOutputHoriz) {
fSumOverY[nx] +=
- hist_A->GetBinContent(ix, 0) +
- hist_A->GetBinContent(ix, ny + 1);
+ hist_A->GetBinContent(ix, 0) +
+ hist_A->GetBinContent(ix, ny + 1);
} else {
fSumOverY[nx] +=
- hist_A->GetBinContent(0, ix) +
- hist_A->GetBinContent(ny + 1, ix);
+ hist_A->GetBinContent(0, ix) +
+ hist_A->GetBinContent(ny + 1, ix);
}
nx++;
} else {
@@ -1898,11 +1898,11 @@ TUnfold::TUnfold(const TH2 *hist_A, EHistMap histmap, ERegMode regmode,
}
if(nskipped==(2-underflowBin-overflowBin)) {
Info("TUnfold","underflow and overflow bin "
- "do not depend on the input data");
+ "do not depend on the input data");
} else {
Warning("TUnfold","%d output bins "
"do not depend on the input data %s",nDisconnected,
- static_cast<const char *>(binlist));
+ static_cast<const char *>(binlist));
}
}
// store bias as matrix
@@ -2004,7 +2004,7 @@ Bool_t TUnfold::AddRegularisationCondition
Double_t data[3];
Int_t nEle=0;
- if(i2>=0) {
+ if(i2>=0) {
data[nEle]=f2;
indices[nEle]=i2;
nEle++;
@@ -2025,7 +2025,7 @@ Bool_t TUnfold::AddRegularisationCondition
Bool_t TUnfold::AddRegularisationCondition
(Int_t nEle,const Int_t *indices,const Double_t *rowData)
{
- // add a regularisation condition
+ // add a regularisation condition
// the arguments are used to form one row (k) of the matrix L
// L(k,indices[0])=rowData[0]
// ...
@@ -2100,7 +2100,7 @@ Int_t TUnfold::RegularizeSize(int bin, Double_t scale)
}
Int_t TUnfold::RegularizeDerivative(int left_bin, int right_bin,
- Double_t scale)
+ Double_t scale)
{
// add regularisation on the difference of two bins
// left_bin: 1st bin
@@ -2116,9 +2116,9 @@ Int_t TUnfold::RegularizeDerivative(int left_bin, int right_bin,
}
Int_t TUnfold::RegularizeCurvature(int left_bin, int center_bin,
- int right_bin,
- Double_t scale_left,
- Double_t scale_right)
+ int right_bin,
+ Double_t scale_left,
+ Double_t scale_right)
{
// add regularisation on the curvature through 3 bins (2nd derivative)
// left_bin: 1st bin
@@ -2133,14 +2133,14 @@ Int_t TUnfold::RegularizeCurvature(int left_bin, int center_bin,
if(fRegMode!=kRegModeCurvature) fRegMode=kRegModeMixed;
return AddRegularisationCondition
- (left_bin,-scale_left,
- center_bin,scale_left+scale_right,
- right_bin,-scale_right)
- ? 0 : 1;
+ (left_bin,-scale_left,
+ center_bin,scale_left+scale_right,
+ right_bin,-scale_right)
+ ? 0 : 1;
}
Int_t TUnfold::RegularizeBins(int start, int step, int nbin,
- ERegMode regmode)
+ ERegMode regmode)
{
// set regulatisation on a 1-dimensional curve
// start: first bin
@@ -2180,7 +2180,7 @@ Int_t TUnfold::RegularizeBins(int start, int step, int nbin,
}
Int_t TUnfold::RegularizeBins2D(int start_bin, int step1, int nbin1,
- int step2, int nbin2, ERegMode regmode)
+ int step2, int nbin2, ERegMode regmode)
{
// set regularisation on a 2-dimensional grid of bins
// start: first bin
@@ -2188,9 +2188,9 @@ Int_t TUnfold::RegularizeBins2D(int start_bin, int step1, int nbin1,
// nbin1: number of bins in 1st direction
// step2: distance between bins in 2nd direction
// nbin2: number of bins in 2nd direction
- // return value:
+ // return value:
// number of errors (i.e. conditions which have been skipped)
- // modifies data member fL
+ // modifies data member fL
Int_t nError = 0;
for (Int_t i1 = 0; i1 < nbin1; i1++) {
@@ -2228,199 +2228,199 @@ Int_t TUnfold::SetInput(const TH1 *input, Double_t scaleBias,
Double_t oneOverZeroError,const TH2 *hist_vyy,
const TH2 *hist_vyy_inv)
{
- // Define the input data for subsequent calls to DoUnfold(Double_t)
- // input: input distribution with errors
- // scaleBias: scale factor applied to the bias
- // oneOverZeroError: for bins with zero error, this number defines 1/error.
- // hist_vyy: if non-zero, defines the data covariance matrix
- // otherwise it is calculated from the data errors
- // hist_vyy_inv: if non-zero and if hist_vyy is set, defines the inverse of the data covariance matrix
- // Return value: number of bins with bad error
- // +10000*number of unconstrained output bins
- // Note: return values>=10000 are fatal errors,
- // for the given input, the unfolding can not be done!
- // Data members modified:
- // fY, fVyy, , fBiasScale
- // Data members cleared
- // fVyyInv, fNdf
- // + see ClearResults
-
- DeleteMatrix(&fVyyInv);
- fNdf=0;
-
- fBiasScale = scaleBias;
+ // Define the input data for subsequent calls to DoUnfold(Double_t)
+ // input: input distribution with errors
+ // scaleBias: scale factor applied to the bias
+ // oneOverZeroError: for bins with zero error, this number defines 1/error.
+ // hist_vyy: if non-zero, defines the data covariance matrix
+ // otherwise it is calculated from the data errors
+ // hist_vyy_inv: if non-zero and if hist_vyy is set, defines the inverse of the data covariance matrix
+ // Return value: number of bins with bad error
+ // +10000*number of unconstrained output bins
+ // Note: return values>=10000 are fatal errors,
+ // for the given input, the unfolding can not be done!
+ // Data members modified:
+ // fY, fVyy, , fBiasScale
+ // Data members cleared
+ // fVyyInv, fNdf
+ // + see ClearResults
+
+ DeleteMatrix(&fVyyInv);
+ fNdf=0;
+
+ fBiasScale = scaleBias;
// delete old results (if any)
- ClearResults();
-
- // construct error matrix and inverted error matrix of measured quantities
- // from errors of input histogram or use error matrix
-
- Int_t *rowVyyN=new Int_t[GetNy()*GetNy()+1];
- Int_t *colVyyN=new Int_t[GetNy()*GetNy()+1];
- Double_t *dataVyyN=new Double_t[GetNy()*GetNy()+1];
-
- Int_t *rowVyy1=new Int_t[GetNy()];
- Int_t *colVyy1=new Int_t[GetNy()];
- Double_t *dataVyy1=new Double_t[GetNy()];
- Double_t *dataVyyDiag=new Double_t[GetNy()];
-
- Int_t nError=0;
- Int_t nVyyN=0;
- Int_t nVyy1=0;
- for (Int_t iy = 0; iy < GetNy(); iy++) {
- // diagonals
- Double_t dy2;
- if(!hist_vyy) {
- Double_t dy = input->GetBinError(iy + 1);
- dy2=dy*dy;
- if (dy2 <= 0.0) {
- nError++;
- if(oneOverZeroError>0.0) {
- dy2 = 1./ ( oneOverZeroError*oneOverZeroError);
- }
- }
- } else {
- dy2 = hist_vyy->GetBinContent(iy+1,iy+1);
- }
- rowVyyN[nVyyN] = iy;
- colVyyN[nVyyN] = iy;
- rowVyy1[nVyy1] = iy;
- colVyy1[nVyy1] = 0;
- dataVyyDiag[iy] = dy2;
- if(dy2>0.0) {
- dataVyyN[nVyyN++] = dy2;
- dataVyy1[nVyy1++] = dy2;
- }
- }
- if(hist_vyy) {
- // non-diagonal elements
- for (Int_t iy = 0; iy < GetNy(); iy++) {
- // ignore rows where the diagonal is zero
- if(dataVyyDiag[iy]<=0.0) continue;
- for (Int_t jy = 0; jy < GetNy(); jy++) {
- // skip diagonal elements
- if(iy==jy) continue;
- // ignore columns where the diagonal is zero
- if(dataVyyDiag[jy]<=0.0) continue;
-
- rowVyyN[nVyyN] = iy;
- colVyyN[nVyyN] = jy;
- dataVyyN[nVyyN]= hist_vyy->GetBinContent(iy+1,jy+1);
- if(dataVyyN[nVyyN] == 0.0) continue;
- nVyyN ++;
- }
- }
- if(hist_vyy_inv) {
- Warning("SetInput",
- "inverse of input covariance is taken from user input");
- Int_t *rowVyyInv=new Int_t[GetNy()*GetNy()+1];
- Int_t *colVyyInv=new Int_t[GetNy()*GetNy()+1];
- Double_t *dataVyyInv=new Double_t[GetNy()*GetNy()+1];
- Int_t nVyyInv=0;
- for (Int_t iy = 0; iy < GetNy(); iy++) {
- for (Int_t jy = 0; jy < GetNy(); jy++) {
- rowVyyInv[nVyyInv] = iy;
- colVyyInv[nVyyInv] = jy;
- dataVyyInv[nVyyInv]= hist_vyy_inv->GetBinContent(iy+1,jy+1);
- if(dataVyyInv[nVyyInv] == 0.0) continue;
- nVyyInv ++;
- }
- }
- fVyyInv=CreateSparseMatrix
- (GetNy(),GetNy(),nVyyInv,rowVyyInv,colVyyInv,dataVyyInv);
- delete [] rowVyyInv;
- delete [] colVyyInv;
- delete [] dataVyyInv;
- }
- }
- DeleteMatrix(&fVyy);
- fVyy = CreateSparseMatrix
- (GetNy(),GetNy(),nVyyN,rowVyyN,colVyyN,dataVyyN);
-
- delete[] rowVyyN;
- delete[] colVyyN;
- delete[] dataVyyN;
-
- TMatrixDSparse *vecV=CreateSparseMatrix
- (GetNy(),1,nVyy1,rowVyy1,colVyy1, dataVyy1);
-
- delete[] rowVyy1;
- delete[] colVyy1;
- delete[] dataVyy1;
-
- //
- // get input vector
- DeleteMatrix(&fY);
- fY = new TMatrixD(GetNy(), 1);
- for (Int_t i = 0; i < GetNy(); i++) {
- (*fY) (i, 0) = input->GetBinContent(i + 1);
- }
- // simple check whether unfolding is possible, given the matrices fA and fV
- TMatrixDSparse *mAtV=MultiplyMSparseTranspMSparse(fA,vecV);
- DeleteMatrix(&vecV);
- Int_t nError2=0;
- for (Int_t i = 0; i <mAtV->GetNrows();i++) {
- if(mAtV->GetRowIndexArray()[i]==
- mAtV->GetRowIndexArray()[i+1]) {
- nError2 ++;
- }
- }
- if(nError>0) {
- if(oneOverZeroError !=0.0) {
- if(nError>1) {
- Warning("SetInput","%d/%d input bins have zero error,"
- " 1/error set to %lf.",nError,GetNy(),oneOverZeroError);
- } else {
- Warning("SetInput","One input bin has zero error,"
- " 1/error set to %lf.",oneOverZeroError);
- }
- } else {
- if(nError>1) {
- Warning("SetInput","%d/%d input bins have zero error,"
- " and are ignored.",nError,GetNy());
- } else {
- Warning("SetInput","One input bin has zero error,"
- " and is ignored.");
- }
- }
- fIgnoredBins=nError;
- }
- if(nError2>0) {
- // check whether data points with zero error are responsible
- if(oneOverZeroError<=0.0) {
- //const Int_t *a_rows=fA->GetRowIndexArray();
- //const Int_t *a_cols=fA->GetColIndexArray();
- for (Int_t col = 0; col <mAtV->GetNrows();col++) {
- if(mAtV->GetRowIndexArray()[col]==
- mAtV->GetRowIndexArray()[col+1]) {
- TString binlist("no data to constrain output bin ");
- binlist += GetOutputBinName(fXToHist[col]);
- /* binlist +=" depends on ignored input bins ";
- for(Int_t row=0;row<fA->GetNrows();row++) {
- if(dataVyyDiag[row]>0.0) continue;
- for(Int_t i=a_rows[row];i<a_rows[row+1];i++) {
- if(a_cols[i]!=col) continue;
- binlist +=" ";
- binlist +=row;
- }
- } */
- Warning("SetInput","%s",binlist.Data());
- }
- }
- }
- if(nError2>1) {
- Error("SetInput","%d/%d output bins are not constrained by any data.",
- nError2,mAtV->GetNrows());
- } else {
- Error("SetInput","One output bins is not constrained by any data.");
- }
- }
- DeleteMatrix(&mAtV);
-
- delete[] dataVyyDiag;
-
- return nError+10000*nError2;
+ ClearResults();
+
+ // construct error matrix and inverted error matrix of measured quantities
+ // from errors of input histogram or use error matrix
+
+ Int_t *rowVyyN=new Int_t[GetNy()*GetNy()+1];
+ Int_t *colVyyN=new Int_t[GetNy()*GetNy()+1];
+ Double_t *dataVyyN=new Double_t[GetNy()*GetNy()+1];
+
+ Int_t *rowVyy1=new Int_t[GetNy()];
+ Int_t *colVyy1=new Int_t[GetNy()];
+ Double_t *dataVyy1=new Double_t[GetNy()];
+ Double_t *dataVyyDiag=new Double_t[GetNy()];
+
+ Int_t nError=0;
+ Int_t nVyyN=0;
+ Int_t nVyy1=0;
+ for (Int_t iy = 0; iy < GetNy(); iy++) {
+ // diagonals
+ Double_t dy2;
+ if(!hist_vyy) {
+ Double_t dy = input->GetBinError(iy + 1);
+ dy2=dy*dy;
+ if (dy2 <= 0.0) {
+ nError++;
+ if(oneOverZeroError>0.0) {
+ dy2 = 1./ ( oneOverZeroError*oneOverZeroError);
+ }
+ }
+ } else {
+ dy2 = hist_vyy->GetBinContent(iy+1,iy+1);
+ }
+ rowVyyN[nVyyN] = iy;
+ colVyyN[nVyyN] = iy;
+ rowVyy1[nVyy1] = iy;
+ colVyy1[nVyy1] = 0;
+ dataVyyDiag[iy] = dy2;
+ if(dy2>0.0) {
+ dataVyyN[nVyyN++] = dy2;
+ dataVyy1[nVyy1++] = dy2;
+ }
+ }
+ if(hist_vyy) {
+ // non-diagonal elements
+ for (Int_t iy = 0; iy < GetNy(); iy++) {
+ // ignore rows where the diagonal is zero
+ if(dataVyyDiag[iy]<=0.0) continue;
+ for (Int_t jy = 0; jy < GetNy(); jy++) {
+ // skip diagonal elements
+ if(iy==jy) continue;
+ // ignore columns where the diagonal is zero
+ if(dataVyyDiag[jy]<=0.0) continue;
+
+ rowVyyN[nVyyN] = iy;
+ colVyyN[nVyyN] = jy;
+ dataVyyN[nVyyN]= hist_vyy->GetBinContent(iy+1,jy+1);
+ if(dataVyyN[nVyyN] == 0.0) continue;
+ nVyyN ++;
+ }
+ }
+ if(hist_vyy_inv) {
+ Warning("SetInput",
+ "inverse of input covariance is taken from user input");
+ Int_t *rowVyyInv=new Int_t[GetNy()*GetNy()+1];
+ Int_t *colVyyInv=new Int_t[GetNy()*GetNy()+1];
+ Double_t *dataVyyInv=new Double_t[GetNy()*GetNy()+1];
+ Int_t nVyyInv=0;
+ for (Int_t iy = 0; iy < GetNy(); iy++) {
+ for (Int_t jy = 0; jy < GetNy(); jy++) {
+ rowVyyInv[nVyyInv] = iy;
+ colVyyInv[nVyyInv] = jy;
+ dataVyyInv[nVyyInv]= hist_vyy_inv->GetBinContent(iy+1,jy+1);
+ if(dataVyyInv[nVyyInv] == 0.0) continue;
+ nVyyInv ++;
+ }
+ }
+ fVyyInv=CreateSparseMatrix
+ (GetNy(),GetNy(),nVyyInv,rowVyyInv,colVyyInv,dataVyyInv);
+ delete [] rowVyyInv;
+ delete [] colVyyInv;
+ delete [] dataVyyInv;
+ }
+ }
+ DeleteMatrix(&fVyy);
+ fVyy = CreateSparseMatrix
+ (GetNy(),GetNy(),nVyyN,rowVyyN,colVyyN,dataVyyN);
+
+ delete[] rowVyyN;
+ delete[] colVyyN;
+ delete[] dataVyyN;
+
+ TMatrixDSparse *vecV=CreateSparseMatrix
+ (GetNy(),1,nVyy1,rowVyy1,colVyy1, dataVyy1);
+
+ delete[] rowVyy1;
+ delete[] colVyy1;
+ delete[] dataVyy1;
+
+ //
+ // get input vector
+ DeleteMatrix(&fY);
+ fY = new TMatrixD(GetNy(), 1);
+ for (Int_t i = 0; i < GetNy(); i++) {
+ (*fY) (i, 0) = input->GetBinContent(i + 1);
+ }
+ // simple check whether unfolding is possible, given the matrices fA and fV
+ TMatrixDSparse *mAtV=MultiplyMSparseTranspMSparse(fA,vecV);
+ DeleteMatrix(&vecV);
+ Int_t nError2=0;
+ for (Int_t i = 0; i <mAtV->GetNrows();i++) {
+ if(mAtV->GetRowIndexArray()[i]==
+ mAtV->GetRowIndexArray()[i+1]) {
+ nError2 ++;
+ }
+ }
+ if(nError>0) {
+ if(oneOverZeroError !=0.0) {
+ if(nError>1) {
+ Warning("SetInput","%d/%d input bins have zero error,"
+ " 1/error set to %lf.",nError,GetNy(),oneOverZeroError);
+ } else {
+ Warning("SetInput","One input bin has zero error,"
+ " 1/error set to %lf.",oneOverZeroError);
+ }
+ } else {
+ if(nError>1) {
+ Warning("SetInput","%d/%d input bins have zero error,"
+ " and are ignored.",nError,GetNy());
+ } else {
+ Warning("SetInput","One input bin has zero error,"
+ " and is ignored.");
+ }
+ }
+ fIgnoredBins=nError;
+ }
+ if(nError2>0) {
+ // check whether data points with zero error are responsible
+ if(oneOverZeroError<=0.0) {
+ //const Int_t *a_rows=fA->GetRowIndexArray();
+ //const Int_t *a_cols=fA->GetColIndexArray();
+ for (Int_t col = 0; col <mAtV->GetNrows();col++) {
+ if(mAtV->GetRowIndexArray()[col]==
+ mAtV->GetRowIndexArray()[col+1]) {
+ TString binlist("no data to constrain output bin ");
+ binlist += GetOutputBinName(fXToHist[col]);
+ /* binlist +=" depends on ignored input bins ";
+ for(Int_t row=0;row<fA->GetNrows();row++) {
+ if(dataVyyDiag[row]>0.0) continue;
+ for(Int_t i=a_rows[row];i<a_rows[row+1];i++) {
+ if(a_cols[i]!=col) continue;
+ binlist +=" ";
+ binlist +=row;
+ }
+ } */
+ Warning("SetInput","%s",binlist.Data());
+ }
+ }
+ }
+ if(nError2>1) {
+ Error("SetInput","%d/%d output bins are not constrained by any data.",
+ nError2,mAtV->GetNrows());
+ } else {
+ Error("SetInput","One output bins is not constrained by any data.");
+ }
+ }
+ DeleteMatrix(&mAtV);
+
+ delete[] dataVyyDiag;
+
+ return nError+10000*nError2;
}
Double_t TUnfold::DoUnfold(Double_t tau)
@@ -2442,352 +2442,352 @@ Double_t TUnfold::DoUnfold(Double_t tau)
Int_t TUnfold::ScanLcurve(Int_t nPoint,
Double_t tauMin,Double_t tauMax,
- TGraph **lCurve,TSpline **logTauX,
- TSpline **logTauY)
+ TGraph **lCurve,TSpline **logTauX,
+ TSpline **logTauY)
{
- // scan the L curve
- // nPoint: number of points on the resulting curve
- // tauMin: smallest tau value to study
- // tauMax: largest tau value to study
- // lCurve: the L curve as graph
- // logTauX: output spline of x-coordinates vs tau for the L curve
- // logTauY: output spline of y-coordinates vs tau for the L curve
- // return value: the coordinate number (0..nPoint-1) with the "best" choice
- // of tau
- typedef std::map<Double_t,std::pair<Double_t,Double_t> > XYtau_t;
- XYtau_t curve;
-
- //==========================================================
- // algorithm:
- // (1) do the unfolding for nPoint-1 points
- // and store the results in the map
- // curve
- // (1a) store minimum and maximum tau to curve
- // (1b) insert additional points, until nPoint-1 values
- // have been calculated
- //
- // (2) determine the best choice of tau
- // do the unfolding for this point
- // and store the result in
- // curve
- // (3) return the result in
- // lCurve logTauX logTauY
-
- //==========================================================
- // (1) do the unfolding for nPoint-1 points
- // and store the results in
- // curve
- // (1a) store minimum and maximum tau to curve
-
- if((tauMin<=0)||(tauMax<=0.0)||(tauMin>=tauMax)) {
- // here no range is given, has to be determined automatically
- // the maximum tau is determined from the chi**2 values
- // observed from unfolding without regulatisation
-
- // first unfolding, without regularisation
- DoUnfold(0.0);
-
- // if the number of degrees of freedom is too small, create an error
- if(GetNdf()<=0) {
- Error("ScanLcurve","too few input bins, NDF<=0 %d",GetNdf());
- }
-
- Double_t x0=GetLcurveX();
- Double_t y0=GetLcurveY();
- Info("ScanLcurve","logtau=-Infinity X=%lf Y=%lf",x0,y0);
- if(!TMath::Finite(x0)) {
- Fatal("ScanLcurve","problem (too few input bins?) X=%f",x0);
- }
- if(!TMath::Finite(y0)) {
- Fatal("ScanLcurve","problem (missing regularisation?) Y=%f",y0);
- }
- {
- // unfolding guess maximum tau and store it
- Double_t logTau=
- 0.5*(TMath::Log10(fChi2A+3.*TMath::Sqrt(GetNdf()+1.0))
- -GetLcurveY());
- DoUnfold(TMath::Power(10.,logTau));
- if((!TMath::Finite(GetLcurveX())) ||(!TMath::Finite(GetLcurveY()))) {
- Fatal("ScanLcurve","problem (missing regularisation?) X=%f Y=%f",
- GetLcurveX(),GetLcurveY());
- }
- curve[logTau]=std::make_pair(GetLcurveX(),GetLcurveY());
- Info("ScanLcurve","logtau=%lf X=%lf Y=%lf",
- logTau,GetLcurveX(),GetLcurveY());
- }
- if((*curve.begin()).second.first<x0) {
- // if the point at tau==0 seems numerically unstable,
- // try to find the minimum chi**2 as start value
- //
- // "unstable" means that there is a finite tau where the
- // unfolding chi**2 is smaller than for the case of no
- // regularisation. Ideally this should never happen
- do {
- x0=GetLcurveX();
- Double_t logTau=(*curve.begin()).first-0.5;
- DoUnfold(TMath::Power(10.,logTau));
- if((!TMath::Finite(GetLcurveX())) ||(!TMath::Finite(GetLcurveY()))) {
- Fatal("ScanLcurve","problem (missing regularisation?) X=%f Y=%f",
- GetLcurveX(),GetLcurveY());
- }
- curve[logTau]=std::make_pair(GetLcurveX(),GetLcurveY());
- Info("ScanLcurve","logtau=%lf X=%lf Y=%lf",
- logTau,GetLcurveX(),GetLcurveY());
- }
- while(((int)curve.size()<(nPoint-1)/2)&&
- ((*curve.begin()).second.first<x0));
- } else {
- // minimum tau is chosen such that is less than
- // 1% different from the case of no regularusation
- // log10(1.01) = 0.00432
-
- // here, more than one point are inserted if necessary
- while(((int)curve.size()<nPoint-1)&&
- (((*curve.begin()).second.first-x0>0.00432)||
- ((*curve.begin()).second.second-y0>0.00432)||
- (curve.size()<2))) {
- Double_t logTau=(*curve.begin()).first-0.5;
- DoUnfold(TMath::Power(10.,logTau));
- if((!TMath::Finite(GetLcurveX())) ||(!TMath::Finite(GetLcurveY()))) {
- Fatal("ScanLcurve","problem (missing regularisation?) X=%f Y=%f",
- GetLcurveX(),GetLcurveY());
- }
- curve[logTau]=std::make_pair(GetLcurveX(),GetLcurveY());
- Info("ScanLcurve","logtau=%lf X=%lf Y=%lf",
- logTau,GetLcurveX(),GetLcurveY());
- }
- }
- } else {
- Double_t logTauMin=TMath::Log10(tauMin);
- Double_t logTauMax=TMath::Log10(tauMax);
- if(nPoint>1) {
- // insert maximum tau
- DoUnfold(TMath::Power(10.,logTauMax));
- if((!TMath::Finite(GetLcurveX())) ||(!TMath::Finite(GetLcurveY()))) {
- Fatal("ScanLcurve","problem (missing regularisation?) X=%f Y=%f",
- GetLcurveX(),GetLcurveY());
- }
- Info("ScanLcurve","logtau=%lf X=%lf Y=%lf",
- logTauMax,GetLcurveX(),GetLcurveY());
- curve[logTauMax]=std::make_pair(GetLcurveX(),GetLcurveY());
- }
- // insert minimum tau
- DoUnfold(TMath::Power(10.,logTauMin));
- if((!TMath::Finite(GetLcurveX())) ||(!TMath::Finite(GetLcurveY()))) {
- Fatal("ScanLcurve","problem (missing regularisation?) X=%f Y=%f",
- GetLcurveX(),GetLcurveY());
- }
- Info("ScanLcurve","logtau=%lf X=%lf Y=%lf",
- logTauMin,GetLcurveX(),GetLcurveY());
- curve[logTauMin]=std::make_pair(GetLcurveX(),GetLcurveY());
- }
-
-
- //==========================================================
- // (1b) insert additional points, until nPoint-1 values
- // have been calculated
-
- while(int(curve.size())<nPoint-1) {
- // insert additional points, such that the sizes of the delta(XY) vectors
- // are getting smaller and smaller
- XYtau_t::const_iterator i0,i1;
- i0=curve.begin();
- i1=i0;
- Double_t logTau=(*i0).first;
- Double_t distMax=0.0;
- for(i1++;i1!=curve.end();i1++) {
- const std::pair<Double_t,Double_t> &xy0=(*i0).second;
- const std::pair<Double_t,Double_t> &xy1=(*i1).second;
- Double_t dx=xy1.first-xy0.first;
- Double_t dy=xy1.second-xy0.second;
- Double_t d=TMath::Sqrt(dx*dx+dy*dy);
- if(d>=distMax) {
- distMax=d;
- logTau=0.5*((*i0).first+(*i1).first);
- }
- i0=i1;
- }
- DoUnfold(TMath::Power(10.,logTau));
- if((!TMath::Finite(GetLcurveX())) ||(!TMath::Finite(GetLcurveY()))) {
- Fatal("ScanLcurve","problem (missing regularisation?) X=%f Y=%f",
- GetLcurveX(),GetLcurveY());
- }
- Info("ScanLcurve","logtau=%lf X=%lf Y=%lf",logTau,GetLcurveX(),GetLcurveY());
- curve[logTau]=std::make_pair(GetLcurveX(),GetLcurveY());
- }
-
- //==========================================================
- // (2) determine the best choice of tau
- // do the unfolding for this point
- // and store the result in
- // curve
- XYtau_t::const_iterator i0,i1;
- i0=curve.begin();
- i1=i0;
- i1++;
- Double_t logTauFin=(*i0).first;
- if( ((int)curve.size())<nPoint) {
- // set up splines and determine (x,y) curvature in each point
- Double_t *cTi=new Double_t[curve.size()-1];
- Double_t *cCi=new Double_t[curve.size()-1];
- Int_t n=0;
- {
- Double_t *lXi=new Double_t[curve.size()];
- Double_t *lYi=new Double_t[curve.size()];
- Double_t *lTi=new Double_t[curve.size()];
- for( XYtau_t::const_iterator i=curve.begin();i!=curve.end();i++) {
- lXi[n]=(*i).second.first;
- lYi[n]=(*i).second.second;
- lTi[n]=(*i).first;
- n++;
- }
- TSpline3 *splineX=new TSpline3("x vs tau",lTi,lXi,n);
- TSpline3 *splineY=new TSpline3("y vs tau",lTi,lYi,n);
- // calculate (x,y) curvature for all points
- // the curvature is stored in the array cCi[] as a function of cTi[]
- for(Int_t i=0;i<n-1;i++) {
- Double_t ltau,xy,bi,ci,di;
- splineX->GetCoeff(i,ltau,xy,bi,ci,di);
- Double_t tauBar=0.5*(lTi[i]+lTi[i+1]);
- Double_t dTau=0.5*(lTi[i+1]-lTi[i]);
- Double_t dx1=bi+dTau*(2.*ci+3.*di*dTau);
- Double_t dx2=2.*ci+6.*di*dTau;
- splineY->GetCoeff(i,ltau,xy,bi,ci,di);
- Double_t dy1=bi+dTau*(2.*ci+3.*di*dTau);
- Double_t dy2=2.*ci+6.*di*dTau;
- cTi[i]=tauBar;
- cCi[i]=(dy2*dx1-dy1*dx2)/TMath::Power(dx1*dx1+dy1*dy1,1.5);
- }
- delete splineX;
- delete splineY;
- delete[] lXi;
- delete[] lYi;
- delete[] lTi;
- }
- // create curvature Spline
- TSpline3 *splineC=new TSpline3("L curve curvature",cTi,cCi,n-1);
- // find the maximum of the curvature
- // if the parameter iskip is non-zero, then iskip points are
- // ignored when looking for the largest curvature
- // (there are problems with the curvature determined from the first
- // few points of splineX,splineY in the algorithm above)
- Int_t iskip=0;
- if(n>4) iskip=1;
- if(n>7) iskip=2;
- Double_t cCmax=cCi[iskip];
- Double_t cTmax=cTi[iskip];
- for(Int_t i=iskip;i<n-2-iskip;i++) {
- // find maximum on this spline section
- // check boundary conditions for x[i+1]
- Double_t xMax=cTi[i+1];
- Double_t yMax=cCi[i+1];
- if(cCi[i]>yMax) {
- yMax=cCi[i];
- xMax=cTi[i];
- }
- // find maximum for x[i]<x<x[i+1]
- // get spline coefficiencts and solve equation
- // derivative(x)==0
- Double_t x,y,b,c,d;
- splineC->GetCoeff(i,x,y,b,c,d);
- // coefficiencts of quadratic equation
- Double_t m_p_half=-c/(3.*d);
- Double_t q=b/(3.*d);
- Double_t discr=m_p_half*m_p_half-q;
- if(discr>=0.0) {
- // solution found
- discr=TMath::Sqrt(discr);
- Double_t xx;
- if(m_p_half>0.0) {
- xx = m_p_half + discr;
- } else {
- xx = m_p_half - discr;
- }
- Double_t dx=cTi[i+1]-x;
- // check first solution
- if((xx>0.0)&&(xx<dx)) {
- y=splineC->Eval(x+xx);
- if(y>yMax) {
- yMax=y;
- xMax=x+xx;
- }
- }
- // second solution
- if(xx !=0.0) {
- xx= q/xx;
- } else {
- xx=0.0;
- }
- // check second solution
- if((xx>0.0)&&(xx<dx)) {
- y=splineC->Eval(x+xx);
- if(y>yMax) {
- yMax=y;
- xMax=x+xx;
- }
- }
- }
- // check whether this local minimum is a global minimum
- if(yMax>cCmax) {
- cCmax=yMax;
- cTmax=xMax;
- }
- }
+ // scan the L curve
+ // nPoint: number of points on the resulting curve
+ // tauMin: smallest tau value to study
+ // tauMax: largest tau value to study
+ // lCurve: the L curve as graph
+ // logTauX: output spline of x-coordinates vs tau for the L curve
+ // logTauY: output spline of y-coordinates vs tau for the L curve
+ // return value: the coordinate number (0..nPoint-1) with the "best" choice
+ // of tau
+ typedef std::map<Double_t,std::pair<Double_t,Double_t> > XYtau_t;
+ XYtau_t curve;
+
+ //==========================================================
+ // algorithm:
+ // (1) do the unfolding for nPoint-1 points
+ // and store the results in the map
+ // curve
+ // (1a) store minimum and maximum tau to curve
+ // (1b) insert additional points, until nPoint-1 values
+ // have been calculated
+ //
+ // (2) determine the best choice of tau
+ // do the unfolding for this point
+ // and store the result in
+ // curve
+ // (3) return the result in
+ // lCurve logTauX logTauY
+
+ //==========================================================
+ // (1) do the unfolding for nPoint-1 points
+ // and store the results in
+ // curve
+ // (1a) store minimum and maximum tau to curve
+
+ if((tauMin<=0)||(tauMax<=0.0)||(tauMin>=tauMax)) {
+ // here no range is given, has to be determined automatically
+ // the maximum tau is determined from the chi**2 values
+ // observed from unfolding without regulatisation
+
+ // first unfolding, without regularisation
+ DoUnfold(0.0);
+
+ // if the number of degrees of freedom is too small, create an error
+ if(GetNdf()<=0) {
+ Error("ScanLcurve","too few input bins, NDF<=0 %d",GetNdf());
+ }
+
+ Double_t x0=GetLcurveX();
+ Double_t y0=GetLcurveY();
+ Info("ScanLcurve","logtau=-Infinity X=%lf Y=%lf",x0,y0);
+ if(!TMath::Finite(x0)) {
+ Fatal("ScanLcurve","problem (too few input bins?) X=%f",x0);
+ }
+ if(!TMath::Finite(y0)) {
+ Fatal("ScanLcurve","problem (missing regularisation?) Y=%f",y0);
+ }
+ {
+ // unfolding guess maximum tau and store it
+ Double_t logTau=
+ 0.5*(TMath::Log10(fChi2A+3.*TMath::Sqrt(GetNdf()+1.0))
+ -GetLcurveY());
+ DoUnfold(TMath::Power(10.,logTau));
+ if((!TMath::Finite(GetLcurveX())) ||(!TMath::Finite(GetLcurveY()))) {
+ Fatal("ScanLcurve","problem (missing regularisation?) X=%f Y=%f",
+ GetLcurveX(),GetLcurveY());
+ }
+ curve[logTau]=std::make_pair(GetLcurveX(),GetLcurveY());
+ Info("ScanLcurve","logtau=%lf X=%lf Y=%lf",
+ logTau,GetLcurveX(),GetLcurveY());
+ }
+ if((*curve.begin()).second.first<x0) {
+ // if the point at tau==0 seems numerically unstable,
+ // try to find the minimum chi**2 as start value
+ //
+ // "unstable" means that there is a finite tau where the
+ // unfolding chi**2 is smaller than for the case of no
+ // regularisation. Ideally this should never happen
+ do {
+ x0=GetLcurveX();
+ Double_t logTau=(*curve.begin()).first-0.5;
+ DoUnfold(TMath::Power(10.,logTau));
+ if((!TMath::Finite(GetLcurveX())) ||(!TMath::Finite(GetLcurveY()))) {
+ Fatal("ScanLcurve","problem (missing regularisation?) X=%f Y=%f",
+ GetLcurveX(),GetLcurveY());
+ }
+ curve[logTau]=std::make_pair(GetLcurveX(),GetLcurveY());
+ Info("ScanLcurve","logtau=%lf X=%lf Y=%lf",
+ logTau,GetLcurveX(),GetLcurveY());
+ }
+ while(((int)curve.size()<(nPoint-1)/2)&&
+ ((*curve.begin()).second.first<x0));
+ } else {
+ // minimum tau is chosen such that is less than
+ // 1% different from the case of no regularusation
+ // log10(1.01) = 0.00432
+
+ // here, more than one point are inserted if necessary
+ while(((int)curve.size()<nPoint-1)&&
+ (((*curve.begin()).second.first-x0>0.00432)||
+ ((*curve.begin()).second.second-y0>0.00432)||
+ (curve.size()<2))) {
+ Double_t logTau=(*curve.begin()).first-0.5;
+ DoUnfold(TMath::Power(10.,logTau));
+ if((!TMath::Finite(GetLcurveX())) ||(!TMath::Finite(GetLcurveY()))) {
+ Fatal("ScanLcurve","problem (missing regularisation?) X=%f Y=%f",
+ GetLcurveX(),GetLcurveY());
+ }
+ curve[logTau]=std::make_pair(GetLcurveX(),GetLcurveY());
+ Info("ScanLcurve","logtau=%lf X=%lf Y=%lf",
+ logTau,GetLcurveX(),GetLcurveY());
+ }
+ }
+ } else {
+ Double_t logTauMin=TMath::Log10(tauMin);
+ Double_t logTauMax=TMath::Log10(tauMax);
+ if(nPoint>1) {
+ // insert maximum tau
+ DoUnfold(TMath::Power(10.,logTauMax));
+ if((!TMath::Finite(GetLcurveX())) ||(!TMath::Finite(GetLcurveY()))) {
+ Fatal("ScanLcurve","problem (missing regularisation?) X=%f Y=%f",
+ GetLcurveX(),GetLcurveY());
+ }
+ Info("ScanLcurve","logtau=%lf X=%lf Y=%lf",
+ logTauMax,GetLcurveX(),GetLcurveY());
+ curve[logTauMax]=std::make_pair(GetLcurveX(),GetLcurveY());
+ }
+ // insert minimum tau
+ DoUnfold(TMath::Power(10.,logTauMin));
+ if((!TMath::Finite(GetLcurveX())) ||(!TMath::Finite(GetLcurveY()))) {
+ Fatal("ScanLcurve","problem (missing regularisation?) X=%f Y=%f",
+ GetLcurveX(),GetLcurveY());
+ }
+ Info("ScanLcurve","logtau=%lf X=%lf Y=%lf",
+ logTauMin,GetLcurveX(),GetLcurveY());
+ curve[logTauMin]=std::make_pair(GetLcurveX(),GetLcurveY());
+ }
+
+
+ //==========================================================
+ // (1b) insert additional points, until nPoint-1 values
+ // have been calculated
+
+ while(int(curve.size())<nPoint-1) {
+ // insert additional points, such that the sizes of the delta(XY) vectors
+ // are getting smaller and smaller
+ XYtau_t::const_iterator i0,i1;
+ i0=curve.begin();
+ i1=i0;
+ Double_t logTau=(*i0).first;
+ Double_t distMax=0.0;
+ for(i1++;i1!=curve.end();i1++) {
+ const std::pair<Double_t,Double_t> &xy0=(*i0).second;
+ const std::pair<Double_t,Double_t> &xy1=(*i1).second;
+ Double_t dx=xy1.first-xy0.first;
+ Double_t dy=xy1.second-xy0.second;
+ Double_t d=TMath::Sqrt(dx*dx+dy*dy);
+ if(d>=distMax) {
+ distMax=d;
+ logTau=0.5*((*i0).first+(*i1).first);
+ }
+ i0=i1;
+ }
+ DoUnfold(TMath::Power(10.,logTau));
+ if((!TMath::Finite(GetLcurveX())) ||(!TMath::Finite(GetLcurveY()))) {
+ Fatal("ScanLcurve","problem (missing regularisation?) X=%f Y=%f",
+ GetLcurveX(),GetLcurveY());
+ }
+ Info("ScanLcurve","logtau=%lf X=%lf Y=%lf",logTau,GetLcurveX(),GetLcurveY());
+ curve[logTau]=std::make_pair(GetLcurveX(),GetLcurveY());
+ }
+
+ //==========================================================
+ // (2) determine the best choice of tau
+ // do the unfolding for this point
+ // and store the result in
+ // curve
+ XYtau_t::const_iterator i0,i1;
+ i0=curve.begin();
+ i1=i0;
+ i1++;
+ Double_t logTauFin=(*i0).first;
+ if( ((int)curve.size())<nPoint) {
+ // set up splines and determine (x,y) curvature in each point
+ Double_t *cTi=new Double_t[curve.size()-1];
+ Double_t *cCi=new Double_t[curve.size()-1];
+ Int_t n=0;
+ {
+ Double_t *lXi=new Double_t[curve.size()];
+ Double_t *lYi=new Double_t[curve.size()];
+ Double_t *lTi=new Double_t[curve.size()];
+ for( XYtau_t::const_iterator i=curve.begin();i!=curve.end();i++) {
+ lXi[n]=(*i).second.first;
+ lYi[n]=(*i).second.second;
+ lTi[n]=(*i).first;
+ n++;
+ }
+ TSpline3 *splineX=new TSpline3("x vs tau",lTi,lXi,n);
+ TSpline3 *splineY=new TSpline3("y vs tau",lTi,lYi,n);
+ // calculate (x,y) curvature for all points
+ // the curvature is stored in the array cCi[] as a function of cTi[]
+ for(Int_t i=0;i<n-1;i++) {
+ Double_t ltau,xy,bi,ci,di;
+ splineX->GetCoeff(i,ltau,xy,bi,ci,di);
+ Double_t tauBar=0.5*(lTi[i]+lTi[i+1]);
+ Double_t dTau=0.5*(lTi[i+1]-lTi[i]);
+ Double_t dx1=bi+dTau*(2.*ci+3.*di*dTau);
+ Double_t dx2=2.*ci+6.*di*dTau;
+ splineY->GetCoeff(i,ltau,xy,bi,ci,di);
+ Double_t dy1=bi+dTau*(2.*ci+3.*di*dTau);
+ Double_t dy2=2.*ci+6.*di*dTau;
+ cTi[i]=tauBar;
+ cCi[i]=(dy2*dx1-dy1*dx2)/TMath::Power(dx1*dx1+dy1*dy1,1.5);
+ }
+ delete splineX;
+ delete splineY;
+ delete[] lXi;
+ delete[] lYi;
+ delete[] lTi;
+ }
+ // create curvature Spline
+ TSpline3 *splineC=new TSpline3("L curve curvature",cTi,cCi,n-1);
+ // find the maximum of the curvature
+ // if the parameter iskip is non-zero, then iskip points are
+ // ignored when looking for the largest curvature
+ // (there are problems with the curvature determined from the first
+ // few points of splineX,splineY in the algorithm above)
+ Int_t iskip=0;
+ if(n>4) iskip=1;
+ if(n>7) iskip=2;
+ Double_t cCmax=cCi[iskip];
+ Double_t cTmax=cTi[iskip];
+ for(Int_t i=iskip;i<n-2-iskip;i++) {
+ // find maximum on this spline section
+ // check boundary conditions for x[i+1]
+ Double_t xMax=cTi[i+1];
+ Double_t yMax=cCi[i+1];
+ if(cCi[i]>yMax) {
+ yMax=cCi[i];
+ xMax=cTi[i];
+ }
+ // find maximum for x[i]<x<x[i+1]
+ // get spline coefficiencts and solve equation
+ // derivative(x)==0
+ Double_t x,y,b,c,d;
+ splineC->GetCoeff(i,x,y,b,c,d);
+ // coefficiencts of quadratic equation
+ Double_t m_p_half=-c/(3.*d);
+ Double_t q=b/(3.*d);
+ Double_t discr=m_p_half*m_p_half-q;
+ if(discr>=0.0) {
+ // solution found
+ discr=TMath::Sqrt(discr);
+ Double_t xx;
+ if(m_p_half>0.0) {
+ xx = m_p_half + discr;
+ } else {
+ xx = m_p_half - discr;
+ }
+ Double_t dx=cTi[i+1]-x;
+ // check first solution
+ if((xx>0.0)&&(xx<dx)) {
+ y=splineC->Eval(x+xx);
+ if(y>yMax) {
+ yMax=y;
+ xMax=x+xx;
+ }
+ }
+ // second solution
+ if(xx !=0.0) {
+ xx= q/xx;
+ } else {
+ xx=0.0;
+ }
+ // check second solution
+ if((xx>0.0)&&(xx<dx)) {
+ y=splineC->Eval(x+xx);
+ if(y>yMax) {
+ yMax=y;
+ xMax=x+xx;
+ }
+ }
+ }
+ // check whether this local minimum is a global minimum
+ if(yMax>cCmax) {
+ cCmax=yMax;
+ cTmax=xMax;
+ }
+ }
#ifdef DEBUG_LCURVE
- {
- TCanvas lcc;
- lcc.Divide(1,1);
- lcc.cd(1);
- splineC->Draw();
- lcc.SaveAs("splinec.ps");
- }
+ {
+ TCanvas lcc;
+ lcc.Divide(1,1);
+ lcc.cd(1);
+ splineC->Draw();
+ lcc.SaveAs("splinec.ps");
+ }
#endif
- delete splineC;
- delete[] cTi;
- delete[] cCi;
- logTauFin=cTmax;
- DoUnfold(TMath::Power(10.,logTauFin));
- if((!TMath::Finite(GetLcurveX())) ||(!TMath::Finite(GetLcurveY()))) {
- Fatal("ScanLcurve","problem (missing regularisation?) X=%f Y=%f",
- GetLcurveX(),GetLcurveY());
- }
- Info("ScanLcurve","Result logtau=%lf X=%lf Y=%lf",
- logTauFin,GetLcurveX(),GetLcurveY());
- curve[logTauFin]=std::make_pair(GetLcurveX(),GetLcurveY());
- }
-
-
- //==========================================================
- // (3) return the result in
- // lCurve logTauX logTauY
-
- Int_t bestChoice=-1;
- if(curve.size()>0) {
- Double_t *x=new Double_t[curve.size()];
- Double_t *y=new Double_t[curve.size()];
- Double_t *logT=new Double_t[curve.size()];
- int n=0;
- for( XYtau_t::const_iterator i=curve.begin();i!=curve.end();i++) {
- if(logTauFin==(*i).first) {
- bestChoice=n;
- }
- x[n]=(*i).second.first;
- y[n]=(*i).second.second;
- logT[n]=(*i).first;
- n++;
- }
- if(lCurve) {
- (*lCurve)=new TGraph(n,x,y);
- (*lCurve)->SetTitle("L curve");
- }
- if(logTauX) (*logTauX)=new TSpline3("log(chi**2)%log(tau)",logT,x,n);
- if(logTauY) (*logTauY)=new TSpline3("log(reg.cond)%log(tau)",logT,y,n);
- delete[] x;
- delete[] y;
- delete[] logT;
- }
-
- return bestChoice;
+ delete splineC;
+ delete[] cTi;
+ delete[] cCi;
+ logTauFin=cTmax;
+ DoUnfold(TMath::Power(10.,logTauFin));
+ if((!TMath::Finite(GetLcurveX())) ||(!TMath::Finite(GetLcurveY()))) {
+ Fatal("ScanLcurve","problem (missing regularisation?) X=%f Y=%f",
+ GetLcurveX(),GetLcurveY());
+ }
+ Info("ScanLcurve","Result logtau=%lf X=%lf Y=%lf",
+ logTauFin,GetLcurveX(),GetLcurveY());
+ curve[logTauFin]=std::make_pair(GetLcurveX(),GetLcurveY());
+ }
+
+
+ //==========================================================
+ // (3) return the result in
+ // lCurve logTauX logTauY
+
+ Int_t bestChoice=-1;
+ if(curve.size()>0) {
+ Double_t *x=new Double_t[curve.size()];
+ Double_t *y=new Double_t[curve.size()];
+ Double_t *logT=new Double_t[curve.size()];
+ int n=0;
+ for( XYtau_t::const_iterator i=curve.begin();i!=curve.end();i++) {
+ if(logTauFin==(*i).first) {
+ bestChoice=n;
+ }
+ x[n]=(*i).second.first;
+ y[n]=(*i).second.second;
+ logT[n]=(*i).first;
+ n++;
+ }
+ if(lCurve) {
+ (*lCurve)=new TGraph(n,x,y);
+ (*lCurve)->SetTitle("L curve");
+ }
+ if(logTauX) (*logTauX)=new TSpline3("log(chi**2)%log(tau)",logT,x,n);
+ if(logTauY) (*logTauY)=new TSpline3("log(reg.cond)%log(tau)",logT,y,n);
+ delete[] x;
+ delete[] y;
+ delete[] logT;
+ }
+
+ return bestChoice;
}
void TUnfold::GetNormalisationVector(TH1 *out,const Int_t *binMap) const
@@ -2843,7 +2843,7 @@ void TUnfold::GetFoldedOutput(TH1 *out,const Int_t *binMap) const
// ...
ClearHistogram(out);
-
+
TMatrixDSparse *AVxx=MultiplyMSparseMSparse(fA,fVxx);
const Int_t *rows_A=fA->GetRowIndexArray();
@@ -2852,7 +2852,7 @@ void TUnfold::GetFoldedOutput(TH1 *out,const Int_t *binMap) const
const Int_t *rows_AVxx=AVxx->GetRowIndexArray();
const Int_t *cols_AVxx=AVxx->GetColIndexArray();
const Double_t *data_AVxx=AVxx->GetMatrixArray();
-
+
for (Int_t i = 0; i < GetNy(); i++) {
Int_t destI = binMap ? binMap[i+1] : i+1;
if(destI<0) continue;
@@ -2935,7 +2935,7 @@ void TUnfold::GetInput(TH1 *out,const Int_t *binMap) const
void TUnfold::GetInputInverseEmatrix(TH2 *out)
{
- // calculate the inverse of the contribution to the error matrix
+ // calculate the inverse of the contribution to the error matrix
// corresponding to the input data
if(!fVyyInv) {
Int_t rank=0;
@@ -2986,8 +2986,8 @@ void TUnfold::GetLsquared(TH2 *out) const
const Double_t *data=lSquared->GetMatrixArray();
for (Int_t i = 0; i < GetNx(); i++) {
for (Int_t cindex = rows[i]; cindex < rows[i+1]; cindex++) {
- Int_t j=cols[cindex];
- out->SetBinContent(fXToHist[i], fXToHist[j],data[cindex]);
+ Int_t j=cols[cindex];
+ out->SetBinContent(fXToHist[i], fXToHist[j],data[cindex]);
}
}
DeleteMatrix(&lSquared);
@@ -3004,9 +3004,9 @@ void TUnfold::GetL(TH2 *out) const
const Double_t *data=fL->GetMatrixArray();
for (Int_t row = 0; row < GetNr(); row++) {
for (Int_t cindex = rows[row]; cindex < rows[row+1]; cindex++) {
- Int_t col=cols[cindex];
- Int_t indexH=fXToHist[col];
- out->SetBinContent(indexH,row+1,data[cindex]);
+ Int_t col=cols[cindex];
+ Int_t indexH=fXToHist[col];
+ out->SetBinContent(indexH,row+1,data[cindex]);
}
}
}
@@ -3039,14 +3039,14 @@ Int_t TUnfold::GetNpar(void) const
Double_t TUnfold::GetLcurveX(void) const
{
- // return value on x axis of L curve
- return TMath::Log10(fChi2A);
+ // return value on x axis of L curve
+ return TMath::Log10(fChi2A);
}
Double_t TUnfold::GetLcurveY(void) const
{
- // return value on y axis of L curve
- return TMath::Log10(fLXsquared);
+ // return value on y axis of L curve
+ return TMath::Log10(fLXsquared);
}
void TUnfold::GetOutput(TH1 *output,const Int_t *binMap) const
@@ -3059,15 +3059,15 @@ void TUnfold::GetOutput(TH1 *output,const Int_t *binMap) const
// binMap[0] : destination of underflow bin
// binMap[1] : destination of first bin
// ...
-
+
ClearHistogram(output);
/* Int_t nbin=output->GetNbinsX();
- Double_t *c=new Double_t[nbin+2];
- Double_t *e2=new Double_t[nbin+2];
- for(Int_t i=0;i<nbin+2;i++) {
- c[i]=0.0;
- e2[i]=0.0;
- } */
+ Double_t *c=new Double_t[nbin+2];
+ Double_t *e2=new Double_t[nbin+2];
+ for(Int_t i=0;i<nbin+2;i++) {
+ c[i]=0.0;
+ e2[i]=0.0;
+ } */
std::map<Int_t,Double_t> e2;
@@ -3081,7 +3081,7 @@ void TUnfold::GetOutput(TH1 *output,const Int_t *binMap) const
Int_t srcBinI=fHistToX[i]; // matrix row index
if((destBinI>=0)&&(srcBinI>=0)) {
output->SetBinContent
- (destBinI, (*fX)(srcBinI,0)+ output->GetBinContent(destBinI));
+ (destBinI, (*fX)(srcBinI,0)+ output->GetBinContent(destBinI));
// here we loop over the columns of the error matrix
// j: counts histogram bins
// index: counts sparse matrix index
@@ -3179,7 +3179,7 @@ void TUnfold::ErrorMatrixToHist(TH2 *ematrix,const TMatrixDSparse *emat,
} else {
// add this bin
Double_t e2= ematrix->GetBinContent(destBinI,destBinJ)
- + data_emat[index_vxx];
+ + data_emat[index_vxx];
ematrix->SetBinContent(destBinI,destBinJ,e2);
j++;
index_vxx++;
@@ -3215,7 +3215,7 @@ void TUnfold::GetRhoIJ(TH2 *rhoij,const Int_t *binMap) const
// binMap[1] : destination of first bin
// ...
GetEmatrix(rhoij,binMap);
- Int_t nbin=rhoij->GetNbinsX();
+ Int_t nbin=rhoij->GetNbinsX();
Double_t *e=new Double_t[nbin+2];
for(Int_t i=0;i<nbin+2;i++) {
e[i]=TMath::Sqrt(rhoij->GetBinContent(i,i));
@@ -3261,7 +3261,7 @@ Double_t TUnfold::GetRhoI(TH1 *rhoi,const Int_t *binMap,TH2 *invEmat) const
const Int_t *rows_VxxInv=fVxxInv->GetRowIndexArray();
const Int_t *cols_VxxInv=fVxxInv->GetColIndexArray();
const Double_t *data_VxxInv=fVxxInv->GetMatrixArray();
-
+
for(Int_t i=0;i<GetNx();i++) {
Int_t destI=fXToHist[i];
Double_t e_ii=0.0,einv_ii=0.0;
@@ -3403,7 +3403,7 @@ Double_t TUnfold::GetRhoIFromMatrix(TH1 *rhoi,const TMatrixDSparse *eOrig,
//std::cout<<i<<" "<<localBinToHist[i]<<" "<<rho<<"\n";
rhoi->SetBinContent(localBinToHist[i],rho);
}
-
+
DeleteMatrix(&einvSparse);
delete [] localBinToHist;
}
diff --git a/hist/hist/src/TUnfoldBinning.cxx b/hist/hist/src/TUnfoldBinning.cxx
index 7d98048f32c..5c6b67c35d4 100644
--- a/hist/hist/src/TUnfoldBinning.cxx
+++ b/hist/hist/src/TUnfoldBinning.cxx
@@ -39,21 +39,21 @@
//////////////////////////////////////////////////////////////////////////
/*
- This file is part of TUnfold.
+ This file is part of TUnfold.
- TUnfold is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+ TUnfold is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- TUnfold is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ TUnfold is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with TUnfold. If not, see <http://www.gnu.org/licenses/>.
-*/
+ You should have received a copy of the GNU General Public License
+ along with TUnfold. If not, see <http://www.gnu.org/licenses/>.
+ */
#include "TUnfoldBinning.h"
@@ -80,7 +80,7 @@ ClassImp(TUnfoldBinning)
void TUnfoldBinning::Initialize(Int_t nBins)
{
- // initialize variables
+ // initialize variables
parentNode=0;
childNode=0;
nextNode=0;
@@ -111,18 +111,18 @@ Int_t TUnfoldBinning::UpdateFirstLastBin(Bool_t startWithRootNode)
// if this is the first node in a sequence but has a parent,
// start with the end bin of the parent's distribution
fFirstBin=GetParentNode()->GetStartBin()+
- GetParentNode()->GetDistributionNumberOfBins();
+ GetParentNode()->GetDistributionNumberOfBins();
} else {
// if this is the top level node, the first bin number is 1
- fFirstBin=1;
- // ... unless the top level node is the only node
- // ... with dimension=1
- // ... and there are no child nodes
- // ... and there is an underflow bin
- if((!GetChildNode())&&(GetDistributionDimension()==1)&&
- (fHasUnderflow==1)) {
- fFirstBin=0;
- }
+ fFirstBin=1;
+ // ... unless the top level node is the only node
+ // ... with dimension=1
+ // ... and there are no child nodes
+ // ... and there is an underflow bin
+ if((!GetChildNode())&&(GetDistributionDimension()==1)&&
+ (fHasUnderflow==1)) {
+ fFirstBin=0;
+ }
}
fLastBin=fFirstBin+fDistributionSize;
// now update count for all children
@@ -134,7 +134,7 @@ Int_t TUnfoldBinning::UpdateFirstLastBin(Bool_t startWithRootNode)
TUnfoldBinning::TUnfoldBinning
(const char *name,Int_t nBins,const char *binNames)
- : TNamed(name ? name : "",name ? name : "")
+: TNamed(name ? name : "",name ? name : "")
{
// initialize a node with bins but without axis
// name: name of the node
@@ -151,7 +151,7 @@ TUnfoldBinning::TUnfoldBinning
TUnfoldBinning::TUnfoldBinning
(const TAxis &axis,Int_t includeUnderflow,Int_t includeOverflow)
- : TNamed(axis.GetName(),axis.GetTitle())
+: TNamed(axis.GetName(),axis.GetTitle())
{
// create binning containing a distribution with one axis
// axis: the axis to represent
@@ -172,92 +172,92 @@ TUnfoldBinning::~TUnfoldBinning(void)
}
if(GetPrevNode()) prevNode->nextNode=nextNode;
if(GetNextNode()) nextNode->prevNode=prevNode;
- delete fAxisList;
- delete fAxisLabelList;
+ delete fAxisList;
+ delete fAxisLabelList;
}
TUnfoldBinning *TUnfoldBinning::AddBinning
(const char *name,Int_t nBins,const char *binNames)
{
- // add a binning as last daughter to this tree
- // name: name of the node
- // nBin: number of bins not belonging to a distribution (usually zero)
- // binNames: (optionally) names of these bins sepatared by ';'
- return AddBinning(new TUnfoldBinning(name,nBins,binNames));
+ // add a binning as last daughter to this tree
+ // name: name of the node
+ // nBin: number of bins not belonging to a distribution (usually zero)
+ // binNames: (optionally) names of these bins sepatared by ';'
+ return AddBinning(new TUnfoldBinning(name,nBins,binNames));
}
TUnfoldBinning *TUnfoldBinning::AddBinning(TUnfoldBinning *binning)
{
- // add a binning as last daughter to this tree
- // binning: pointer to the new binning
- // return value: if succeeded, return "binning"
- // otherwise return 0
- TUnfoldBinning *r=0;
- if(binning->GetParentNode()) {
- Error("binning \"%s\" already has parent \"%s\", can not be added to %s",
- (char *)binning->GetName(),
- (char *)binning->GetParentNode()->GetName(),
- (char *)GetName());
- } else if(binning->GetPrevNode()) {
- Error("binning \"%s\" has previous node \"%s\", can not be added to %s",
- (char *)binning->GetName(),
- (char *)binning->GetPrevNode()->GetName(),
- (char *)GetName());
- } else if(binning->GetNextNode()) {
- Error("binning \"%s\" has next node \"%s\", can not be added to %s",
- (char *)binning->GetName(),
- (char *)binning->GetNextNode()->GetName(),
- (char *)GetName());
- } else {
- r=binning;
- binning->parentNode=this;
- if(childNode) {
- TUnfoldBinning *child=childNode;
- // find last child
- while(child->nextNode) {
- child=child->nextNode;
+ // add a binning as last daughter to this tree
+ // binning: pointer to the new binning
+ // return value: if succeeded, return "binning"
+ // otherwise return 0
+ TUnfoldBinning *r=0;
+ if(binning->GetParentNode()) {
+ Error("binning \"%s\" already has parent \"%s\", can not be added to %s",
+ (char *)binning->GetName(),
+ (char *)binning->GetParentNode()->GetName(),
+ (char *)GetName());
+ } else if(binning->GetPrevNode()) {
+ Error("binning \"%s\" has previous node \"%s\", can not be added to %s",
+ (char *)binning->GetName(),
+ (char *)binning->GetPrevNode()->GetName(),
+ (char *)GetName());
+ } else if(binning->GetNextNode()) {
+ Error("binning \"%s\" has next node \"%s\", can not be added to %s",
+ (char *)binning->GetName(),
+ (char *)binning->GetNextNode()->GetName(),
+ (char *)GetName());
+ } else {
+ r=binning;
+ binning->parentNode=this;
+ if(childNode) {
+ TUnfoldBinning *child=childNode;
+ // find last child
+ while(child->nextNode) {
+ child=child->nextNode;
+ }
+ // add as last child
+ child->nextNode=r;
+ r->prevNode=child;
+ } else {
+ childNode=r;
}
- // add as last child
- child->nextNode=r;
- r->prevNode=child;
- } else {
- childNode=r;
- }
- UpdateFirstLastBin();
- r=binning;
- }
- return r;
+ UpdateFirstLastBin();
+ r=binning;
+ }
+ return r;
}
Bool_t TUnfoldBinning::AddAxis
(const char *name,Int_t nBin,Double_t xMin,Double_t xMax,
Bool_t hasUnderflow,Bool_t hasOverflow)
{
- // add an axis with equidistant bins to the distribution
- // name: name of the axis
- // nBin: number of bins
- // xMin: lower edge of the first bin
- // xMax: upper edge of the last bin
- // hasUnderflow: decide whether the axis has an underflow bin
- // hasOverflow: decide whether the axis has an overflow bin
- // return: true if the axis has been added
- Bool_t r=kFALSE;
+ // add an axis with equidistant bins to the distribution
+ // name: name of the axis
+ // nBin: number of bins
+ // xMin: lower edge of the first bin
+ // xMax: upper edge of the last bin
+ // hasUnderflow: decide whether the axis has an underflow bin
+ // hasOverflow: decide whether the axis has an overflow bin
+ // return: true if the axis has been added
+ Bool_t r=kFALSE;
if(nBin<=0) {
Fatal("AddAxis","number of bins %d is not positive",
nBin);
} else if((!TMath::Finite(xMin))||(!TMath::Finite(xMax))||
- (xMin>=xMax)) {
+ (xMin>=xMax)) {
Fatal("AddAxis","xmin=%f required to be smaller than xmax=%f",
xMin,xMax);
} else {
- Double_t *binBorders=new Double_t[nBin+1];
- Double_t x=xMin;
- Double_t dx=(xMax-xMin)/nBin;
- for(Int_t i=0;i<=nBin;i++) {
- binBorders[i]=x+i*dx;
- }
- r=AddAxis(name,nBin,binBorders,hasUnderflow,hasOverflow);
- delete [] binBorders;
+ Double_t *binBorders=new Double_t[nBin+1];
+ Double_t x=xMin;
+ Double_t dx=(xMax-xMin)/nBin;
+ for(Int_t i=0;i<=nBin;i++) {
+ binBorders[i]=x+i*dx;
+ }
+ r=AddAxis(name,nBin,binBorders,hasUnderflow,hasOverflow);
+ delete [] binBorders;
}
return r;
}
@@ -265,86 +265,86 @@ Bool_t TUnfoldBinning::AddAxis
Bool_t TUnfoldBinning::AddAxis
(const TAxis &axis,Bool_t hasUnderflow,Bool_t hasOverflow)
{
- // add an axis to the distribution
- // axis: the axis
- // hasUnderflow: decide whether the underflow bin should be included
- // hasOverflow: decide whether the overflow bin should be included
- // return: true if the axis has been added
- //
- // Note: axis labels are not imported
- Int_t nBin=axis.GetNbins();
- Double_t *binBorders=new Double_t[nBin+1];
- for(Int_t i=0;i<nBin;i++) {
- binBorders[i]=axis.GetBinLowEdge(i+1);
- }
- binBorders[nBin]=axis.GetBinUpEdge(nBin);
- Bool_t r=AddAxis(axis.GetTitle(),nBin,binBorders,hasUnderflow,hasOverflow);
- delete [] binBorders;
- return r;
+ // add an axis to the distribution
+ // axis: the axis
+ // hasUnderflow: decide whether the underflow bin should be included
+ // hasOverflow: decide whether the overflow bin should be included
+ // return: true if the axis has been added
+ //
+ // Note: axis labels are not imported
+ Int_t nBin=axis.GetNbins();
+ Double_t *binBorders=new Double_t[nBin+1];
+ for(Int_t i=0;i<nBin;i++) {
+ binBorders[i]=axis.GetBinLowEdge(i+1);
+ }
+ binBorders[nBin]=axis.GetBinUpEdge(nBin);
+ Bool_t r=AddAxis(axis.GetTitle(),nBin,binBorders,hasUnderflow,hasOverflow);
+ delete [] binBorders;
+ return r;
}
Bool_t TUnfoldBinning::AddAxis
(const char *name,Int_t nBin,const Double_t *binBorders,
Bool_t hasUnderflow,Bool_t hasOverflow)
{
- // add an axis with the specified bin borders to the distribution
- // name: name of the axis
- // nBin: number of bins
- // binBorders: array of bin borders, with nBin+1 elements
- // hasUnderflow: decide whether the axis has an underflow bin
- // hasOverflow: decide whether the axis has an overflow bin
- Bool_t r=kFALSE;
- if(HasUnconnectedBins()) {
- Fatal("AddAxis","node already has %d bins without axis",
- GetDistributionNumberOfBins());
- } else if(nBin<=0) {
- Fatal("AddAxis","number of bins %d is not positive",
- nBin);
- } else {
- TVectorD *bins=new TVectorD(nBin+1);
- r=kTRUE;
- for(Int_t i=0;i<=nBin;i++) {
- (*bins)(i)=binBorders[i];
- if(!TMath::Finite((*bins)(i))) {
- Fatal("AddAxis","bin border %d is not finite",i);
- r=kFALSE;
- } else if((i>0)&&((*bins)(i)<=(*bins)(i-1))) {
- Fatal("AddAxis","bins not in order x[%d]=%f <= %f=x[%d]",
- i,(*bins)(i),(*bins)(i-1),i-1);
- r=kFALSE;
- }
- }
- if(r) {
- Int_t axis=fAxisList->GetEntriesFast();
- Int_t bitMask=1<<axis;
- Int_t nBinUO=nBin;
- if(hasUnderflow) {
- fHasUnderflow |= bitMask;
- nBinUO++;
- } else {
- fHasUnderflow &= ~bitMask;
+ // add an axis with the specified bin borders to the distribution
+ // name: name of the axis
+ // nBin: number of bins
+ // binBorders: array of bin borders, with nBin+1 elements
+ // hasUnderflow: decide whether the axis has an underflow bin
+ // hasOverflow: decide whether the axis has an overflow bin
+ Bool_t r=kFALSE;
+ if(HasUnconnectedBins()) {
+ Fatal("AddAxis","node already has %d bins without axis",
+ GetDistributionNumberOfBins());
+ } else if(nBin<=0) {
+ Fatal("AddAxis","number of bins %d is not positive",
+ nBin);
+ } else {
+ TVectorD *bins=new TVectorD(nBin+1);
+ r=kTRUE;
+ for(Int_t i=0;i<=nBin;i++) {
+ (*bins)(i)=binBorders[i];
+ if(!TMath::Finite((*bins)(i))) {
+ Fatal("AddAxis","bin border %d is not finite",i);
+ r=kFALSE;
+ } else if((i>0)&&((*bins)(i)<=(*bins)(i-1))) {
+ Fatal("AddAxis","bins not in order x[%d]=%f <= %f=x[%d]",
+ i,(*bins)(i),(*bins)(i-1),i-1);
+ r=kFALSE;
+ }
}
- if(hasOverflow) {
- fHasOverflow |= bitMask;
- nBinUO++;
- } else {
- fHasOverflow &= ~bitMask;
+ if(r) {
+ Int_t axis=fAxisList->GetEntriesFast();
+ Int_t bitMask=1<<axis;
+ Int_t nBinUO=nBin;
+ if(hasUnderflow) {
+ fHasUnderflow |= bitMask;
+ nBinUO++;
+ } else {
+ fHasUnderflow &= ~bitMask;
+ }
+ if(hasOverflow) {
+ fHasOverflow |= bitMask;
+ nBinUO++;
+ } else {
+ fHasOverflow &= ~bitMask;
+ }
+ fAxisList->AddLast(bins);
+ fAxisLabelList->AddLast(new TObjString(name));
+ if(!fDistributionSize) fDistributionSize=1;
+ fDistributionSize *= nBinUO;
+ UpdateFirstLastBin();
}
- fAxisList->AddLast(bins);
- fAxisLabelList->AddLast(new TObjString(name));
- if(!fDistributionSize) fDistributionSize=1;
- fDistributionSize *= nBinUO;
- UpdateFirstLastBin();
- }
- }
- return r;
+ }
+ return r;
}
void TUnfoldBinning::PrintStream(ostream &out,Int_t indent) const
{
- // print some information about this binning tree
- // out: stream to write to
- // indent: initial indentation (sub-trees have indent+1)
+ // print some information about this binning tree
+ // out: stream to write to
+ // indent: initial indentation (sub-trees have indent+1)
for(Int_t i=0;i<indent;i++) out<<" ";
out<<"TUnfoldBinning \""<<GetName()<<"\" has ";
Int_t nBin=GetEndBin()-GetStartBin();
@@ -354,31 +354,31 @@ void TUnfoldBinning::PrintStream(ostream &out,Int_t indent) const
out<<nBin<<" bins";
}
out<<" ["
- <<GetStartBin()<<","<<GetEndBin()<<"] nTH1x="
- <<GetTH1xNumberOfBins()
- <<"\n";
+ <<GetStartBin()<<","<<GetEndBin()<<"] nTH1x="
+ <<GetTH1xNumberOfBins()
+ <<"\n";
if(GetDistributionNumberOfBins()) {
for(Int_t i=0;i<indent;i++) out<<" ";
out<<" distribution: "<<GetDistributionNumberOfBins()<<" bins\n";
if(fAxisList->GetEntriesFast()) {
/* for(Int_t i=0;i<indent;i++) out<<" ";
- out<<" axes:\n"; */
- for(Int_t axis=0;axis<GetDistributionDimension();axis++) {
- for(Int_t i=0;i<indent;i++) out<<" ";
- out<<" \""
- <<GetDistributionAxisLabel(axis)
- <<"\" nbin="<<GetDistributionBinning(axis)->GetNrows()-1;
- if(fHasUnderflow & (1<<axis)) out<<" plus underflow";
- if(fHasOverflow & (1<<axis)) out<<" plus overflow";
- out<<"\n";
- }
+ out<<" axes:\n"; */
+ for(Int_t axis=0;axis<GetDistributionDimension();axis++) {
+ for(Int_t i=0;i<indent;i++) out<<" ";
+ out<<" \""
+ <<GetDistributionAxisLabel(axis)
+ <<"\" nbin="<<GetDistributionBinning(axis)->GetNrows()-1;
+ if(fHasUnderflow & (1<<axis)) out<<" plus underflow";
+ if(fHasOverflow & (1<<axis)) out<<" plus overflow";
+ out<<"\n";
+ }
} else {
for(Int_t i=0;i<indent;i++) out<<" ";
out<<" no axis\n";
for(Int_t i=0;i<indent;i++) out<<" ";
out<<" names: ";
for(Int_t ibin=0;(ibin<GetDistributionNumberOfBins())&&
- (ibin<fAxisLabelList->GetEntriesFast());ibin++) {
+ (ibin<fAxisLabelList->GetEntriesFast());ibin++) {
if(ibin) out<<";";
if(GetDistributionAxisLabel(ibin)) {
out<<GetDistributionAxisLabel(ibin);
@@ -433,7 +433,7 @@ TUnfoldBinning const *TUnfoldBinning::GetRootNode(void) const
TString TUnfoldBinning::BuildHistogramTitle
(const char *histogramName,const char *histogramTitle,Int_t const *axisList)
- const
+const
{
// build a title
// input:
@@ -500,21 +500,21 @@ TString TUnfoldBinning::BuildHistogramTitle2D
Int_t TUnfoldBinning::GetTH1xNumberOfBins
(Bool_t originalAxisBinning,const char *axisSteering) const
{
- // return the number of histogram bins required when storing
- // this binning in a one-dimensional histogram
- // originalAxisBinning : try to preserve the axis binning,
- // if this binning is 1-dimensional then the
- // underflow/overflow are stored in the
- // corresponding bins of the TH1 and
- // axisSteering:
- // "pattern1;pattern2;...;patternN"
- // patternI = axis[mode]
- // axis = name or *
- // mode = C|U|O
- // C: collapse axis into one bin
- // U: discarde underflow bin
- // O: discarde overflow bin
- // return: number of bins of the TH1 (underflow/overflow are not counted)
+ // return the number of histogram bins required when storing
+ // this binning in a one-dimensional histogram
+ // originalAxisBinning : try to preserve the axis binning,
+ // if this binning is 1-dimensional then the
+ // underflow/overflow are stored in the
+ // corresponding bins of the TH1 and
+ // axisSteering:
+ // "pattern1;pattern2;...;patternN"
+ // patternI = axis[mode]
+ // axis = name or *
+ // mode = C|U|O
+ // C: collapse axis into one bin
+ // U: discarde underflow bin
+ // O: discarde overflow bin
+ // return: number of bins of the TH1 (underflow/overflow are not counted)
Int_t axisBins[3],axisList[3];
GetTHxxBinning(originalAxisBinning ? 1 : 0,axisBins,axisList,
axisSteering);
@@ -525,30 +525,30 @@ TH1 *TUnfoldBinning::CreateHistogram
(const char *histogramName,Bool_t originalAxisBinning,Int_t **binMap,
const char *histogramTitle,const char *axisSteering) const
{
- // create a THxx histogram capable to hold the bins of this binning
- // scheme and its children
- // input:
- // histogramName: name of the histogram which is created
- // originalAxisBinning : try to preserve the axis binning
- // if this parameter is true, the resulting
- // histogram has bin widths and histogram
- // dimension (TH1D, TH2D, TH3D)
- // in parallel to the binning scheme
- // (if possible)
- // binMap : mapping of global bins to histogram bins
- // see method CreateBinMap()
- // if(binMap==0), no binMap is created
- // histogramTitle: if this is non-zero, it is taken as histogram title
- // otherwise, the title is created automatically
- // axisSteering:
- // "pattern1;pattern2;...;patternN"
- // patternI = axis[mode]
- // axis = name or *
- // mode = C|U|O
- // C: collapse axis into one bin
- // U: discarde underflow bin
- // O: discarde overflow bin
- // returns: a new histogram (TH1D, TH2D or TH3D)
+ // create a THxx histogram capable to hold the bins of this binning
+ // scheme and its children
+ // input:
+ // histogramName: name of the histogram which is created
+ // originalAxisBinning : try to preserve the axis binning
+ // if this parameter is true, the resulting
+ // histogram has bin widths and histogram
+ // dimension (TH1D, TH2D, TH3D)
+ // in parallel to the binning scheme
+ // (if possible)
+ // binMap : mapping of global bins to histogram bins
+ // see method CreateBinMap()
+ // if(binMap==0), no binMap is created
+ // histogramTitle: if this is non-zero, it is taken as histogram title
+ // otherwise, the title is created automatically
+ // axisSteering:
+ // "pattern1;pattern2;...;patternN"
+ // patternI = axis[mode]
+ // axis = name or *
+ // mode = C|U|O
+ // C: collapse axis into one bin
+ // U: discarde underflow bin
+ // O: discarde overflow bin
+ // returns: a new histogram (TH1D, TH2D or TH3D)
Int_t nBin[3],axisList[3];
Int_t nDim=GetTHxxBinning(originalAxisBinning ? 3 : 0,nBin,axisList,
axisSteering);
@@ -557,13 +557,13 @@ TH1 *TUnfoldBinning::CreateHistogram
TH1 *r=0;
if(nDim>0) {
const TVectorD *axisBinsX=
- neNode->GetDistributionBinning(axisList[0]);
+ neNode->GetDistributionBinning(axisList[0]);
if(nDim>1) {
const TVectorD *axisBinsY=
- neNode->GetDistributionBinning(axisList[1]);
+ neNode->GetDistributionBinning(axisList[1]);
if(nDim>2) {
const TVectorD *axisBinsZ=
- neNode->GetDistributionBinning(axisList[2]);
+ neNode->GetDistributionBinning(axisList[2]);
r=new TH3D(histogramName,title,
nBin[0],axisBinsX->GetMatrixArray(),
nBin[1],axisBinsY->GetMatrixArray(),
@@ -579,7 +579,7 @@ TH1 *TUnfoldBinning::CreateHistogram
} else {
if(originalAxisBinning) {
Warning("CreateHistogram",
- "Original binning can not be represented as THxx");
+ "Original binning can not be represented as THxx");
}
r=new TH1D(histogramName,title,nBin[0],0.5,nBin[0]+0.5);
nDim=0;
@@ -594,29 +594,29 @@ TH2D *TUnfoldBinning::CreateErrorMatrixHistogram
(const char *histogramName,Bool_t originalAxisBinning,Int_t **binMap,
const char *histogramTitle,const char *axisSteering) const
{
- // create a TH2D histogram capable to hold an error matrix
- // coresponding to the bins of this binning scheme and its children
- // input:
- // histogramName: name of the histogram which is created
- // originalAxisBinning : try to preserve the axis binning
- // if this parameter is true, the resulting
- // histogram has bin widths
- // in parallel to this binning scheme
- // (if possible)
- // binMap : mapping of global bins to histogram bins
- // see method CreateBinMap()
- // if(binMap==0), no binMap is created
- // histogramTitle: if this is non-zero, it is taken as histogram title
- // otherwise, the title is created automatically
- // axisSteering:
- // "pattern1;pattern2;...;patternN"
- // patternI = axis[mode]
- // axis = name or *
- // mode = C|U|O
- // C: collapse axis into one bin
- // U: discarde underflow bin
- // O: discarde overflow bin
- // returns: a new TH2D
+ // create a TH2D histogram capable to hold an error matrix
+ // coresponding to the bins of this binning scheme and its children
+ // input:
+ // histogramName: name of the histogram which is created
+ // originalAxisBinning : try to preserve the axis binning
+ // if this parameter is true, the resulting
+ // histogram has bin widths
+ // in parallel to this binning scheme
+ // (if possible)
+ // binMap : mapping of global bins to histogram bins
+ // see method CreateBinMap()
+ // if(binMap==0), no binMap is created
+ // histogramTitle: if this is non-zero, it is taken as histogram title
+ // otherwise, the title is created automatically
+ // axisSteering:
+ // "pattern1;pattern2;...;patternN"
+ // patternI = axis[mode]
+ // axis = name or *
+ // mode = C|U|O
+ // C: collapse axis into one bin
+ // U: discarde underflow bin
+ // O: discarde overflow bin
+ // returns: a new TH2D
Int_t nBin[3],axisList[3];
Int_t nDim=GetTHxxBinning(originalAxisBinning ? 1 : 0,nBin,axisList,
@@ -625,7 +625,7 @@ TH2D *TUnfoldBinning::CreateErrorMatrixHistogram
TH2D *r=0;
if(nDim==1) {
const TVectorD *axisBinsX=(TVectorD const *)
- GetNonemptyNode()->fAxisList->At(axisList[0]);
+ GetNonemptyNode()->fAxisList->At(axisList[0]);
r=new TH2D(histogramName,title,nBin[0],axisBinsX->GetMatrixArray(),
nBin[0],axisBinsX->GetMatrixArray());
} else {
@@ -648,32 +648,32 @@ TH2D *TUnfoldBinning::CreateHistogramOfMigrations
char const *histogramName,Bool_t originalXAxisBinning,
Bool_t originalYAxisBinning,char const *histogramTitle)
{
- // create a TH2D histogram capable to hold the bins of the two
- // input binning schemes on the x and y axes, respectively
- // input:
- // histogramName: name of the histogram which is created
- // xAxis: binning scheme for the x axis
- // yAxis: binning scheme for the y axis
- // originalXAxisBinning: preserve x-axis bin widths if possible
- // originalXAxisBinning: preserve y-axis bin widths if possible
- // histogramTitle: if this is non-zero, it is taken as histogram title
- // otherwise, the title is created automatically
- // returns: a new TH2D
+ // create a TH2D histogram capable to hold the bins of the two
+ // input binning schemes on the x and y axes, respectively
+ // input:
+ // histogramName: name of the histogram which is created
+ // xAxis: binning scheme for the x axis
+ // yAxis: binning scheme for the y axis
+ // originalXAxisBinning: preserve x-axis bin widths if possible
+ // originalXAxisBinning: preserve y-axis bin widths if possible
+ // histogramTitle: if this is non-zero, it is taken as histogram title
+ // otherwise, the title is created automatically
+ // returns: a new TH2D
Int_t nBinX[3],axisListX[3];
Int_t nDimX=
- xAxis->GetTHxxBinning(originalXAxisBinning ? 1 : 0,nBinX,axisListX,0);
+ xAxis->GetTHxxBinning(originalXAxisBinning ? 1 : 0,nBinX,axisListX,0);
Int_t nBinY[3],axisListY[3];
Int_t nDimY=
- yAxis->GetTHxxBinning(originalYAxisBinning ? 1 : 0,nBinY,axisListY,0);
+ yAxis->GetTHxxBinning(originalYAxisBinning ? 1 : 0,nBinY,axisListY,0);
TString title=xAxis->BuildHistogramTitle2D
- (histogramName,histogramTitle,axisListX[0],yAxis,axisListY[0]);
+ (histogramName,histogramTitle,axisListX[0],yAxis,axisListY[0]);
if(nDimX==1) {
const TVectorD *axisBinsX=(TVectorD const *)
- xAxis->fAxisList->At(axisListX[0]);
+ xAxis->fAxisList->At(axisListX[0]);
if(nDimY==1) {
const TVectorD *axisBinsY=(TVectorD const *)
- yAxis->fAxisList->At(axisListY[0]);
+ yAxis->fAxisList->At(axisListY[0]);
return new TH2D(histogramName,title,
nBinX[0],axisBinsX->GetMatrixArray(),
nBinY[0],axisBinsY->GetMatrixArray());
@@ -685,7 +685,7 @@ TH2D *TUnfoldBinning::CreateHistogramOfMigrations
} else {
if(nDimY==1) {
const TVectorD *axisBinsY=(TVectorD const *)
- yAxis->fAxisList->At(axisListY[0]);
+ yAxis->fAxisList->At(axisListY[0]);
return new TH2D(histogramName,title,
nBinX[0],0.5,0.5+nBinX[0],
nBinY[0],axisBinsY->GetMatrixArray());
@@ -711,7 +711,7 @@ Int_t TUnfoldBinning::GetTHxxBinning
// "pattern1;pattern2;...;patternN"
// patternI = axis[mode]
// axis = name or *
- // mode = C|U|O
+ // mode = C|U|O
// C: collapse axis into one bin
// U: discarde underflow bin
// O: discarde overflow bin
@@ -728,7 +728,7 @@ Int_t TUnfoldBinning::GetTHxxBinning
const TUnfoldBinning *theNode=GetNonemptyNode();
if(theNode) {
return theNode->GetTHxxBinningSingleNode
- (maxDim,axisBins,axisList,axisSteering);
+ (maxDim,axisBins,axisList,axisSteering);
} else {
axisBins[0]=GetTHxxBinsRecursive(axisSteering);
return 0;
@@ -770,7 +770,7 @@ Int_t TUnfoldBinning::GetTHxxBinningSingleNode
// "pattern1;pattern2;...;patternN"
// patternI = axis[mode]
// axis = name or *
- // mode = C|U|O
+ // mode = C|U|O
// C: collapse axis into one bin
// U: discarde underflow bin
// O: discarde overflow bin
@@ -837,7 +837,7 @@ Int_t TUnfoldBinning::GetTHxxBinsRecursive(const char *axisSteering) const
// "pattern1;pattern2;...;patternN"
// patternI = axis[mode]
// axis = name or *
- // mode = C|U|O
+ // mode = C|U|O
// C: collapse axis into one bin
// U: discarde underflow bin
// O: discarde overflow bin
@@ -859,13 +859,13 @@ Int_t TUnfoldBinning::GetTHxxBinsRecursive(const char *axisSteering) const
Int_t *TUnfoldBinning::CreateBinMap
(const TH1 *hist,Int_t nDim,const Int_t *axisList,const char *axisSteering)
- const
+const
{
// create mapping from global bin number to a histogram for this node
// global bins are the bins of the root node binning scheme
// when projecting them on a TH1 histogram "hRootNode" without special
// axis steering and without attempting to preserve the axis binnings
- //
+ //
// The bin map is an array of size hRootNode->GetNbinsX()+2
// For each bin of the "hRootNode" histogram it holds the target bin in
// "hist" or the number -1 if the corresponding "hRootNode" bin is not
@@ -879,7 +879,7 @@ Int_t *TUnfoldBinning::CreateBinMap
// "pattern1;pattern2;...;patternN"
// patternI = axis[mode]
// axis = name or *
- // mode = C|U|O
+ // mode = C|U|O
// C: collapse axis into one bin
// U: discarde underflow bin
// O: discarde overflow bin
@@ -888,7 +888,7 @@ Int_t *TUnfoldBinning::CreateBinMap
// axisList : for each THxx axis give the TUnfoldBinning axis number
//
// return value:
- // an new array which holds the bin mapping
+ // an new array which holds the bin mapping
// r[0] : to which THxx bin to map global bin number 0
// r[1] : to which THxx bin to map global bin number 1
// ...
@@ -897,19 +897,19 @@ Int_t *TUnfoldBinning::CreateBinMap
Int_t nMax=GetRootNode()->GetEndBin()+1;
Int_t *r=new Int_t[nMax];
for(Int_t i=0;i<nMax;i++) {
- r[i]=-1;
+ r[i]=-1;
}
Int_t startBin=GetRootNode()->GetStartBin();
if(nDim>0) {
- const TUnfoldBinning *nonemptyNode=GetNonemptyNode();
- if(nonemptyNode) {
- FillBinMapSingleNode(hist,startBin,nDim,axisList,axisSteering,r);
- } else {
- Fatal("CreateBinMap","called with nDim=%d but GetNonemptyNode()=0",
- nDim);
- }
+ const TUnfoldBinning *nonemptyNode=GetNonemptyNode();
+ if(nonemptyNode) {
+ FillBinMapSingleNode(hist,startBin,nDim,axisList,axisSteering,r);
+ } else {
+ Fatal("CreateBinMap","called with nDim=%d but GetNonemptyNode()=0",
+ nDim);
+ }
} else {
- FillBinMapRecursive(startBin,axisSteering,r);
+ FillBinMapRecursive(startBin,axisSteering,r);
}
return r;
}
@@ -942,33 +942,33 @@ Int_t TUnfoldBinning::FillBinMapSingleNode
(const TH1 *hist,Int_t startBin,Int_t nDim,const Int_t *axisList,
const char *axisSteering,Int_t *binMap) const
{
- // fill bin map for a single node
- // input:
- // hist: the histogram represeinthing this node (used if nDim>0)
- // startBin: start bin in the bin map
- // nDim:
- // 0: bins are mapped in linear order, ignore hist and axisList
- // nDim=hist->GetDimension():
- // bins are mapped to "hist" bin numbers
- // the corresponding TUnfoldBinning axes are taken from axisList[]
- // nDim=1 and hist->GetDimension()>1:
- // bins are mapped to th x-axis of "hist"
- // the corresponding TUnfoldBinning axis is taken from axisList[0]
- // axisList[]:
- // TUnfoldBinning axis numbers corresponding to the
- // x[0], y[1], z[2] axes of "hist"
- // axisSteering:
- // "pattern1;pattern2;...;patternN"
- // patternI = axis[mode]
- // axis = name or *
- // mode = C|U|O
- // C: collapse axis into one bin
- // U: discarde underflow bin
- // O: discarde overflow bin
- // binMap: the bin map to fill
- // return value:
- // the number of bins mapped
- // (only relevant if nDim==0)
+ // fill bin map for a single node
+ // input:
+ // hist: the histogram represeinthing this node (used if nDim>0)
+ // startBin: start bin in the bin map
+ // nDim:
+ // 0: bins are mapped in linear order, ignore hist and axisList
+ // nDim=hist->GetDimension():
+ // bins are mapped to "hist" bin numbers
+ // the corresponding TUnfoldBinning axes are taken from axisList[]
+ // nDim=1 and hist->GetDimension()>1:
+ // bins are mapped to th x-axis of "hist"
+ // the corresponding TUnfoldBinning axis is taken from axisList[0]
+ // axisList[]:
+ // TUnfoldBinning axis numbers corresponding to the
+ // x[0], y[1], z[2] axes of "hist"
+ // axisSteering:
+ // "pattern1;pattern2;...;patternN"
+ // patternI = axis[mode]
+ // axis = name or *
+ // mode = C|U|O
+ // C: collapse axis into one bin
+ // U: discarde underflow bin
+ // O: discarde overflow bin
+ // binMap: the bin map to fill
+ // return value:
+ // the number of bins mapped
+ // (only relevant if nDim==0)
// first, decode axisSteering
// isOptionGiven[0] ('C'): bit vector which axes to collapse
// isOptionGiven[1] ('U'): bit vector to discarde underflow bins
@@ -1019,15 +1019,15 @@ Int_t TUnfoldBinning::FillBinMapSingleNode
}
binMap[globalBin]=hist->GetBin(ibin[0],ibin[1],ibin[2]);
} else if(nDim==1) {
- // histogram has more dimensions than the binning scheme
- // and the binning scheme has one axis only
- // -> use the first valid axis only
- for(Int_t ii=0;ii<hist->GetDimension();ii++) {
- if(axisList[ii]>=0) {
- binMap[globalBin]=axisBins[axisList[ii]]+1;
- break;
- }
- }
+ // histogram has more dimensions than the binning scheme
+ // and the binning scheme has one axis only
+ // -> use the first valid axis only
+ for(Int_t ii=0;ii<hist->GetDimension();ii++) {
+ if(axisList[ii]>=0) {
+ binMap[globalBin]=axisBins[axisList[ii]]+1;
+ break;
+ }
+ }
} else {
Fatal("FillBinMapSingleNode","unexpected bin mapping %d %d",nDim,
hist->GetDimension());
@@ -1058,30 +1058,30 @@ Int_t TUnfoldBinning::FillBinMapSingleNode
}
binMap[globalBin] = startBin + r;
} else {
- binMap[globalBin] = startBin + axisBins[0];
+ binMap[globalBin] = startBin + axisBins[0];
}
}
}
Int_t nbin;
if(dimension>0) {
- nbin=1;
- for(Int_t axis=dimension-1;axis>=0;axis--) {
- Int_t mask=(1<<axis);
- if(isOptionGiven[0] & mask) {
- // bins on this axis are integrated over
- continue;
- }
- Int_t nMax=axisNbin[axis];
- if((fHasUnderflow & ~isOptionGiven[1]) & mask) {
- nMax +=1;
- }
- if((fHasOverflow & ~isOptionGiven[2]) & mask) {
- nMax += 1;
- }
- nbin = nbin*nMax;
- }
+ nbin=1;
+ for(Int_t axis=dimension-1;axis>=0;axis--) {
+ Int_t mask=(1<<axis);
+ if(isOptionGiven[0] & mask) {
+ // bins on this axis are integrated over
+ continue;
+ }
+ Int_t nMax=axisNbin[axis];
+ if((fHasUnderflow & ~isOptionGiven[1]) & mask) {
+ nMax +=1;
+ }
+ if((fHasOverflow & ~isOptionGiven[2]) & mask) {
+ nMax += 1;
+ }
+ nbin = nbin*nMax;
+ }
} else {
- nbin=GetDistributionNumberOfBins();
+ nbin=GetDistributionNumberOfBins();
}
return nbin;
}
@@ -1104,7 +1104,7 @@ TH1 *TUnfoldBinning::ExtractHistogram
// "pattern1;pattern2;...;patternN"
// patternI = axis[mode]
// axis = name or *
- // mode = C|U|O
+ // mode = C|U|O
// C: collapse axis into one bin
// U: discarde underflow bin
// O: discarde overflow bin
@@ -1127,8 +1127,8 @@ TH1 *TUnfoldBinning::ExtractHistogram
} else {
for(Int_t jSrc=root->GetStartBin();jSrc<root->GetEndBin();jSrc++) {
if(binMap[jSrc]==iDest) {
- eSquared(iDest) +=
- TMath::Power(globalBins->GetBinError(jSrc),2.);
+ eSquared(iDest) +=
+ TMath::Power(globalBins->GetBinError(jSrc),2.);
}
}
}
@@ -1149,9 +1149,9 @@ TH1 *TUnfoldBinning::ExtractHistogram
Int_t TUnfoldBinning::GetGlobalBinNumber(Double_t x) const
{
- // locate bin on a one-dimensional distribution
- // input
- // x: coordinate to locate
+ // locate bin on a one-dimensional distribution
+ // input
+ // x: coordinate to locate
if(GetDistributionDimension()!=1) {
Fatal("GetBinNumber",
"called with 1 argument for %d dimensional distribution",
@@ -1162,9 +1162,9 @@ Int_t TUnfoldBinning::GetGlobalBinNumber(Double_t x) const
Int_t TUnfoldBinning::GetGlobalBinNumber(Double_t x,Double_t y) const
{
- // locate bin on a two-dimensional distribution
- // input
- // x,y: coordinates to locate
+ // locate bin on a two-dimensional distribution
+ // input
+ // x,y: coordinates to locate
if(GetDistributionDimension()!=2) {
Fatal("GetBinNumber",
"called with 2 arguments for %d dimensional distribution",
@@ -1179,9 +1179,9 @@ Int_t TUnfoldBinning::GetGlobalBinNumber(Double_t x,Double_t y) const
Int_t TUnfoldBinning::GetGlobalBinNumber
(Double_t x,Double_t y,Double_t z) const
{
- // locate bin on a three-dimensional distribution
- // input
- // x,y,z: coordinates to locate
+ // locate bin on a three-dimensional distribution
+ // input
+ // x,y,z: coordinates to locate
if(GetDistributionDimension()!=3) {
Fatal("GetBinNumber",
"called with 3 arguments for %d dimensional distribution",
@@ -1197,9 +1197,9 @@ Int_t TUnfoldBinning::GetGlobalBinNumber
Int_t TUnfoldBinning::GetGlobalBinNumber
(Double_t x0,Double_t x1,Double_t x2,Double_t x3) const
{
- // locate bin on a four-dimensional distribution
- // input
- // x0,x1,x2,x3: coordinates to locate
+ // locate bin on a four-dimensional distribution
+ // input
+ // x0,x1,x2,x3: coordinates to locate
if(GetDistributionDimension()!=4) {
Fatal("GetBinNumber",
"called with 4 arguments for %d dimensional distribution",
@@ -1215,9 +1215,9 @@ Int_t TUnfoldBinning::GetGlobalBinNumber
Int_t TUnfoldBinning::GetGlobalBinNumber(const Double_t *x) const
{
- // locate bin on a n-dimensional distribution
- // input
- // x[]: coordinates to locate
+ // locate bin on a n-dimensional distribution
+ // input
+ // x[]: coordinates to locate
if(!GetDistributionDimension()) {
Fatal("GetBinNumber",
"no axes are defined for node %s",
@@ -1257,8 +1257,8 @@ Int_t TUnfoldBinning::GetGlobalBinNumber(const Double_t *x) const
TString TUnfoldBinning::GetBinName(Int_t iBin) const
{
- // get the name of a bin in the given tree
- // iBin: bin number
+ // get the name of a bin in the given tree
+ // iBin: bin number
Int_t axisBins[MAXDIM] = {0};
TString r=TString::Format("#%d",iBin);
TUnfoldBinning const *distribution=ToAxisBins(iBin,axisBins);
@@ -1270,14 +1270,14 @@ TString TUnfoldBinning::GetBinName(Int_t iBin) const
TString axisString;
for(Int_t axis=0;axis<dimension;axis++) {
TString thisAxisString=
- distribution->GetDistributionAxisLabel(axis);
+ distribution->GetDistributionAxisLabel(axis);
TVectorD const *bins=distribution->GetDistributionBinning(axis);
Int_t i=axisBins[axis];
if(i<0) thisAxisString += "[ufl]";
else if(i>=bins->GetNrows()-1) thisAxisString += "[ofl]";
else {
thisAxisString +=
- TString::Format("[%.3g,%.3g]",(*bins)[i],(*bins)[i+1]);
+ TString::Format("[%.3g,%.3g]",(*bins)[i],(*bins)[i+1]);
}
axisString = ":"+thisAxisString+axisString;
}
@@ -1298,10 +1298,10 @@ TString TUnfoldBinning::GetBinName(Int_t iBin) const
Double_t TUnfoldBinning::GetBinSize(Int_t iBin) const
{
- // get N-dimensional bin size
- // input:
- // iBin : global bin number
- // includeUO : include underflow/overflow bins or not
+ // get N-dimensional bin size
+ // input:
+ // iBin : global bin number
+ // includeUO : include underflow/overflow bins or not
Int_t axisBins[MAXDIM] = {0};
TUnfoldBinning const *distribution=ToAxisBins(iBin,axisBins);
Double_t r=0.0;
@@ -1311,9 +1311,9 @@ Double_t TUnfoldBinning::GetBinSize(Int_t iBin) const
TVectorD const *bins=distribution->GetDistributionBinning(axis);
Int_t pos=axisBins[axis];
if(pos<0) {
- r *= distribution->GetDistributionUnderflowBinWidth(axis);
+ r *= distribution->GetDistributionUnderflowBinWidth(axis);
} else if(pos>=bins->GetNrows()-1) {
- r *= distribution->GetDistributionOverflowBinWidth(axis);
+ r *= distribution->GetDistributionOverflowBinWidth(axis);
} else {
r *= (*bins)(pos+1)-(*bins)(pos);
}
@@ -1325,10 +1325,10 @@ Double_t TUnfoldBinning::GetBinSize(Int_t iBin) const
Double_t TUnfoldBinning::GetBinFactor(Int_t iBin) const
{
- // return user factor for a bin
- // iBin : global bin number
+ // return user factor for a bin
+ // iBin : global bin number
Int_t axisBins[MAXDIM] = {0};
- TUnfoldBinning const *distribution=ToAxisBins(iBin,axisBins);
+ TUnfoldBinning const *distribution=ToAxisBins(iBin,axisBins);
Double_t r=distribution->fBinFactorConstant;
if((r!=0.0) && distribution->fBinFactorFunction) {
Double_t x[MAXDIM];
@@ -1336,15 +1336,15 @@ Double_t TUnfoldBinning::GetBinFactor(Int_t iBin) const
if(dimension>0) {
for(Int_t axis=0;axis<dimension;axis++) {
x[axis]=distribution->GetDistributionBinCenter
- (axis,axisBins[axis]);
+ (axis,axisBins[axis]);
}
r *= distribution->fBinFactorFunction->EvalPar
- (x,distribution->fBinFactorFunction->GetParameters());
+ (x,distribution->fBinFactorFunction->GetParameters());
} else {
x[0]=axisBins[0];
r *= distribution->fBinFactorFunction->Eval(x[0]);
}
-
+
}
return r;
}
@@ -1369,20 +1369,20 @@ void TUnfoldBinning::GetBinNeighbours
*distPrev=0.;
*distNext=0.;
if((axis>=0)&&(axis<dimension)) {
- //TVectorD const *bins=distribution->GetDistributionBinning(axis);
+ //TVectorD const *bins=distribution->GetDistributionBinning(axis);
//Int_t nBin=bins->GetNrows()-1;
Int_t centerBin= axisBins[axis];
axisBins[axis] =centerBin-1;
*prev=ToGlobalBin(axisBins);
if(*prev>=0) {
- *distPrev=distribution->GetDistributionBinCenter(axis,axisBins[axis])-
- distribution->GetDistributionBinCenter(axis,centerBin);
+ *distPrev=distribution->GetDistributionBinCenter(axis,axisBins[axis])-
+ distribution->GetDistributionBinCenter(axis,centerBin);
}
axisBins[axis] =centerBin+1;
*next=ToGlobalBin(axisBins);
if(*next>=0) {
- *distNext=distribution->GetDistributionBinCenter(axis,axisBins[axis])-
- distribution->GetDistributionBinCenter(axis,centerBin);
+ *distNext=distribution->GetDistributionBinCenter(axis,axisBins[axis])-
+ distribution->GetDistributionBinCenter(axis,centerBin);
}
}
}
@@ -1390,22 +1390,22 @@ void TUnfoldBinning::GetBinNeighbours
void TUnfoldBinning::GetBinUnderflowOverflowStatus
(Int_t iBin,Int_t *uStatus,Int_t *oStatus) const
{
- // return bit map indicating underflow and overflow status
- // iBin: global bin number
- // output
- // uStatus: bin map indicating whether the bin is in underflow
- // oStatus: bin map indicating whether the bin is in overflow
- Int_t axisBins[MAXDIM] = {0};
- TUnfoldBinning const *distribution=ToAxisBins(iBin,axisBins);
- Int_t dimension=distribution->GetDistributionDimension();
- *uStatus=0;
- *oStatus=0;
- for(Int_t axis=0;axis<dimension;axis++) {
- TVectorD const *bins=distribution->GetDistributionBinning(axis);
- Int_t nBin=bins->GetNrows()-1;
- if(axisBins[axis]<0) *uStatus |= (1<<axis);
- if(axisBins[axis]>=nBin) *oStatus |= (1<<axis);
- }
+ // return bit map indicating underflow and overflow status
+ // iBin: global bin number
+ // output
+ // uStatus: bin map indicating whether the bin is in underflow
+ // oStatus: bin map indicating whether the bin is in overflow
+ Int_t axisBins[MAXDIM] = {0};
+ TUnfoldBinning const *distribution=ToAxisBins(iBin,axisBins);
+ Int_t dimension=distribution->GetDistributionDimension();
+ *uStatus=0;
+ *oStatus=0;
+ for(Int_t axis=0;axis<dimension;axis++) {
+ TVectorD const *bins=distribution->GetDistributionBinning(axis);
+ Int_t nBin=bins->GetNrows()-1;
+ if(axisBins[axis]<0) *uStatus |= (1<<axis);
+ if(axisBins[axis]>=nBin) *oStatus |= (1<<axis);
+ }
}
/********************* access by bin number, given a projection mode ******/
@@ -1420,7 +1420,7 @@ const TUnfoldBinning *TUnfoldBinning::GetBinLocation
// "pattern1;pattern2;...;patternN"
// patternI = axis[mode]
// axis = name or *
- // mode = C|U|O
+ // mode = C|U|O
// C: collapse axis into one bin
// U: discarde underflow bin
// O: discarde overflow bin
@@ -1451,7 +1451,7 @@ const TUnfoldBinning *TUnfoldBinning::GetBinLocationRecursive
// "pattern1;pattern2;...;patternN"
// patternI = axis[mode]
// axis = name or *
- // mode = C|U|O
+ // mode = C|U|O
// C: collapse axis into one bin
// U: discarde underflow bin
// O: discarde overflow bin
@@ -1467,7 +1467,7 @@ const TUnfoldBinning *TUnfoldBinning::GetBinLocationRecursive
// -5 : axis collapsed and underflow+overflow bin excluded
// return value:
// the binning node or 0 if not found
-
+
// decode axisSteering
// isOptionGiven[0] ('C'): bit vector which axes to collapse
// isOptionGiven[1] ('U'): bit vector to discarde underflow bins
@@ -1531,10 +1531,10 @@ Bool_t TUnfoldBinning::HasUnconnectedBins(void) const
Double_t TUnfoldBinning::GetDistributionAverageBinSize
(Int_t axis,Bool_t includeUnderflow,Bool_t includeOverflow) const
{
- // get average bin size of the specified axis
- // axis : axis number
- // includeUnderflow : include underflow bin
- // includeOverflow : include overflow bin
+ // get average bin size of the specified axis
+ // axis : axis number
+ // includeUnderflow : include underflow bin
+ // includeOverflow : include overflow bin
Double_t r=0.0;
if((axis>=0)&&(axis<GetDistributionDimension())) {
TVectorD const *bins=GetDistributionBinning(axis);
@@ -1602,35 +1602,35 @@ Double_t TUnfoldBinning::GetDistributionBinCenter
Int_t TUnfoldBinning::ToGlobalBin(Int_t const *axisBins) const
{
- // get global bin number, given axis bin numbers
- // axisBins[]: bin numbers on each axis
- // return: global bin nmber or -1 if not inside distribution
- Int_t dimension=GetDistributionDimension();
- Int_t r=0;
- if(dimension>0) {
- for(Int_t axis=dimension-1;axis>=0;axis--) {
- Int_t nMax=GetDistributionBinning(axis)->GetNrows()-1;
- Int_t i=axisBins[axis];
- if(fHasUnderflow & (1<<axis)) {
- nMax +=1;
- i +=1;
+ // get global bin number, given axis bin numbers
+ // axisBins[]: bin numbers on each axis
+ // return: global bin nmber or -1 if not inside distribution
+ Int_t dimension=GetDistributionDimension();
+ Int_t r=0;
+ if(dimension>0) {
+ for(Int_t axis=dimension-1;axis>=0;axis--) {
+ Int_t nMax=GetDistributionBinning(axis)->GetNrows()-1;
+ Int_t i=axisBins[axis];
+ if(fHasUnderflow & (1<<axis)) {
+ nMax +=1;
+ i +=1;
+ }
+ if(fHasOverflow & (1<<axis)) nMax +=1;
+ if((i>=0)&&(i<nMax)) {
+ r = r*nMax +i;
+ } else {
+ r=-1;
+ break;
+ }
}
- if(fHasOverflow & (1<<axis)) nMax +=1;
- if((i>=0)&&(i<nMax)) {
- r = r*nMax +i;
- } else {
- r=-1;
- break;
+ if(r>=0) {
+ r += GetStartBin();
}
- }
- if(r>=0) {
- r += GetStartBin();
- }
- } else {
- if((axisBins[0]>=0)&&(axisBins[0]<GetDistributionNumberOfBins()))
- r=GetStartBin()+axisBins[0];
- }
- return r;
+ } else {
+ if((axisBins[0]>=0)&&(axisBins[0]<GetDistributionNumberOfBins()))
+ r=GetStartBin()+axisBins[0];
+ }
+ return r;
}
TUnfoldBinning const *TUnfoldBinning::ToAxisBins
@@ -1641,7 +1641,7 @@ TUnfoldBinning const *TUnfoldBinning::ToAxisBins
// input
// globalBin : global bin number
// output
- // if(GetDistributionDimension()>0)
+ // if(GetDistributionDimension()>0)
// axisBin[] : bin number on the individual axes
// bin numbers are starting with -1 (underflow)
// else
@@ -1682,70 +1682,70 @@ TUnfoldBinning const *TUnfoldBinning::ToAxisBins
void TUnfoldBinning::DecodeAxisSteering
(const char *axisSteering,const char *options,Int_t *isOptionGiven) const
{
- // decode axis steering
- // input
- // axisSteering: the steering to decode
- // options: the allowed options to extract
- // output
- // isOptionGiven[] : array of decoded steering options
- // the dimension of isOptionGiven[] has to match the number of
- // characters in "option"
- //
- // the axis steering is given in the form
- // steering1;steering2;...;steeringN
- // all parts of the steering, sepatared by ';' are parsed
- // each part must have the form
- // axisName[optionlist]
- // where:
- // axisName : the name of the axis for which the optionlist is relevant
- // if the name is the character '*', all axes are matched
- // optionlist : for each option the corresonding character
- //
- // example:
- // imagine this node has two axes, named "xgen" and "ygen"
- // then
- // DecodeAxisSteering("*[u];xgen[c]","cuo",options);
- // will set the "U" option for all axes and the "C" option for the "xgen"
- // axis, so:
- // options[0]=0x1; // option 'c' is true for axis 0 (bit #0 is set)
- // options[1]=0x3; // option 'u' is true for both axes (bit #0,#1 are set)
- // options[2]=0x0; // option 'o' is not given (no bits are set)
- Int_t nOpt=TString(options).Length();
- for(Int_t i=0;i<nOpt;i++) isOptionGiven[i]=0;
- if(axisSteering) {
- TObjArray *patterns=TString(axisSteering).Tokenize(";");
- Int_t nPattern=patterns->GetEntries();
- Int_t nAxis=fAxisLabelList->GetEntries();
- for(Int_t i=0;i<nPattern;i++) {
- TString const &pattern=((TObjString * const)patterns->At(i))
- ->GetString();
- Int_t bracketBegin=pattern.Last('[');
- Int_t len=pattern.Length();
- if((bracketBegin>0)&&(pattern[len-1]==']')) {
- TString axisId=pattern(0,bracketBegin);
- Int_t mask=0;
- if((axisId[0]=='*')&&(axisId.Length()==1)) {
- // turn all bins on
- mask=(1<<nAxis)-1;
- } else {
- // if axis is there, turn its bit on
- for(Int_t j=0;j<nAxis;j++) {
- if(!axisId.CompareTo(GetDistributionAxisLabel(j))) {
- mask|= (1<<j);
- }
- }
- }
- for(Int_t o=0;o<nOpt;o++) {
- if(pattern.Last(options[o])>bracketBegin) {
- isOptionGiven[o] |= mask;
- }
- }
- } else {
- Error("DecodeAxisSteering",
- "steering \"%s\" does not end with [options]",
- (const char *)pattern);
- }
- }
- }
+ // decode axis steering
+ // input
+ // axisSteering: the steering to decode
+ // options: the allowed options to extract
+ // output
+ // isOptionGiven[] : array of decoded steering options
+ // the dimension of isOptionGiven[] has to match the number of
+ // characters in "option"
+ //
+ // the axis steering is given in the form
+ // steering1;steering2;...;steeringN
+ // all parts of the steering, sepatared by ';' are parsed
+ // each part must have the form
+ // axisName[optionlist]
+ // where:
+ // axisName : the name of the axis for which the optionlist is relevant
+ // if the name is the character '*', all axes are matched
+ // optionlist : for each option the corresonding character
+ //
+ // example:
+ // imagine this node has two axes, named "xgen" and "ygen"
+ // then
+ // DecodeAxisSteering("*[u];xgen[c]","cuo",options);
+ // will set the "U" option for all axes and the "C" option for the "xgen"
+ // axis, so:
+ // options[0]=0x1; // option 'c' is true for axis 0 (bit #0 is set)
+ // options[1]=0x3; // option 'u' is true for both axes (bit #0,#1 are set)
+ // options[2]=0x0; // option 'o' is not given (no bits are set)
+ Int_t nOpt=TString(options).Length();
+ for(Int_t i=0;i<nOpt;i++) isOptionGiven[i]=0;
+ if(axisSteering) {
+ TObjArray *patterns=TString(axisSteering).Tokenize(";");
+ Int_t nPattern=patterns->GetEntries();
+ Int_t nAxis=fAxisLabelList->GetEntries();
+ for(Int_t i=0;i<nPattern;i++) {
+ TString const &pattern=((TObjString * const)patterns->At(i))
+ ->GetString();
+ Int_t bracketBegin=pattern.Last('[');
+ Int_t len=pattern.Length();
+ if((bracketBegin>0)&&(pattern[len-1]==']')) {
+ TString axisId=pattern(0,bracketBegin);
+ Int_t mask=0;
+ if((axisId[0]=='*')&&(axisId.Length()==1)) {
+ // turn all bins on
+ mask=(1<<nAxis)-1;
+ } else {
+ // if axis is there, turn its bit on
+ for(Int_t j=0;j<nAxis;j++) {
+ if(!axisId.CompareTo(GetDistributionAxisLabel(j))) {
+ mask|= (1<<j);
+ }
+ }
+ }
+ for(Int_t o=0;o<nOpt;o++) {
+ if(pattern.Last(options[o])>bracketBegin) {
+ isOptionGiven[o] |= mask;
+ }
+ }
+ } else {
+ Error("DecodeAxisSteering",
+ "steering \"%s\" does not end with [options]",
+ (const char *)pattern);
+ }
+ }
+ }
}
diff --git a/hist/hist/src/TUnfoldDensity.cxx b/hist/hist/src/TUnfoldDensity.cxx
index 6e0d0e8df49..3ed60e15ea8 100644
--- a/hist/hist/src/TUnfoldDensity.cxx
+++ b/hist/hist/src/TUnfoldDensity.cxx
@@ -239,8 +239,8 @@ TUnfoldDensity::TUnfoldDensity
// set up the regularisation here
if(regmode !=kRegModeNone) {
RegularizeDistribution
- (regmode,densityMode,regularisationDistribution,
- regularisationAxisSteering);
+ (regmode,densityMode,regularisationDistribution,
+ regularisationAxisSteering);
}
}
@@ -360,9 +360,9 @@ void TUnfoldDensity::RegularizeOneDistribution
<<"\n";
#endif
Info("RegularizeOneDistribution","regularizing %s regMode=%d"
- " densityMode=%d axisSteering=%s",
- binning->GetName(),(Int_t) regmode,(Int_t)densityMode,
- axisSteering ? axisSteering : "");
+ " densityMode=%d axisSteering=%s",
+ binning->GetName(),(Int_t) regmode,(Int_t)densityMode,
+ axisSteering ? axisSteering : "");
Int_t startBin=binning->GetStartBin();
Int_t endBin=startBin+ binning->GetDistributionNumberOfBins();
std::vector<Double_t> factor(endBin-startBin);
@@ -854,7 +854,7 @@ TH2 *TUnfoldDensity::GetRhoIJtotal
if(e_i>0.0) e_i=TMath::Sqrt(e_i);
else e_i=0.0;
for(Int_t j=0;j<=r->GetNbinsY()+1;j++) {
- if(i==j) continue;
+ if(i==j) continue;
Double_t e_j=r->GetBinContent(j,j);
if(e_j>0.0) e_j=TMath::Sqrt(e_j);
else e_j=0.0;
@@ -867,11 +867,11 @@ TH2 *TUnfoldDensity::GetRhoIJtotal
}
}
for(Int_t i=0;i<=r->GetNbinsX()+1;i++) {
- if(r->GetBinContent(i,i)>0.0) {
- r->SetBinContent(i,i,1.0);
- } else {
- r->SetBinContent(i,i,0.0);
- }
+ if(r->GetBinContent(i,i)>0.0) {
+ r->SetBinContent(i,i,1.0);
+ } else {
+ r->SetBinContent(i,i,0.0);
+ }
}
}
return r;
diff --git a/hist/spectrum/src/TSpectrum.cxx b/hist/spectrum/src/TSpectrum.cxx
index c5e179b6e79..3b38a337daf 100644
--- a/hist/spectrum/src/TSpectrum.cxx
+++ b/hist/spectrum/src/TSpectrum.cxx
@@ -305,9 +305,9 @@ Int_t TSpectrum::Search(const TH1 * hin, Double_t sigma, Option_t * option,
</pre>
Specify the option "goff" to disable the storage and drawing of the
polymarker.
- <p>
- To disable the final drawing of the histogram with the search results (in case
- you want to draw it yourself) specify "nodraw" in the options parameter.
+ <p>
+ To disable the final drawing of the histogram with the search results (in case
+ you want to draw it yourself) specify "nodraw" in the options parameter.
End_Html */
if (hin == 0) return 0;
@@ -332,11 +332,11 @@ Int_t TSpectrum::Search(const TH1 * hin, Double_t sigma, Option_t * option,
markov = kFALSE;
opt.ReplaceAll("nomarkov","");
}
- Bool_t draw = kTRUE;
- if (opt.Contains("nodraw")) {
- draw = kFALSE;
- opt.ReplaceAll("nodraw","");
- }
+ Bool_t draw = kTRUE;
+ if (opt.Contains("nodraw")) {
+ draw = kFALSE;
+ opt.ReplaceAll("nodraw","");
+ }
if (dimension == 1) {
Int_t first = hin->GetXaxis()->GetFirst();
Int_t last = hin->GetXaxis()->GetLast();
diff --git a/html/inc/THtml.h b/html/inc/THtml.h
index 01ec07cdf63..52d56e86af5 100644
--- a/html/inc/THtml.h
+++ b/html/inc/THtml.h
@@ -420,7 +420,7 @@ protected:
mutable TModuleDefinition *fModuleDef; // object translating classes to module names
mutable TFileDefinition* fFileDef; // object translating classes to file names
mutable TFileSysDB *fLocalFiles; // files found locally for a given source path
- Bool_t fBatch; // Whether to enable GUI output
+ Bool_t fBatch; // Whether to enable GUI output
ClassDef(THtml,0) //Convert class(es) into HTML file(s)
};
diff --git a/html/src/TDocParser.cxx b/html/src/TDocParser.cxx
index 77950c19fc7..3b1f6c63960 100644
--- a/html/src/TDocParser.cxx
+++ b/html/src/TDocParser.cxx
@@ -430,9 +430,9 @@ void TDocParser::Convert(std::ostream& out, std::istream& in, const char* relpat
}
} else {
// Write source for source and interpreted directives if they exist.
- if (fLineComment.Length() ) {
- GetDocOutput()->AdjustSourcePath(fLineComment, relpath);
- out << fLineComment << std::endl;
+ if (fLineComment.Length() ) {
+ GetDocOutput()->AdjustSourcePath(fLineComment, relpath);
+ out << fLineComment << std::endl;
} else if (!InContext(kDirective)) {
GetDocOutput()->AdjustSourcePath(fLineSource, relpath);
out << fLineSource << std::endl;
diff --git a/math/doc/v520/index.html b/math/doc/v520/index.html
index 5955de7d63f..453df9fbf15 100644
--- a/math/doc/v520/index.html
+++ b/math/doc/v520/index.html
@@ -27,10 +27,10 @@ Some of the basic special mathematical functions of TMath, like the error functi
The STL algorithms have been found for these cases to be perform better in term of CPU time. For some other algorithms like <tt>TMath::LocMin</tt>, <tt>TMath::LocMax</tt> or <tt>TMath::Permute</tt> the original implementation is faster than STL and has been maintained.
</li>
<li>Add a generic iterator interface, similar to the STL algorithm interface, to the following TMath functions:
- <tt>MinElement, MaxElemen, LocMin, LocMax, Mean, GeomMean, RMS,
- BinarySearch</tt>. The iterator interface for sort is called
- <tt>TMath::SortItr</tt> to avoid a compilation ambiguity. For example,
- for finding the mean of a <tt>std::vector<double> v</tt>, one simply needs to call <tt>TMath::Mean(v.begin(), v.end() ) </tt>.
+ <tt>MinElement, MaxElemen, LocMin, LocMax, Mean, GeomMean, RMS,
+ BinarySearch</tt>. The iterator interface for sort is called
+ <tt>TMath::SortItr</tt> to avoid a compilation ambiguity. For example,
+ for finding the mean of a <tt>std::vector<double> v</tt>, one simply needs to call <tt>TMath::Mean(v.begin(), v.end() ) </tt>.
</li>
<li>Various changes have been applied to the mathematical functions to remove duplications in the implementation with the special and statistical functions defined in <tt>ROOT::Math</tt>. The functions which have been changed and thus they can return a sightly different result than before are:
<ul>
diff --git a/math/foam/src/TFoam.cxx b/math/foam/src/TFoam.cxx
index 61250932fa3..e990a594448 100644
--- a/math/foam/src/TFoam.cxx
+++ b/math/foam/src/TFoam.cxx
@@ -911,19 +911,19 @@ void TFoam::Grow()
Int_t kEcho=10;
if(fLastCe>=10000) kEcho=100;
if( (fLastCe%kEcho)==0) {
- if (fChat>0) {
- if(fDim<10)
- std::cout<<fDim<<std::flush;
- else
- std::cout<<"."<<std::flush;
- if( (fLastCe%(100*kEcho))==0) std::cout<<"|"<<fLastCe<<std::endl<<std::flush;
- }
- }
+ if (fChat>0) {
+ if(fDim<10)
+ std::cout<<fDim<<std::flush;
+ else
+ std::cout<<"."<<std::flush;
+ if( (fLastCe%(100*kEcho))==0) std::cout<<"|"<<fLastCe<<std::endl<<std::flush;
+ }
+ }
}
if( Divide( newCell )==0) break; // and divide it into two
}
if (fChat>0) {
- std::cout<<std::endl<<std::flush;
+ std::cout<<std::endl<<std::flush;
}
CheckAll(0); // set arg=1 for more info
}// Grow
diff --git a/math/genvector/inc/Math/GenVector/Boost.h b/math/genvector/inc/Math/GenVector/Boost.h
index 8e1c2f9c062..8c78198f69e 100644
--- a/math/genvector/inc/Math/GenVector/Boost.h
+++ b/math/genvector/inc/Math/GenVector/Boost.h
@@ -58,9 +58,9 @@ public:
enum EBoostMatrixIndex {
kXX = 0, kXY = 1, kXZ = 2, kXT = 3
- , kYY = 4, kYZ = 5, kYT = 6
- , kZZ = 7, kZT = 8
- , kTT = 9
+ , kYY = 4, kYZ = 5, kYT = 6
+ , kZZ = 7, kZT = 8
+ , kTT = 9
};
// ========== Constructors and Assignment =====================
@@ -74,7 +74,7 @@ public:
Construct given a three Scalars beta_x, beta_y, and beta_z
*/
Boost(Scalar beta_x, Scalar beta_y, Scalar beta_z)
- { SetComponents(beta_x, beta_y, beta_z); }
+ { SetComponents(beta_x, beta_y, beta_z); }
/**
Construct given a beta vector (which must have methods x(), y(), z())
@@ -154,7 +154,7 @@ public:
template <class Avector>
void
SetComponents (const Avector & beta)
- { SetComponents(beta.x(), beta.y(), beta.z()); }
+ { SetComponents(beta.x(), beta.y(), beta.z()); }
/**
Set given a pair of pointers or iterators defining the beginning and end of
diff --git a/math/genvector/inc/Math/GenVector/BoostX.h b/math/genvector/inc/Math/GenVector/BoostX.h
index f2dc8ca0c8c..c91f35c2933 100644
--- a/math/genvector/inc/Math/GenVector/BoostX.h
+++ b/math/genvector/inc/Math/GenVector/BoostX.h
@@ -49,9 +49,9 @@ public:
enum EBoostMatrixIndex {
kXX = 0, kXY = 1, kXZ = 2, kXT = 3
- , kYY = 4, kYZ = 5, kYT = 6
- , kZZ = 7, kZT = 8
- , kTT = 9
+ , kYY = 4, kYZ = 5, kYT = 6
+ , kZZ = 7, kZT = 8
+ , kTT = 9
};
// ========== Constructors and Assignment =====================
diff --git a/math/genvector/inc/Math/GenVector/BoostY.h b/math/genvector/inc/Math/GenVector/BoostY.h
index 154b84bcd4b..2920fd28d09 100644
--- a/math/genvector/inc/Math/GenVector/BoostY.h
+++ b/math/genvector/inc/Math/GenVector/BoostY.h
@@ -49,9 +49,9 @@ public:
enum EBoostMatrixIndex {
kXX = 0, kXY = 1, kXZ = 2, kXT = 3
- , kYY = 4, kYZ = 5, kYT = 6
- , kZZ = 7, kZT = 8
- , kTT = 9
+ , kYY = 4, kYZ = 5, kYT = 6
+ , kZZ = 7, kZT = 8
+ , kTT = 9
};
// ========== Constructors and Assignment =====================
diff --git a/math/genvector/inc/Math/GenVector/BoostZ.h b/math/genvector/inc/Math/GenVector/BoostZ.h
index b56792c23f0..ce8122fce48 100644
--- a/math/genvector/inc/Math/GenVector/BoostZ.h
+++ b/math/genvector/inc/Math/GenVector/BoostZ.h
@@ -49,9 +49,9 @@ public:
enum EBoostMatrixIndex {
kXX = 0, kXY = 1, kXZ = 2, kXT = 3
- , kYY = 4, kYZ = 5, kYT = 6
- , kZZ = 7, kZT = 8
- , kTT = 9
+ , kYY = 4, kYZ = 5, kYT = 6
+ , kZZ = 7, kZT = 8
+ , kTT = 9
};
// ========== Constructors and Assignment =====================
diff --git a/math/genvector/inc/Math/GenVector/Cartesian2D.h b/math/genvector/inc/Math/GenVector/Cartesian2D.h
index d1c6809a32f..69aa627020c 100644
--- a/math/genvector/inc/Math/GenVector/Cartesian2D.h
+++ b/math/genvector/inc/Math/GenVector/Cartesian2D.h
@@ -3,8 +3,8 @@
/**********************************************************************
* *
- * Copyright (c) 2005 , LCG ROOT MathLib Team *
- * & FNAL LCG ROOT Mathlib Team *
+ * Copyright (c) 2005 , LCG ROOT MathLib Team *
+ * & FNAL LCG ROOT Mathlib Team *
* *
* *
**********************************************************************/
diff --git a/math/genvector/inc/Math/GenVector/Cartesian3D.h b/math/genvector/inc/Math/GenVector/Cartesian3D.h
index c5afa1f5387..0f77bdb5a58 100644
--- a/math/genvector/inc/Math/GenVector/Cartesian3D.h
+++ b/math/genvector/inc/Math/GenVector/Cartesian3D.h
@@ -3,8 +3,8 @@
/**********************************************************************
* *
- * Copyright (c) 2005 , LCG ROOT MathLib Team *
- * & FNAL LCG ROOT Mathlib Team *
+ * Copyright (c) 2005 , LCG ROOT MathLib Team *
+ * & FNAL LCG ROOT Mathlib Team *
* *
* *
**********************************************************************/
@@ -110,7 +110,7 @@ public :
/**
get internal data into 3 Scalar numbers
*/
- void GetCoordinates(Scalar& xx, Scalar& yy, Scalar& zz) const {xx=fX; yy=fY; zz=fZ;}
+ void GetCoordinates(Scalar& xx, Scalar& yy, Scalar& zz) const {xx=fX; yy=fY; zz=fZ;}
Scalar X() const { return fX;}
Scalar Y() const { return fY;}
diff --git a/math/genvector/inc/Math/GenVector/Cylindrical3D.h b/math/genvector/inc/Math/GenVector/Cylindrical3D.h
index 1c5baf003ae..4d86928cca8 100644
--- a/math/genvector/inc/Math/GenVector/Cylindrical3D.h
+++ b/math/genvector/inc/Math/GenVector/Cylindrical3D.h
@@ -107,7 +107,7 @@ public :
get internal data into 3 Scalar numbers ( rho, z , phi)
*/
void GetCoordinates(Scalar& rho, Scalar& zz, Scalar& phi) const
- {rho=fRho; zz=fZ; phi=fPhi;}
+ {rho=fRho; zz=fZ; phi=fPhi;}
private:
inline static Scalar pi() { return M_PI; }
diff --git a/math/genvector/inc/Math/GenVector/CylindricalEta3D.h b/math/genvector/inc/Math/GenVector/CylindricalEta3D.h
index 7eabfb46d2b..f26a2c91ebb 100644
--- a/math/genvector/inc/Math/GenVector/CylindricalEta3D.h
+++ b/math/genvector/inc/Math/GenVector/CylindricalEta3D.h
@@ -63,7 +63,7 @@ public :
Construct from rho eta and phi values
*/
CylindricalEta3D(Scalar rho, Scalar eta, Scalar phi) :
- fRho(rho), fEta(eta), fPhi(phi) { Restrict(); }
+ fRho(rho), fEta(eta), fPhi(phi) { Restrict(); }
/**
Construct from any Vector or coordinate system implementing
@@ -71,10 +71,10 @@ public :
*/
template <class CoordSystem >
explicit CylindricalEta3D( const CoordSystem & v ) :
- fRho(v.Rho() ), fEta(v.Eta() ), fPhi(v.Phi() )
+ fRho(v.Rho() ), fEta(v.Eta() ), fPhi(v.Phi() )
{
static Scalar bigEta =
- -.3f *std::log(std::numeric_limits<Scalar>::epsilon());
+ -.3f *std::log(std::numeric_limits<Scalar>::epsilon());
if ( std::fabs(fEta) > bigEta ) {
fRho *= v.Z()/Z(); // This gives a small absolute adjustment in rho,
// which, for large eta, results in a significant
@@ -123,7 +123,7 @@ public :
get internal data into 3 Scalar numbers
*/
void GetCoordinates(Scalar& rho, Scalar& eta, Scalar& phi) const
- {rho=fRho; eta=fEta; phi=fPhi;}
+ {rho=fRho; eta=fEta; phi=fPhi;}
private:
inline static Scalar pi() { return M_PI; }
@@ -148,7 +148,7 @@ public:
T R() const { return fRho > 0 ? fRho*std::cosh(fEta) :
fEta > etaMax<T>() ? fEta - etaMax<T>() :
fEta < -etaMax<T>() ? -fEta - etaMax<T>() :
- 0 ; }
+ 0 ; }
T Mag2() const { return R()*R(); }
T Perp2() const { return fRho*fRho; }
T Theta() const { return fRho > 0 ? 2* std::atan( std::exp( - fEta ) ) :
diff --git a/math/genvector/inc/Math/GenVector/DisplacementVector3D.h b/math/genvector/inc/Math/GenVector/DisplacementVector3D.h
index bc2f148b512..09024549283 100644
--- a/math/genvector/inc/Math/GenVector/DisplacementVector3D.h
+++ b/math/genvector/inc/Math/GenVector/DisplacementVector3D.h
@@ -59,16 +59,16 @@ namespace ROOT {
//__________________________________________________________________________________________
/**
- Class describing a generic displacement vector in 3 dimensions.
- This class is templated on the type of Coordinate system.
- One example is the XYZVector which is a vector based on
- double precision x,y,z data members by using the
- ROOT::Math::Cartesian3D<double> Coordinate system.
- The class is having also an extra template parameter, the coordinate system tag,
- to be able to identify (tag) vector described in different reference coordinate system,
- like global or local coordinate systems.
-
- @ingroup GenVector
+ Class describing a generic displacement vector in 3 dimensions.
+ This class is templated on the type of Coordinate system.
+ One example is the XYZVector which is a vector based on
+ double precision x,y,z data members by using the
+ ROOT::Math::Cartesian3D<double> Coordinate system.
+ The class is having also an extra template parameter, the coordinate system tag,
+ to be able to identify (tag) vector described in different reference coordinate system,
+ like global or local coordinate systems.
+
+ @ingroup GenVector
*/
template <class CoordSystem, class Tag = DefaultCoordinateSystemTag >
@@ -159,8 +159,8 @@ namespace ROOT {
template <class OtherCoords>
DisplacementVector3D & operator=
( const PositionVector3D<OtherCoords,Tag> & rhs) {
- SetXYZ(rhs.x(), rhs.y(), rhs.z());
- return *this;
+ SetXYZ(rhs.x(), rhs.y(), rhs.z());
+ return *this;
}
@@ -395,9 +395,9 @@ namespace ROOT {
// -- need to have the specialized version in order to avoid
/**
- Return the scalar (dot) product of two displacement vectors.
- It is possible to perform the product for any type of vector coordinates,
- but they must have the same coordinate system tag
+ Return the scalar (dot) product of two displacement vectors.
+ It is possible to perform the product for any type of vector coordinates,
+ but they must have the same coordinate system tag
*/
template< class OtherCoords >
Scalar Dot( const DisplacementVector3D<OtherCoords,Tag> & v) const {
@@ -414,10 +414,10 @@ namespace ROOT {
}
/**
- Return vector (cross) product of two displacement vectors,
- as a vector in the coordinate system of this class.
- It is possible to perform the product for any type of vector coordinates,
- but they must have the same coordinate system tag
+ Return vector (cross) product of two displacement vectors,
+ as a vector in the coordinate system of this class.
+ It is possible to perform the product for any type of vector coordinates,
+ but they must have the same coordinate system tag
*/
template <class OtherCoords>
DisplacementVector3D Cross( const DisplacementVector3D<OtherCoords,Tag> & v) const {
diff --git a/math/genvector/inc/Math/GenVector/EulerAngles.h b/math/genvector/inc/Math/GenVector/EulerAngles.h
index bedca087b32..f3230e446a4 100644
--- a/math/genvector/inc/Math/GenVector/EulerAngles.h
+++ b/math/genvector/inc/Math/GenVector/EulerAngles.h
@@ -56,7 +56,7 @@ public:
*/
EulerAngles( Scalar phi, Scalar theta, Scalar psi ) :
fPhi(phi), fTheta(theta), fPsi(psi)
- {Rectify();} // Added 27 Jan. 06 JMM
+ {Rectify();} // Added 27 Jan. 06 JMM
/**
Construct given a pair of pointers or iterators defining the
@@ -157,7 +157,7 @@ public:
fTheta = *begin++;
fPsi = *begin++;
assert(begin == end);
- Rectify(); // Added 27 Jan. 06 JMM
+ Rectify(); // Added 27 Jan. 06 JMM
}
/**
@@ -191,7 +191,7 @@ public:
*/
void SetComponents(Scalar phi, Scalar theta, Scalar psi) {
fPhi=phi; fTheta=theta; fPsi=psi;
- Rectify(); // Added 27 Jan. 06 JMM
+ Rectify(); // Added 27 Jan. 06 JMM
}
/**
@@ -202,7 +202,7 @@ public:
}
/**
- Set Phi Euler angle // JMM 30 Jan. 2006
+ Set Phi Euler angle // JMM 30 Jan. 2006
*/
void SetPhi(Scalar phi) { fPhi=phi; Rectify(); }
@@ -212,7 +212,7 @@ public:
Scalar Phi() const { return fPhi; }
/**
- Set Theta Euler angle // JMM 30 Jan. 2006
+ Set Theta Euler angle // JMM 30 Jan. 2006
*/
void SetTheta(Scalar theta) { fTheta=theta; Rectify(); }
@@ -222,7 +222,7 @@ public:
Scalar Theta() const { return fTheta; }
/**
- Set Psi Euler angle // JMM 30 Jan. 2006
+ Set Psi Euler angle // JMM 30 Jan. 2006
*/
void SetPsi(Scalar psi) { fPsi=psi; Rectify(); }
diff --git a/math/genvector/inc/Math/GenVector/LorentzRotation.h b/math/genvector/inc/Math/GenVector/LorentzRotation.h
index 1c266755211..448c5568d21 100644
--- a/math/genvector/inc/Math/GenVector/LorentzRotation.h
+++ b/math/genvector/inc/Math/GenVector/LorentzRotation.h
@@ -140,9 +140,9 @@ public:
Scalar tx, Scalar ty, Scalar tz, Scalar tt)
{
SetComponents (xx, xy, xz, xt,
- yx, yy, yz, yt,
+ yx, yy, yz, yt,
zx, zy, zz, zt,
- tx, ty, tz, tt);
+ tx, ty, tz, tt);
}
/**
diff --git a/math/genvector/inc/Math/GenVector/LorentzVector.h b/math/genvector/inc/Math/GenVector/LorentzVector.h
index 9810674bb27..152bac01cc4 100644
--- a/math/genvector/inc/Math/GenVector/LorentzVector.h
+++ b/math/genvector/inc/Math/GenVector/LorentzVector.h
@@ -48,7 +48,7 @@ namespace ROOT {
DisplacementVector in 4D. The Minkowski components could be viewed as
v and t, or for kinematic 4-vectors, as p and E.
- @ingroup GenVector
+ @ingroup GenVector
*/
template< class CoordSystem >
class LorentzVector {
@@ -592,11 +592,11 @@ namespace ROOT {
else {
GenVector::Throw ("LorentzVector::Beta() - beta computed for LorentzVector with t = 0. Return an Infinite result");
return 1./E();
- }
+ }
}
if ( M2() <= 0 ) {
GenVector::Throw ("LorentzVector::Beta() - beta computed for non-timelike LorentzVector . Result is physically meaningless" );
- }
+ }
return P() / E();
}
/**
diff --git a/math/genvector/inc/Math/GenVector/Plane3D.h b/math/genvector/inc/Math/GenVector/Plane3D.h
index 7e4f60c9496..d7be89dc366 100644
--- a/math/genvector/inc/Math/GenVector/Plane3D.h
+++ b/math/genvector/inc/Math/GenVector/Plane3D.h
@@ -63,8 +63,8 @@ namespace Math {
Plane3D ( ) : fA(0), fB(0), fC(1.), fD(0) { }
/**
- generic constructors from the four scalar values describing the plane
- according to the equation ax + by + cz + d = 0
+ generic constructors from the four scalar values describing the plane
+ according to the equation ax + by + cz + d = 0
\param a scalar value
\param b scalar value
\param c scalar value
@@ -73,9 +73,9 @@ namespace Math {
Plane3D(const Scalar & a, const Scalar & b, const Scalar & c, const Scalar & d);
/**
- constructor a Plane3D from a normal vector and a point coplanar to the plane
- \param n normal expressed as a ROOT::Math::DisplacementVector3D<Cartesian3D<double> >
- \param p point expressed as a ROOT::Math::PositionVector3D<Cartesian3D<double> >
+ constructor a Plane3D from a normal vector and a point coplanar to the plane
+ \param n normal expressed as a ROOT::Math::DisplacementVector3D<Cartesian3D<double> >
+ \param p point expressed as a ROOT::Math::PositionVector3D<Cartesian3D<double> >
*/
Plane3D(const Vector & n, const Point & p )
{
@@ -84,10 +84,10 @@ namespace Math {
/**
- Construct from a generic DisplacementVector3D (normal vector) and PositionVector3D (point coplanar to
- the plane)
- \param n normal expressed as a generic ROOT::Math::DisplacementVector3D
- \param p point expressed as a generic ROOT::Math::PositionVector3D
+ Construct from a generic DisplacementVector3D (normal vector) and PositionVector3D (point coplanar to
+ the plane)
+ \param n normal expressed as a generic ROOT::Math::DisplacementVector3D
+ \param p point expressed as a generic ROOT::Math::PositionVector3D
*/
template<class T1, class T2, class U>
Plane3D( const DisplacementVector3D<T1,U> & n, const PositionVector3D<T2,U> & p)
@@ -96,21 +96,20 @@ namespace Math {
}
/**
- constructor from three Cartesian point belonging to the plane
- \param p1 point1 expressed as a generic ROOT::Math::PositionVector3D
- \param p2 point2 expressed as a generic ROOT::Math::PositionVector3D
- \param p3 point3 expressed as a generic ROOT::Math::PositionVector3D
-
+ constructor from three Cartesian point belonging to the plane
+ \param p1 point1 expressed as a generic ROOT::Math::PositionVector3D
+ \param p2 point2 expressed as a generic ROOT::Math::PositionVector3D
+ \param p3 point3 expressed as a generic ROOT::Math::PositionVector3D
*/
Plane3D(const Point & p1, const Point & p2, const Point & p3 ) {
BuildFrom3Points(p1,p2,p3);
}
/**
- constructor from three generic point belonging to the plane
- \param p1 point1 expressed as ROOT::Math::DisplacementVector3D<Cartesian3D<double> >
- \param p2 point2 expressed as ROOT::Math::DisplacementVector3D<Cartesian3D<double> >
- \param p3 point3 expressed as ROOT::Math::DisplacementVector3D<Cartesian3D<double> >
+ constructor from three generic point belonging to the plane
+ \param p1 point1 expressed as ROOT::Math::DisplacementVector3D<Cartesian3D<double> >
+ \param p2 point2 expressed as ROOT::Math::DisplacementVector3D<Cartesian3D<double> >
+ \param p3 point3 expressed as ROOT::Math::DisplacementVector3D<Cartesian3D<double> >
*/
template <class T1, class T2, class T3, class U>
Plane3D(const PositionVector3D<T1,U> & p1, const PositionVector3D<T2,U> & p2, const PositionVector3D<T3,U> & p3 )
@@ -169,8 +168,8 @@ namespace Math {
}
/**
- Return the Hesse Distance (distance from the origin) of the plane or
- the d coefficient expressed in normalize form
+ Return the Hesse Distance (distance from the origin) of the plane or
+ the d coefficient expressed in normalize form
*/
Scalar HesseDistance() const {
return fD;
@@ -178,41 +177,41 @@ namespace Math {
/**
- Return the signed distance to a Point.
- The distance is signed positive if the Point is in the same side of the
- normal vector to the plane.
- \param p Point expressed in Cartesian Coordinates
- */
- Scalar Distance(const Point & p) const;
+ Return the signed distance to a Point.
+ The distance is signed positive if the Point is in the same side of the
+ normal vector to the plane.
+ \param p Point expressed in Cartesian Coordinates
+ */
+ Scalar Distance(const Point & p) const;
/**
- Return the distance to a Point described with generic coordinates
- \param p Point expressed as generic ROOT::Math::PositionVector3D
- */
- template <class T, class U>
- Scalar Distance(const PositionVector3D<T,U> & p) const {
+ Return the distance to a Point described with generic coordinates
+ \param p Point expressed as generic ROOT::Math::PositionVector3D
+ */
+ template <class T, class U>
+ Scalar Distance(const PositionVector3D<T,U> & p) const {
return Distance( Point(p.X(), p.Y(), p.Z() ) );
}
/**
- Return the projection of a Cartesian point to a plane
- \param p Point expressed as PositionVector3D<Cartesian3D<double> >
- */
- Point ProjectOntoPlane(const Point & p) const;
+ Return the projection of a Cartesian point to a plane
+ \param p Point expressed as PositionVector3D<Cartesian3D<double> >
+ */
+ Point ProjectOntoPlane(const Point & p) const;
/**
- Return the projection of a point to a plane
- \param p Point expressed as generic ROOT::Math::PositionVector3D
- */
- template <class T, class U>
- PositionVector3D<T,U> ProjectOntoPlane(const PositionVector3D<T,U> & p) const {
+ Return the projection of a point to a plane
+ \param p Point expressed as generic ROOT::Math::PositionVector3D
+ */
+ template <class T, class U>
+ PositionVector3D<T,U> ProjectOntoPlane(const PositionVector3D<T,U> & p) const {
Point pxyz = ProjectOntoPlane(Point(p.X(), p.Y(), p.Z() ) );
PositionVector3D<T,U> p2;
- p2.SetXYZ( pxyz.X(), pxyz.Y(), pxyz.Z() );
+ p2.SetXYZ( pxyz.X(), pxyz.Y(), pxyz.Z() );
return p2;
}
-
-
+
+
// ------------------- Equality -----------------
diff --git a/math/genvector/inc/Math/GenVector/Polar2D.h b/math/genvector/inc/Math/GenVector/Polar2D.h
index d3986bb86bc..1f3ba89d171 100644
--- a/math/genvector/inc/Math/GenVector/Polar2D.h
+++ b/math/genvector/inc/Math/GenVector/Polar2D.h
@@ -96,7 +96,7 @@ public :
/**
get internal data into 2 Scalar numbers
*/
- void GetCoordinates(Scalar& r, Scalar& phi) const {r=fR; phi=fPhi;}
+ void GetCoordinates(Scalar& r, Scalar& phi) const {r=fR; phi=fPhi;}
Scalar R() const { return fR;}
diff --git a/math/genvector/inc/Math/GenVector/Polar3D.h b/math/genvector/inc/Math/GenVector/Polar3D.h
index fcc708a8e0c..c1409c0805b 100644
--- a/math/genvector/inc/Math/GenVector/Polar3D.h
+++ b/math/genvector/inc/Math/GenVector/Polar3D.h
@@ -107,7 +107,7 @@ public :
/**
get internal data into 3 Scalar numbers
*/
- void GetCoordinates(Scalar& r, Scalar& theta, Scalar& phi) const {r=fR; theta=fTheta; phi=fPhi;}
+ void GetCoordinates(Scalar& r, Scalar& theta, Scalar& phi) const {r=fR; theta=fTheta; phi=fPhi;}
Scalar R() const { return fR;}
diff --git a/math/genvector/inc/Math/GenVector/PositionVector2D.h b/math/genvector/inc/Math/GenVector/PositionVector2D.h
index bb1f49bf718..d4883068e9d 100644
--- a/math/genvector/inc/Math/GenVector/PositionVector2D.h
+++ b/math/genvector/inc/Math/GenVector/PositionVector2D.h
@@ -252,8 +252,8 @@ namespace ROOT {
// need to specialize to exclude those with a different tags
/**
- Return the scalar (Dot) product of this with a displacement vector in
- any coordinate system, but with the same tag
+ Return the scalar (Dot) product of this with a displacement vector in
+ any coordinate system, but with the same tag
*/
template< class OtherCoords >
Scalar Dot( const DisplacementVector2D<OtherCoords,Tag> & v) const {
diff --git a/math/genvector/inc/Math/GenVector/PositionVector3D.h b/math/genvector/inc/Math/GenVector/PositionVector3D.h
index 4111e0f3411..eef5f81dc83 100644
--- a/math/genvector/inc/Math/GenVector/PositionVector3D.h
+++ b/math/genvector/inc/Math/GenVector/PositionVector3D.h
@@ -47,16 +47,16 @@ namespace ROOT {
//__________________________________________________________________________________________
/**
- Class describing a generic position vector (point) in 3 dimensions.
- This class is templated on the type of Coordinate system.
- One example is the XYZPoint which is a vector based on
- double precision x,y,z data members by using the
- ROOT::Math::Cartesian3D<double> Coordinate system.
- The class is having also an extra template parameter, the coordinate system tag,
- to be able to identify (tag) vector described in different reference coordinate system,
- like global or local coordinate systems.
-
- @ingroup GenVector
+ Class describing a generic position vector (point) in 3 dimensions.
+ This class is templated on the type of Coordinate system.
+ One example is the XYZPoint which is a vector based on
+ double precision x,y,z data members by using the
+ ROOT::Math::Cartesian3D<double> Coordinate system.
+ The class is having also an extra template parameter, the coordinate system tag,
+ to be able to identify (tag) vector described in different reference coordinate system,
+ like global or local coordinate systems.
+
+ @ingroup GenVector
*/
template <class CoordSystem, class Tag = DefaultCoordinateSystemTag >
@@ -369,8 +369,8 @@ namespace ROOT {
// need to specialize to exclude those with a different tags
/**
- Return the scalar (Dot) product of this with a displacement vector in
- any coordinate system, but with the same tag
+ Return the scalar (Dot) product of this with a displacement vector in
+ any coordinate system, but with the same tag
*/
template< class OtherCoords >
Scalar Dot( const DisplacementVector3D<OtherCoords,Tag> & v) const {
diff --git a/math/genvector/inc/Math/GenVector/PxPyPzE4D.h b/math/genvector/inc/Math/GenVector/PxPyPzE4D.h
index 74caf923ab3..d3259dde294 100644
--- a/math/genvector/inc/Math/GenVector/PxPyPzE4D.h
+++ b/math/genvector/inc/Math/GenVector/PxPyPzE4D.h
@@ -113,7 +113,7 @@ public :
get internal data into 4 Scalar numbers
*/
void GetCoordinates(Scalar& px, Scalar& py, Scalar& pz, Scalar& e) const
- { px=fX; py=fY; pz=fZ; e=fT;}
+ { px=fX; py=fY; pz=fZ; e=fT;}
// --------- Coordinates and Coordinate-like Scalar properties -------------
diff --git a/math/genvector/inc/Math/GenVector/PxPyPzM4D.h b/math/genvector/inc/Math/GenVector/PxPyPzM4D.h
index 135af63c01c..049ef122bdd 100644
--- a/math/genvector/inc/Math/GenVector/PxPyPzM4D.h
+++ b/math/genvector/inc/Math/GenVector/PxPyPzM4D.h
@@ -139,7 +139,7 @@ public :
get internal data into 4 Scalar numbers
*/
void GetCoordinates(Scalar& px, Scalar& py, Scalar& pz, Scalar& m) const
- { px=fX; py=fY; pz=fZ; m=fM;}
+ { px=fX; py=fY; pz=fZ; m=fM;}
// --------- Coordinates and Coordinate-like Scalar properties -------------
@@ -157,7 +157,7 @@ public :
// other coordinate representation
/**
Energy
- */
+ */
Scalar E() const { return std::sqrt(E2() ); }
Scalar T() const { return E();}
diff --git a/math/genvector/inc/Math/GenVector/RotationZYX.h b/math/genvector/inc/Math/GenVector/RotationZYX.h
index 83b4cb56c08..e0af480ced0 100644
--- a/math/genvector/inc/Math/GenVector/RotationZYX.h
+++ b/math/genvector/inc/Math/GenVector/RotationZYX.h
@@ -87,7 +87,7 @@ public:
*/
RotationZYX( Scalar phi, Scalar theta, Scalar psi ) :
fPhi(phi), fTheta(theta), fPsi(psi)
- {Rectify();} // Added 27 Jan. 06 JMM
+ {Rectify();} // Added 27 Jan. 06 JMM
/**
Construct given a pair of pointers or iterators defining the
@@ -140,7 +140,7 @@ public:
fTheta = *begin++;
fPsi = *begin++;
assert(begin == end);
- Rectify();
+ Rectify();
}
/**
@@ -174,7 +174,7 @@ public:
*/
void SetComponents(Scalar phi, Scalar theta, Scalar psi) {
fPhi=phi; fTheta=theta; fPsi=psi;
- Rectify();
+ Rectify();
}
/**
@@ -185,27 +185,27 @@ public:
}
/**
- Set Phi angle (Z rotation angle)
+ Set Phi angle (Z rotation angle)
*/
void SetPhi(Scalar phi) { fPhi=phi; Rectify(); }
/**
- Return Phi angle (Z rotation angle)
+ Return Phi angle (Z rotation angle)
*/
Scalar Phi() const { return fPhi; }
/**
- Set Theta angle (Y' rotation angle)
+ Set Theta angle (Y' rotation angle)
*/
void SetTheta(Scalar theta) { fTheta=theta; Rectify(); }
/**
- Return Theta angle (Y' rotation angle)
+ Return Theta angle (Y' rotation angle)
*/
Scalar Theta() const { return fTheta; }
/**
- Set Psi angle (X'' rotation angle)
+ Set Psi angle (X'' rotation angle)
*/
void SetPsi(Scalar psi) { fPsi=psi; Rectify(); }
diff --git a/math/genvector/inc/Math/GenVector/VectorUtil.h b/math/genvector/inc/Math/GenVector/VectorUtil.h
index 6729dc83548..d5bc5809bab 100644
--- a/math/genvector/inc/Math/GenVector/VectorUtil.h
+++ b/math/genvector/inc/Math/GenVector/VectorUtil.h
@@ -1,21 +1,21 @@
// @(#)root/mathcore:$Id: 9ef2a4a7bd1b62c1293920c2af2f64791c75bdd8 $
-// Authors: W. Brown, M. Fischler, L. Moneta 2005
+// Authors: W. Brown, M. Fischler, L. Moneta 2005
- /**********************************************************************
- * *
- * Copyright (c) 2005 , LCG ROOT MathLib Team *
- * *
- * *
- **********************************************************************/
+/**********************************************************************
+ * *
+ * Copyright (c) 2005 , LCG ROOT MathLib Team *
+ * *
+ * *
+ **********************************************************************/
// Header file for Vector Utility functions
-//
+//
// Created by: moneta at Tue May 31 21:10:29 2005
-//
+//
// Last update: Tue May 31 21:10:29 2005
-//
-#ifndef ROOT_Math_GenVector_VectorUtil
+//
+#ifndef ROOT_Math_GenVector_VectorUtil
#define ROOT_Math_GenVector_VectorUtil 1
#ifndef ROOT_Math_Math
@@ -25,468 +25,468 @@
#include "Math/GenVector/Boost.h"
-namespace ROOT {
+namespace ROOT {
- namespace Math {
+ namespace Math {
- // utility functions for vector classes
+ // utility functions for vector classes
- /**
- Global Helper functions for generic Vector classes. Any Vector classes implementing some defined member functions,
- like Phi() or Eta() or mag() can use these functions.
- The functions returning a scalar value, returns always double precision number even if the vector are
- based on another precision type
-
- @ingroup GenVector
- */
-
-
- namespace VectorUtil {
-
-
- // methods for 3D vectors
-
- /**
- Find aximutal Angle difference between two generic vectors ( v2.Phi() - v1.Phi() )
- The only requirements on the Vector classes is that they implement the Phi() method
- \param v1 Vector of any type implementing the Phi() operator
- \param v2 Vector of any type implementing the Phi() operator
- \return Phi difference
- \f[ \Delta \phi = \phi_2 - \phi_1 \f]
- */
- template <class Vector1, class Vector2>
- inline typename Vector1::Scalar DeltaPhi( const Vector1 & v1, const Vector2 & v2) {
- typename Vector1::Scalar dphi = v2.Phi() - v1.Phi();
- if ( dphi > M_PI ) {
- dphi -= 2.0*M_PI;
- } else if ( dphi <= -M_PI ) {
- dphi += 2.0*M_PI;
- }
- return dphi;
- }
-
-
-
- /**
- Find square of the difference in pseudorapidity (Eta) and Phi betwen two generic vectors
- The only requirements on the Vector classes is that they implement the Phi() and Eta() method
- \param v1 Vector 1
- \param v2 Vector 2
- \return Angle between the two vectors
- \f[ \Delta R2 = ( \Delta \phi )^2 + ( \Delta \eta )^2 \f]
- */
- template <class Vector1, class Vector2>
- inline typename Vector1::Scalar DeltaR2( const Vector1 & v1, const Vector2 & v2) {
- typename Vector1::Scalar dphi = DeltaPhi(v1,v2);
- typename Vector1::Scalar deta = v2.Eta() - v1.Eta();
- return dphi*dphi + deta*deta;
- }
-
- /**
- Find difference in pseudorapidity (Eta) and Phi betwen two generic vectors
- The only requirements on the Vector classes is that they implement the Phi() and Eta() method
- \param v1 Vector 1
- \param v2 Vector 2
- \return Angle between the two vectors
- \f[ \Delta R = \sqrt{ ( \Delta \phi )^2 + ( \Delta \eta )^2 } \f]
- */
- template <class Vector1, class Vector2>
- inline typename Vector1::Scalar DeltaR( const Vector1 & v1, const Vector2 & v2) {
- return std::sqrt( DeltaR2(v1,v2) );
- }
-
-
-
/**
- Find CosTheta Angle between two generic 3D vectors
- pre-requisite: vectors implement the X(), Y() and Z()
- \param v1 Vector v1
- \param v2 Vector v2
- \return cosine of Angle between the two vectors
- \f[ \cos \theta = \frac { \vec{v1} \cdot \vec{v2} }{ | \vec{v1} | | \vec{v2} | } \f]
- */
- // this cannot be made all generic since Mag2() for 2, 3 or 4 D is different
- // need to have a specialization for polar Coordinates ??
- template <class Vector1, class Vector2>
- double CosTheta( const Vector1 & v1, const Vector2 & v2) {
- double arg;
- double v1_r2 = v1.X()*v1.X() + v1.Y()*v1.Y() + v1.Z()*v1.Z();
- double v2_r2 = v2.X()*v2.X() + v2.Y()*v2.Y() + v2.Z()*v2.Z();
- double ptot2 = v1_r2*v2_r2;
- if(ptot2 <= 0) {
- arg = 0.0;
- }else{
- double pdot = v1.X()*v2.X() + v1.Y()*v2.Y() + v1.Z()*v2.Z();
- arg = pdot/std::sqrt(ptot2);
- if(arg > 1.0) arg = 1.0;
- if(arg < -1.0) arg = -1.0;
- }
- return arg;
- }
+ Global Helper functions for generic Vector classes. Any Vector classes implementing some defined member functions,
+ like Phi() or Eta() or mag() can use these functions.
+ The functions returning a scalar value, returns always double precision number even if the vector are
+ based on another precision type
+ @ingroup GenVector
+ */
- /**
- Find Angle between two vectors.
- Use the CosTheta() function
- \param v1 Vector v1
- \param v2 Vector v2
- \return Angle between the two vectors
- \f[ \theta = \cos ^{-1} \frac { \vec{v1} \cdot \vec{v2} }{ | \vec{v1} | | \vec{v2} | } \f]
- */
- template <class Vector1, class Vector2>
- inline double Angle( const Vector1 & v1, const Vector2 & v2) {
- return std::acos( CosTheta(v1, v2) );
- }
- /**
- Find the projection of v along the given direction u.
- \param v Vector v for which the propjection is to be found
- \param u Vector specifying the direction
- \return Vector projection (same type of v)
- \f[ \vec{proj} = \frac{ \vec{v} \cdot \vec{u} }{|\vec{u}|}\vec{u} \f]
- Precondition is that Vector1 implements Dot function and Vector2 implements X(),Y() and Z()
- */
- template <class Vector1, class Vector2>
- Vector1 ProjVector( const Vector1 & v, const Vector2 & u) {
- double magU2 = u.X()*u.X() + u.Y()*u.Y() + u.Z()*u.Z();
- if (magU2 == 0) return Vector1(0,0,0);
- double d = v.Dot(u)/magU2;
- return Vector1( u.X() * d, u.Y() * d, u.Z() * d);
- }
+ namespace VectorUtil {
+
+
+ // methods for 3D vectors
+
+ /**
+ Find aximutal Angle difference between two generic vectors ( v2.Phi() - v1.Phi() )
+ The only requirements on the Vector classes is that they implement the Phi() method
+ \param v1 Vector of any type implementing the Phi() operator
+ \param v2 Vector of any type implementing the Phi() operator
+ \return Phi difference
+ \f[ \Delta \phi = \phi_2 - \phi_1 \f]
+ */
+ template <class Vector1, class Vector2>
+ inline typename Vector1::Scalar DeltaPhi( const Vector1 & v1, const Vector2 & v2) {
+ typename Vector1::Scalar dphi = v2.Phi() - v1.Phi();
+ if ( dphi > M_PI ) {
+ dphi -= 2.0*M_PI;
+ } else if ( dphi <= -M_PI ) {
+ dphi += 2.0*M_PI;
+ }
+ return dphi;
+ }
+
+
+
+ /**
+ Find square of the difference in pseudorapidity (Eta) and Phi betwen two generic vectors
+ The only requirements on the Vector classes is that they implement the Phi() and Eta() method
+ \param v1 Vector 1
+ \param v2 Vector 2
+ \return Angle between the two vectors
+ \f[ \Delta R2 = ( \Delta \phi )^2 + ( \Delta \eta )^2 \f]
+ */
+ template <class Vector1, class Vector2>
+ inline typename Vector1::Scalar DeltaR2( const Vector1 & v1, const Vector2 & v2) {
+ typename Vector1::Scalar dphi = DeltaPhi(v1,v2);
+ typename Vector1::Scalar deta = v2.Eta() - v1.Eta();
+ return dphi*dphi + deta*deta;
+ }
+
+ /**
+ Find difference in pseudorapidity (Eta) and Phi betwen two generic vectors
+ The only requirements on the Vector classes is that they implement the Phi() and Eta() method
+ \param v1 Vector 1
+ \param v2 Vector 2
+ \return Angle between the two vectors
+ \f[ \Delta R = \sqrt{ ( \Delta \phi )^2 + ( \Delta \eta )^2 } \f]
+ */
+ template <class Vector1, class Vector2>
+ inline typename Vector1::Scalar DeltaR( const Vector1 & v1, const Vector2 & v2) {
+ return std::sqrt( DeltaR2(v1,v2) );
+ }
+
+
+
+ /**
+ Find CosTheta Angle between two generic 3D vectors
+ pre-requisite: vectors implement the X(), Y() and Z()
+ \param v1 Vector v1
+ \param v2 Vector v2
+ \return cosine of Angle between the two vectors
+ \f[ \cos \theta = \frac { \vec{v1} \cdot \vec{v2} }{ | \vec{v1} | | \vec{v2} | } \f]
+ */
+ // this cannot be made all generic since Mag2() for 2, 3 or 4 D is different
+ // need to have a specialization for polar Coordinates ??
+ template <class Vector1, class Vector2>
+ double CosTheta( const Vector1 & v1, const Vector2 & v2) {
+ double arg;
+ double v1_r2 = v1.X()*v1.X() + v1.Y()*v1.Y() + v1.Z()*v1.Z();
+ double v2_r2 = v2.X()*v2.X() + v2.Y()*v2.Y() + v2.Z()*v2.Z();
+ double ptot2 = v1_r2*v2_r2;
+ if(ptot2 <= 0) {
+ arg = 0.0;
+ }else{
+ double pdot = v1.X()*v2.X() + v1.Y()*v2.Y() + v1.Z()*v2.Z();
+ arg = pdot/std::sqrt(ptot2);
+ if(arg > 1.0) arg = 1.0;
+ if(arg < -1.0) arg = -1.0;
+ }
+ return arg;
+ }
+
+
+ /**
+ Find Angle between two vectors.
+ Use the CosTheta() function
+ \param v1 Vector v1
+ \param v2 Vector v2
+ \return Angle between the two vectors
+ \f[ \theta = \cos ^{-1} \frac { \vec{v1} \cdot \vec{v2} }{ | \vec{v1} | | \vec{v2} | } \f]
+ */
+ template <class Vector1, class Vector2>
+ inline double Angle( const Vector1 & v1, const Vector2 & v2) {
+ return std::acos( CosTheta(v1, v2) );
+ }
+
+ /**
+ Find the projection of v along the given direction u.
+ \param v Vector v for which the propjection is to be found
+ \param u Vector specifying the direction
+ \return Vector projection (same type of v)
+ \f[ \vec{proj} = \frac{ \vec{v} \cdot \vec{u} }{|\vec{u}|}\vec{u} \f]
+ Precondition is that Vector1 implements Dot function and Vector2 implements X(),Y() and Z()
+ */
+ template <class Vector1, class Vector2>
+ Vector1 ProjVector( const Vector1 & v, const Vector2 & u) {
+ double magU2 = u.X()*u.X() + u.Y()*u.Y() + u.Z()*u.Z();
+ if (magU2 == 0) return Vector1(0,0,0);
+ double d = v.Dot(u)/magU2;
+ return Vector1( u.X() * d, u.Y() * d, u.Z() * d);
+ }
+
+ /**
+ Find the vector component of v perpendicular to the given direction of u
+ \param v Vector v for which the perpendicular component is to be found
+ \param u Vector specifying the direction
+ \return Vector component of v which is perpendicular to u
+ \f[ \vec{perp} = \vec{v} - \frac{ \vec{v} \cdot \vec{u} }{|\vec{u}|}\vec{u} \f]
+ Precondition is that Vector1 implements Dot function and Vector2 implements X(),Y() and Z()
+ */
+ template <class Vector1, class Vector2>
+ inline Vector1 PerpVector( const Vector1 & v, const Vector2 & u) {
+ return v - ProjVector(v,u);
+ }
+
+ /**
+ Find the magnitude square of the vector component of v perpendicular to the given direction of u
+ \param v Vector v for which the perpendicular component is to be found
+ \param u Vector specifying the direction
+ \return square value of the component of v which is perpendicular to u
+ \f[ perp = | \vec{v} - \frac{ \vec{v} \cdot \vec{u} }{|\vec{u}|}\vec{u} |^2 \f]
+ Precondition is that Vector1 implements Dot function and Vector2 implements X(),Y() and Z()
+ */
+ template <class Vector1, class Vector2>
+ inline double Perp2( const Vector1 & v, const Vector2 & u) {
+ double magU2 = u.X()*u.X() + u.Y()*u.Y() + u.Z()*u.Z();
+ double prjvu = v.Dot(u);
+ double magV2 = v.Dot(v);
+ return magU2 > 0.0 ? magV2-prjvu*prjvu/magU2 : magV2;
+ }
+
+ /**
+ Find the magnitude of the vector component of v perpendicular to the given direction of u
+ \param v Vector v for which the perpendicular component is to be found
+ \param u Vector specifying the direction
+ \return value of the component of v which is perpendicular to u
+ \f[ perp = | \vec{v} - \frac{ \vec{v} \cdot \vec{u} }{|\vec{u}|}\vec{u} | \f]
+ Precondition is that Vector1 implements Dot function and Vector2 implements X(),Y() and Z()
+ */
+ template <class Vector1, class Vector2>
+ inline double Perp( const Vector1 & v, const Vector2 & u) {
+ return std::sqrt(Perp2(v,u) );
+ }
+
+
+
+ // Lorentz Vector functions
+
+
+ /**
+ return the invariant mass of two LorentzVector
+ The only requirement on the LorentzVector is that they need to implement the
+ X() , Y(), Z() and E() methods.
+ \param v1 LorenzVector 1
+ \param v2 LorenzVector 2
+ \return invariant mass M
+ \f[ M_{12} = \sqrt{ (\vec{v1} + \vec{v2} ) \cdot (\vec{v1} + \vec{v2} ) } \f]
+ */
+ template <class Vector1, class Vector2>
+ inline typename Vector1::Scalar InvariantMass( const Vector1 & v1, const Vector2 & v2) {
+ typedef typename Vector1::Scalar Scalar;
+ Scalar ee = (v1.E() + v2.E() );
+ Scalar xx = (v1.X() + v2.X() );
+ Scalar yy = (v1.Y() + v2.Y() );
+ Scalar zz = (v1.Z() + v2.Z() );
+ Scalar mm2 = ee*ee - xx*xx - yy*yy - zz*zz;
+ return mm2 < 0.0 ? -std::sqrt(-mm2) : std::sqrt(mm2);
+ // PxPyPzE4D<double> q(xx,yy,zz,ee);
+ // return q.M();
+ //return ( v1 + v2).mag();
+ }
+
+ template <class Vector1, class Vector2>
+ inline typename Vector1::Scalar InvariantMass2( const Vector1 & v1, const Vector2 & v2) {
+ typedef typename Vector1::Scalar Scalar;
+ Scalar ee = (v1.E() + v2.E() );
+ Scalar xx = (v1.X() + v2.X() );
+ Scalar yy = (v1.Y() + v2.Y() );
+ Scalar zz = (v1.Z() + v2.Z() );
+ Scalar mm2 = ee*ee - xx*xx - yy*yy - zz*zz;
+ return mm2 ; // < 0.0 ? -std::sqrt(-mm2) : std::sqrt(mm2);
+ // PxPyPzE4D<double> q(xx,yy,zz,ee);
+ // return q.M();
+ //return ( v1 + v2).mag();
+ }
+
+ // rotation and transformations
+
+
+#ifndef __CINT__
+ /**
+ rotation along X axis for a generic vector by an Angle alpha
+ returning a new vector.
+ The only pre requisite on the Vector is that it has to implement the X() , Y() and Z()
+ and SetXYZ methods.
+ */
+ template <class Vector>
+ Vector RotateX(const Vector & v, double alpha) {
+ double sina = sin(alpha);
+ double cosa = cos(alpha);
+ double y2 = v.Y() * cosa - v.Z()*sina;
+ double z2 = v.Z() * cosa + v.Y() * sina;
+ Vector vrot;
+ vrot.SetXYZ(v.X(), y2, z2);
+ return vrot;
+ }
+
+ /**
+ rotation along Y axis for a generic vector by an Angle alpha
+ returning a new vector.
+ The only pre requisite on the Vector is that it has to implement the X() , Y() and Z()
+ and SetXYZ methods.
+ */
+ template <class Vector>
+ Vector RotateY(const Vector & v, double alpha) {
+ double sina = sin(alpha);
+ double cosa = cos(alpha);
+ double x2 = v.X() * cosa + v.Z() * sina;
+ double z2 = v.Z() * cosa - v.X() * sina;
+ Vector vrot;
+ vrot.SetXYZ(x2, v.Y(), z2);
+ return vrot;
+ }
+
+ /**
+ rotation along Z axis for a generic vector by an Angle alpha
+ returning a new vector.
+ The only pre requisite on the Vector is that it has to implement the X() , Y() and Z()
+ and SetXYZ methods.
+ */
+ template <class Vector>
+ Vector RotateZ(const Vector & v, double alpha) {
+ double sina = sin(alpha);
+ double cosa = cos(alpha);
+ double x2 = v.X() * cosa - v.Y() * sina;
+ double y2 = v.Y() * cosa + v.X() * sina;
+ Vector vrot;
+ vrot.SetXYZ(x2, y2, v.Z());
+ return vrot;
+ }
+
+
+ /**
+ rotation on a generic vector using a generic rotation class.
+ The only requirement on the vector is that implements the
+ X(), Y(), Z() and SetXYZ methods.
+ The requirement on the rotation matrix is that need to implement the
+ (i,j) operator returning the matrix element with R(0,0) = xx element
+ */
+ template<class Vector, class RotationMatrix>
+ Vector Rotate(const Vector &v, const RotationMatrix & rot) {
+ double xX = v.X();
+ double yY = v.Y();
+ double zZ = v.Z();
+ double x2 = rot(0,0)*xX + rot(0,1)*yY + rot(0,2)*zZ;
+ double y2 = rot(1,0)*xX + rot(1,1)*yY + rot(1,2)*zZ;
+ double z2 = rot(2,0)*xX + rot(2,1)*yY + rot(2,2)*zZ;
+ Vector vrot;
+ vrot.SetXYZ(x2,y2,z2);
+ return vrot;
+ }
+
+ /**
+ Boost a generic Lorentz Vector class using a generic 3D Vector class describing the boost
+ The only requirement on the vector is that implements the
+ X(), Y(), Z(), T() and SetXYZT methods.
+ The requirement on the boost vector is that needs to implement the
+ X(), Y() , Z() retorning the vector elements describing the boost
+ The beta of the boost must be <= 1 or a nul Lorentz Vector will be returned
+ */
+ template <class LVector, class BoostVector>
+ LVector boost(const LVector & v, const BoostVector & b) {
+ double bx = b.X();
+ double by = b.Y();
+ double bz = b.Z();
+ double b2 = bx*bx + by*by + bz*bz;
+ if (b2 >= 1) {
+ GenVector::Throw ( "Beta Vector supplied to set Boost represents speed >= c");
+ return LVector();
+ }
+ double gamma = 1.0 / std::sqrt(1.0 - b2);
+ double bp = bx*v.X() + by*v.Y() + bz*v.Z();
+ double gamma2 = b2 > 0 ? (gamma - 1.0)/b2 : 0.0;
+ double x2 = v.X() + gamma2*bp*bx + gamma*bx*v.T();
+ double y2 = v.Y() + gamma2*bp*by + gamma*by*v.T();
+ double z2 = v.Z() + gamma2*bp*bz + gamma*bz*v.T();
+ double t2 = gamma*(v.T() + bp);
+ LVector lv;
+ lv.SetXYZT(x2,y2,z2,t2);
+ return lv;
+ }
+
+
+ /**
+ Boost a generic Lorentz Vector class along the X direction with a factor beta
+ The only requirement on the vector is that implements the
+ X(), Y(), Z(), T() and SetXYZT methods.
+ The beta of the boost must be <= 1 or a nul Lorentz Vector will be returned
+ */
+ template <class LVector, class T>
+ LVector boostX(const LVector & v, T beta) {
+ if (beta >= 1) {
+ GenVector::Throw ("Beta Vector supplied to set Boost represents speed >= c");
+ return LVector();
+ }
+ T gamma = 1.0/ std::sqrt(1.0 - beta*beta);
+ typename LVector::Scalar x2 = gamma * v.X() + gamma * beta * v.T();
+ typename LVector::Scalar t2 = gamma * beta * v.X() + gamma * v.T();
+
+ LVector lv;
+ lv.SetXYZT(x2,v.Y(),v.Z(),t2);
+ return lv;
+ }
+
+ /**
+ Boost a generic Lorentz Vector class along the Y direction with a factor beta
+ The only requirement on the vector is that implements the
+ X(), Y(), Z(), T() methods and be constructed from x,y,z,t values
+ The beta of the boost must be <= 1 or a nul Lorentz Vector will be returned
+ */
+ template <class LVector>
+ LVector boostY(const LVector & v, double beta) {
+ if (beta >= 1) {
+ GenVector::Throw ("Beta Vector supplied to set Boost represents speed >= c");
+ return LVector();
+ }
+ double gamma = 1.0/ std::sqrt(1.0 - beta*beta);
+ double y2 = gamma * v.Y() + gamma * beta * v.T();
+ double t2 = gamma * beta * v.Y() + gamma * v.T();
+ LVector lv;
+ lv.SetXYZT(v.X(),y2,v.Z(),t2);
+ return lv;
+ }
+
+ /**
+ Boost a generic Lorentz Vector class along the Z direction with a factor beta
+ The only requirement on the vector is that implements the
+ X(), Y(), Z(), T() methods and be constructed from x,y,z,t values
+ The beta of the boost must be <= 1 or a nul Lorentz Vector will be returned
+ */
+ template <class LVector>
+ LVector boostZ(const LVector & v, double beta) {
+ if (beta >= 1) {
+ GenVector::Throw ( "Beta Vector supplied to set Boost represents speed >= c");
+ return LVector();
+ }
+ double gamma = 1.0/ std::sqrt(1.0 - beta*beta);
+ double z2 = gamma * v.Z() + gamma * beta * v.T();
+ double t2 = gamma * beta * v.Z() + gamma * v.T();
+ LVector lv;
+ lv.SetXYZT(v.X(),v.Y(),z2,t2);
+ return lv;
+ }
- /**
- Find the vector component of v perpendicular to the given direction of u
- \param v Vector v for which the perpendicular component is to be found
- \param u Vector specifying the direction
- \return Vector component of v which is perpendicular to u
- \f[ \vec{perp} = \vec{v} - \frac{ \vec{v} \cdot \vec{u} }{|\vec{u}|}\vec{u} \f]
- Precondition is that Vector1 implements Dot function and Vector2 implements X(),Y() and Z()
- */
- template <class Vector1, class Vector2>
- inline Vector1 PerpVector( const Vector1 & v, const Vector2 & u) {
- return v - ProjVector(v,u);
- }
+#endif
- /**
- Find the magnitude square of the vector component of v perpendicular to the given direction of u
- \param v Vector v for which the perpendicular component is to be found
- \param u Vector specifying the direction
- \return square value of the component of v which is perpendicular to u
- \f[ perp = | \vec{v} - \frac{ \vec{v} \cdot \vec{u} }{|\vec{u}|}\vec{u} |^2 \f]
- Precondition is that Vector1 implements Dot function and Vector2 implements X(),Y() and Z()
- */
- template <class Vector1, class Vector2>
- inline double Perp2( const Vector1 & v, const Vector2 & u) {
- double magU2 = u.X()*u.X() + u.Y()*u.Y() + u.Z()*u.Z();
- double prjvu = v.Dot(u);
- double magV2 = v.Dot(v);
- return magU2 > 0.0 ? magV2-prjvu*prjvu/magU2 : magV2;
- }
- /**
- Find the magnitude of the vector component of v perpendicular to the given direction of u
- \param v Vector v for which the perpendicular component is to be found
- \param u Vector specifying the direction
- \return value of the component of v which is perpendicular to u
- \f[ perp = | \vec{v} - \frac{ \vec{v} \cdot \vec{u} }{|\vec{u}|}\vec{u} | \f]
- Precondition is that Vector1 implements Dot function and Vector2 implements X(),Y() and Z()
- */
- template <class Vector1, class Vector2>
- inline double Perp( const Vector1 & v, const Vector2 & u) {
- return std::sqrt(Perp2(v,u) );
- }
-
- // Lorentz Vector functions
-
-
- /**
- return the invariant mass of two LorentzVector
- The only requirement on the LorentzVector is that they need to implement the
- X() , Y(), Z() and E() methods.
- \param v1 LorenzVector 1
- \param v2 LorenzVector 2
- \return invariant mass M
- \f[ M_{12} = \sqrt{ (\vec{v1} + \vec{v2} ) \cdot (\vec{v1} + \vec{v2} ) } \f]
- */
- template <class Vector1, class Vector2>
- inline typename Vector1::Scalar InvariantMass( const Vector1 & v1, const Vector2 & v2) {
- typedef typename Vector1::Scalar Scalar;
- Scalar ee = (v1.E() + v2.E() );
- Scalar xx = (v1.X() + v2.X() );
- Scalar yy = (v1.Y() + v2.Y() );
- Scalar zz = (v1.Z() + v2.Z() );
- Scalar mm2 = ee*ee - xx*xx - yy*yy - zz*zz;
- return mm2 < 0.0 ? -std::sqrt(-mm2) : std::sqrt(mm2);
-// PxPyPzE4D<double> q(xx,yy,zz,ee);
-// return q.M();
- //return ( v1 + v2).mag();
- }
-
- template <class Vector1, class Vector2>
- inline typename Vector1::Scalar InvariantMass2( const Vector1 & v1, const Vector2 & v2) {
- typedef typename Vector1::Scalar Scalar;
- Scalar ee = (v1.E() + v2.E() );
- Scalar xx = (v1.X() + v2.X() );
- Scalar yy = (v1.Y() + v2.Y() );
- Scalar zz = (v1.Z() + v2.Z() );
- Scalar mm2 = ee*ee - xx*xx - yy*yy - zz*zz;
- return mm2 ; // < 0.0 ? -std::sqrt(-mm2) : std::sqrt(mm2);
-// PxPyPzE4D<double> q(xx,yy,zz,ee);
-// return q.M();
- //return ( v1 + v2).mag();
- }
-
- // rotation and transformations
+ // MATRIX VECTOR MULTIPLICATION
+ // cannot define an operator * otherwise conflicts with rotations
+ // operations like Rotation3D * vector use Mult
+
+ /**
+ Multiplications of a generic matrices with a DisplacementVector3D of any coordinate system.
+ Assume that the matrix implements the operator( i,j) and that it has at least 3 columns and 3 rows. There is no check on the matrix size !!
+ */
+ template<class Matrix, class CoordSystem, class U>
+ inline
+ DisplacementVector3D<CoordSystem,U> Mult (const Matrix & m, const DisplacementVector3D<CoordSystem,U> & v) {
+ DisplacementVector3D<CoordSystem,U> vret;
+ vret.SetXYZ( m(0,0) * v.x() + m(0,1) * v.y() + m(0,2) * v.z() ,
+ m(1,0) * v.x() + m(1,1) * v.y() + m(1,2) * v.z() ,
+ m(2,0) * v.x() + m(2,1) * v.y() + m(2,2) * v.z() );
+ return vret;
+ }
+
+
+ /**
+ Multiplications of a generic matrices with a generic PositionVector
+ Assume that the matrix implements the operator( i,j) and that it has at least 3 columns and 3 rows. There is no check on the matrix size !!
+ */
+ template<class Matrix, class CoordSystem, class U>
+ inline
+ PositionVector3D<CoordSystem,U> Mult (const Matrix & m, const PositionVector3D<CoordSystem,U> & p) {
+ DisplacementVector3D<CoordSystem,U> pret;
+ pret.SetXYZ( m(0,0) * p.x() + m(0,1) * p.y() + m(0,2) * p.z() ,
+ m(1,0) * p.x() + m(1,1) * p.y() + m(1,2) * p.z() ,
+ m(2,0) * p.x() + m(2,1) * p.y() + m(2,2) * p.z() );
+ return pret;
+ }
+
+
+ /**
+ Multiplications of a generic matrices with a LorentzVector described
+ in any coordinate system.
+ Assume that the matrix implements the operator( i,j) and that it has at least 4 columns and 4 rows. There is no check on the matrix size !!
+ */
+ // this will not be ambigous with operator*(Scalar, LorentzVector) since that one // Scalar is passed by value
+ template<class CoordSystem, class Matrix>
+ inline
+ LorentzVector<CoordSystem> Mult (const Matrix & m, const LorentzVector<CoordSystem> & v) {
+ LorentzVector<CoordSystem> vret;
+ vret.SetXYZT( m(0,0)*v.x() + m(0,1)*v.y() + m(0,2)*v.z() + m(0,3)* v.t() ,
+ m(1,0)*v.x() + m(1,1)*v.y() + m(1,2)*v.z() + m(1,3)* v.t() ,
+ m(2,0)*v.x() + m(2,1)*v.y() + m(2,2)*v.z() + m(2,3)* v.t() ,
+ m(3,0)*v.x() + m(3,1)*v.y() + m(3,2)*v.z() + m(3,3)* v.t() );
+ return vret;
+ }
+
+
+
+ // non-template utility functions for all objects
+
+
+ /**
+ Return a phi angle in the interval (0,2*PI]
+ */
+ double Phi_0_2pi(double phi);
+ /**
+ Returns phi angle in the interval (-PI,PI]
+ */
+ double Phi_mpi_pi(double phi);
+
+
+
+ } // end namespace Vector Util
-#ifndef __CINT__
- /**
- rotation along X axis for a generic vector by an Angle alpha
- returning a new vector.
- The only pre requisite on the Vector is that it has to implement the X() , Y() and Z()
- and SetXYZ methods.
- */
- template <class Vector>
- Vector RotateX(const Vector & v, double alpha) {
- double sina = sin(alpha);
- double cosa = cos(alpha);
- double y2 = v.Y() * cosa - v.Z()*sina;
- double z2 = v.Z() * cosa + v.Y() * sina;
- Vector vrot;
- vrot.SetXYZ(v.X(), y2, z2);
- return vrot;
- }
-
- /**
- rotation along Y axis for a generic vector by an Angle alpha
- returning a new vector.
- The only pre requisite on the Vector is that it has to implement the X() , Y() and Z()
- and SetXYZ methods.
- */
- template <class Vector>
- Vector RotateY(const Vector & v, double alpha) {
- double sina = sin(alpha);
- double cosa = cos(alpha);
- double x2 = v.X() * cosa + v.Z() * sina;
- double z2 = v.Z() * cosa - v.X() * sina;
- Vector vrot;
- vrot.SetXYZ(x2, v.Y(), z2);
- return vrot;
- }
-
- /**
- rotation along Z axis for a generic vector by an Angle alpha
- returning a new vector.
- The only pre requisite on the Vector is that it has to implement the X() , Y() and Z()
- and SetXYZ methods.
- */
- template <class Vector>
- Vector RotateZ(const Vector & v, double alpha) {
- double sina = sin(alpha);
- double cosa = cos(alpha);
- double x2 = v.X() * cosa - v.Y() * sina;
- double y2 = v.Y() * cosa + v.X() * sina;
- Vector vrot;
- vrot.SetXYZ(x2, y2, v.Z());
- return vrot;
- }
-
- /**
- rotation on a generic vector using a generic rotation class.
- The only requirement on the vector is that implements the
- X(), Y(), Z() and SetXYZ methods.
- The requirement on the rotation matrix is that need to implement the
- (i,j) operator returning the matrix element with R(0,0) = xx element
- */
- template<class Vector, class RotationMatrix>
- Vector Rotate(const Vector &v, const RotationMatrix & rot) {
- double xX = v.X();
- double yY = v.Y();
- double zZ = v.Z();
- double x2 = rot(0,0)*xX + rot(0,1)*yY + rot(0,2)*zZ;
- double y2 = rot(1,0)*xX + rot(1,1)*yY + rot(1,2)*zZ;
- double z2 = rot(2,0)*xX + rot(2,1)*yY + rot(2,2)*zZ;
- Vector vrot;
- vrot.SetXYZ(x2,y2,z2);
- return vrot;
- }
-
- /**
- Boost a generic Lorentz Vector class using a generic 3D Vector class describing the boost
- The only requirement on the vector is that implements the
- X(), Y(), Z(), T() and SetXYZT methods.
- The requirement on the boost vector is that needs to implement the
- X(), Y() , Z() retorning the vector elements describing the boost
- The beta of the boost must be <= 1 or a nul Lorentz Vector will be returned
- */
- template <class LVector, class BoostVector>
- LVector boost(const LVector & v, const BoostVector & b) {
- double bx = b.X();
- double by = b.Y();
- double bz = b.Z();
- double b2 = bx*bx + by*by + bz*bz;
- if (b2 >= 1) {
- GenVector::Throw ( "Beta Vector supplied to set Boost represents speed >= c");
- return LVector();
- }
- double gamma = 1.0 / std::sqrt(1.0 - b2);
- double bp = bx*v.X() + by*v.Y() + bz*v.Z();
- double gamma2 = b2 > 0 ? (gamma - 1.0)/b2 : 0.0;
- double x2 = v.X() + gamma2*bp*bx + gamma*bx*v.T();
- double y2 = v.Y() + gamma2*bp*by + gamma*by*v.T();
- double z2 = v.Z() + gamma2*bp*bz + gamma*bz*v.T();
- double t2 = gamma*(v.T() + bp);
- LVector lv;
- lv.SetXYZT(x2,y2,z2,t2);
- return lv;
- }
-
-
- /**
- Boost a generic Lorentz Vector class along the X direction with a factor beta
- The only requirement on the vector is that implements the
- X(), Y(), Z(), T() and SetXYZT methods.
- The beta of the boost must be <= 1 or a nul Lorentz Vector will be returned
- */
- template <class LVector, class T>
- LVector boostX(const LVector & v, T beta) {
- if (beta >= 1) {
- GenVector::Throw ("Beta Vector supplied to set Boost represents speed >= c");
- return LVector();
- }
- T gamma = 1.0/ std::sqrt(1.0 - beta*beta);
- typename LVector::Scalar x2 = gamma * v.X() + gamma * beta * v.T();
- typename LVector::Scalar t2 = gamma * beta * v.X() + gamma * v.T();
-
- LVector lv;
- lv.SetXYZT(x2,v.Y(),v.Z(),t2);
- return lv;
- }
-
- /**
- Boost a generic Lorentz Vector class along the Y direction with a factor beta
- The only requirement on the vector is that implements the
- X(), Y(), Z(), T() methods and be constructed from x,y,z,t values
- The beta of the boost must be <= 1 or a nul Lorentz Vector will be returned
- */
- template <class LVector>
- LVector boostY(const LVector & v, double beta) {
- if (beta >= 1) {
- GenVector::Throw ("Beta Vector supplied to set Boost represents speed >= c");
- return LVector();
- }
- double gamma = 1.0/ std::sqrt(1.0 - beta*beta);
- double y2 = gamma * v.Y() + gamma * beta * v.T();
- double t2 = gamma * beta * v.Y() + gamma * v.T();
- LVector lv;
- lv.SetXYZT(v.X(),y2,v.Z(),t2);
- return lv;
- }
-
- /**
- Boost a generic Lorentz Vector class along the Z direction with a factor beta
- The only requirement on the vector is that implements the
- X(), Y(), Z(), T() methods and be constructed from x,y,z,t values
- The beta of the boost must be <= 1 or a nul Lorentz Vector will be returned
- */
- template <class LVector>
- LVector boostZ(const LVector & v, double beta) {
- if (beta >= 1) {
- GenVector::Throw ( "Beta Vector supplied to set Boost represents speed >= c");
- return LVector();
- }
- double gamma = 1.0/ std::sqrt(1.0 - beta*beta);
- double z2 = gamma * v.Z() + gamma * beta * v.T();
- double t2 = gamma * beta * v.Z() + gamma * v.T();
- LVector lv;
- lv.SetXYZT(v.X(),v.Y(),z2,t2);
- return lv;
- }
-
-#endif
-
-
-
-
- // MATRIX VECTOR MULTIPLICATION
- // cannot define an operator * otherwise conflicts with rotations
- // operations like Rotation3D * vector use Mult
-
- /**
- Multiplications of a generic matrices with a DisplacementVector3D of any coordinate system.
- Assume that the matrix implements the operator( i,j) and that it has at least 3 columns and 3 rows. There is no check on the matrix size !!
- */
- template<class Matrix, class CoordSystem, class U>
- inline
- DisplacementVector3D<CoordSystem,U> Mult (const Matrix & m, const DisplacementVector3D<CoordSystem,U> & v) {
- DisplacementVector3D<CoordSystem,U> vret;
- vret.SetXYZ( m(0,0) * v.x() + m(0,1) * v.y() + m(0,2) * v.z() ,
- m(1,0) * v.x() + m(1,1) * v.y() + m(1,2) * v.z() ,
- m(2,0) * v.x() + m(2,1) * v.y() + m(2,2) * v.z() );
- return vret;
- }
-
-
- /**
- Multiplications of a generic matrices with a generic PositionVector
- Assume that the matrix implements the operator( i,j) and that it has at least 3 columns and 3 rows. There is no check on the matrix size !!
- */
- template<class Matrix, class CoordSystem, class U>
- inline
- PositionVector3D<CoordSystem,U> Mult (const Matrix & m, const PositionVector3D<CoordSystem,U> & p) {
- DisplacementVector3D<CoordSystem,U> pret;
- pret.SetXYZ( m(0,0) * p.x() + m(0,1) * p.y() + m(0,2) * p.z() ,
- m(1,0) * p.x() + m(1,1) * p.y() + m(1,2) * p.z() ,
- m(2,0) * p.x() + m(2,1) * p.y() + m(2,2) * p.z() );
- return pret;
- }
-
-
- /**
- Multiplications of a generic matrices with a LorentzVector described
- in any coordinate system.
- Assume that the matrix implements the operator( i,j) and that it has at least 4 columns and 4 rows. There is no check on the matrix size !!
- */
- // this will not be ambigous with operator*(Scalar, LorentzVector) since that one // Scalar is passed by value
- template<class CoordSystem, class Matrix>
- inline
- LorentzVector<CoordSystem> Mult (const Matrix & m, const LorentzVector<CoordSystem> & v) {
- LorentzVector<CoordSystem> vret;
- vret.SetXYZT( m(0,0)*v.x() + m(0,1)*v.y() + m(0,2)*v.z() + m(0,3)* v.t() ,
- m(1,0)*v.x() + m(1,1)*v.y() + m(1,2)*v.z() + m(1,3)* v.t() ,
- m(2,0)*v.x() + m(2,1)*v.y() + m(2,2)*v.z() + m(2,3)* v.t() ,
- m(3,0)*v.x() + m(3,1)*v.y() + m(3,2)*v.z() + m(3,3)* v.t() );
- return vret;
- }
-
-
-
- // non-template utility functions for all objects
-
-
- /**
- Return a phi angle in the interval (0,2*PI]
- */
- double Phi_0_2pi(double phi);
- /**
- Returns phi angle in the interval (-PI,PI]
- */
- double Phi_mpi_pi(double phi);
-
-
-
- } // end namespace Vector Util
-
-
-
- } // end namespace Math
-
+ } // end namespace Math
+
} // end namespace ROOT
diff --git a/math/genvector/src/Boost.cxx b/math/genvector/src/Boost.cxx
index 8546324e7f7..8f567a5db27 100644
--- a/math/genvector/src/Boost.cxx
+++ b/math/genvector/src/Boost.cxx
@@ -26,37 +26,37 @@
//#ifdef TEX
/**
- A variable names bgamma appears in several places in this file. A few
- words of elaboration are needed to make its meaning clear. On page 69
- of Misner, Thorne and Wheeler, (Exercise 2.7) the elements of the matrix
- for a general Lorentz boost are given as
+ A variable names bgamma appears in several places in this file. A few
+ words of elaboration are needed to make its meaning clear. On page 69
+ of Misner, Thorne and Wheeler, (Exercise 2.7) the elements of the matrix
+ for a general Lorentz boost are given as
- \f[ \Lambda^{j'}_k = \Lambda^{k'}_j
- = (\gamma - 1) n^j n^k + \delta^{jk} \f]
+ \f[ \Lambda^{j'}_k = \Lambda^{k'}_j
+ = (\gamma - 1) n^j n^k + \delta^{jk} \f]
- where the n^i are unit vectors in the direction of the three spatial
- axes. Using the definitions, \f$ n^i = \beta_i/\beta \f$ , then, for example,
+ where the n^i are unit vectors in the direction of the three spatial
+ axes. Using the definitions, \f$ n^i = \beta_i/\beta \f$ , then, for example,
- \f[ \Lambda_{xy} = (\gamma - 1) n_x n_y
- = (\gamma - 1) \beta_x \beta_y/\beta^2 \f]
+ \f[ \Lambda_{xy} = (\gamma - 1) n_x n_y
+ = (\gamma - 1) \beta_x \beta_y/\beta^2 \f]
- By definition, \f[ \gamma^2 = 1/(1 - \beta^2) \f]
+ By definition, \f[ \gamma^2 = 1/(1 - \beta^2) \f]
- so that \f[ \gamma^2 \beta^2 = \gamma^2 - 1 \f]
+ so that \f[ \gamma^2 \beta^2 = \gamma^2 - 1 \f]
- or \f[ \beta^2 = (\gamma^2 - 1)/\gamma^2 \f]
+ or \f[ \beta^2 = (\gamma^2 - 1)/\gamma^2 \f]
- If we insert this into the expression for \f$ \Lambda_{xy} \f$, we get
+ If we insert this into the expression for \f$ \Lambda_{xy} \f$, we get
- \f[ \Lambda_{xy} = (\gamma - 1) \gamma^2/(\gamma^2 - 1) \beta_x \beta_y \f]
+ \f[ \Lambda_{xy} = (\gamma - 1) \gamma^2/(\gamma^2 - 1) \beta_x \beta_y \f]
- or, finally
+ or, finally
- \f[ \Lambda_{xy} = \gamma^2/(\gamma+1) \beta_x \beta_y \f]
+ \f[ \Lambda_{xy} = \gamma^2/(\gamma+1) \beta_x \beta_y \f]
- The expression \f$ \gamma^2/(\gamma+1) \f$ is what we call <em>bgamma</em> in the code below.
+ The expression \f$ \gamma^2/(\gamma+1) \f$ is what we call <em>bgamma</em> in the code below.
- \class ROOT::Math::Boost
+ \class ROOT::Math::Boost
*/
//#endif
@@ -126,14 +126,14 @@ void Boost::Rectify() {
// this forms an "exact" orthosymplectic matrix for the Lorentz Rotation
// again.
- if (fM[kTT] <= 0) {
+ if (fM[kTT] <= 0) {
GenVector::Throw (
"Attempt to rectify a boost with non-positive gamma");
return;
}
DisplacementVector3D< Cartesian3D<Scalar> > beta ( fM[kXT], fM[kYT], fM[kZT] );
beta /= fM[kTT];
- if ( beta.mag2() >= 1 ) {
+ if ( beta.mag2() >= 1 ) {
beta /= ( beta.R() * ( 1.0 + 1.0e-16 ) );
}
SetComponents ( beta );
diff --git a/math/genvector/src/BoostX.cxx b/math/genvector/src/BoostX.cxx
index ce5ff83857e..831df37e34e 100644
--- a/math/genvector/src/BoostX.cxx
+++ b/math/genvector/src/BoostX.cxx
@@ -67,13 +67,13 @@ void BoostX::Rectify() {
// this forms an "exact" orthosymplectic matrix for the Lorentz Rotation
// again.
- if (fGamma <= 0) {
+ if (fGamma <= 0) {
GenVector::Throw (
"Attempt to rectify a boost with non-positive gamma");
return;
}
Scalar beta = fBeta;
- if ( beta >= 1 ) {
+ if ( beta >= 1 ) {
beta /= ( beta * ( 1.0 + 1.0e-16 ) );
}
SetComponents ( beta );
diff --git a/math/genvector/src/BoostY.cxx b/math/genvector/src/BoostY.cxx
index 1313861fa1b..5d93117c166 100644
--- a/math/genvector/src/BoostY.cxx
+++ b/math/genvector/src/BoostY.cxx
@@ -66,13 +66,13 @@ void BoostY::Rectify() {
// this forms an "exact" orthosymplectic matrix for the Lorentz Rotation
// again.
- if (fGamma <= 0) {
+ if (fGamma <= 0) {
GenVector::Throw (
"Attempt to rectify a boost with non-positive gamma");
return;
}
Scalar beta = fBeta;
- if ( beta >= 1 ) {
+ if ( beta >= 1 ) {
beta /= ( beta * ( 1.0 + 1.0e-16 ) );
}
SetComponents ( beta );
diff --git a/math/genvector/src/BoostZ.cxx b/math/genvector/src/BoostZ.cxx
index 65f5824caa5..58df8269d14 100644
--- a/math/genvector/src/BoostZ.cxx
+++ b/math/genvector/src/BoostZ.cxx
@@ -67,13 +67,13 @@ void BoostZ::Rectify() {
// this forms an "exact" orthosymplectic matrix for the Lorentz Rotation
// again.
- if (fGamma <= 0) {
+ if (fGamma <= 0) {
GenVector::Throw (
"Attempt to rectify a boost with non-positive gamma");
return;
}
Scalar beta = fBeta;
- if ( beta >= 1 ) {
+ if ( beta >= 1 ) {
beta /= ( beta * ( 1.0 + 1.0e-16 ) );
}
SetComponents ( beta );
diff --git a/math/genvector/src/Rotation3DxAxial.cxx b/math/genvector/src/Rotation3DxAxial.cxx
index 013a88afacc..ab534a6bcf1 100644
--- a/math/genvector/src/Rotation3DxAxial.cxx
+++ b/math/genvector/src/Rotation3DxAxial.cxx
@@ -43,8 +43,8 @@ Rotation3D Rotation3D::operator * (const RotationZ & rz) const {
return Rotation3D
(
fM[kXX]*c + fM[kXY]*s, fM[kXY]*c - fM[kXX]*s, fM[kXZ]
- , fM[kYX]*c + fM[kYY]*s, fM[kYY]*c - fM[kYX]*s, fM[kYZ]
- , fM[kZX]*c + fM[kZY]*s, fM[kZY]*c - fM[kZX]*s, fM[kZZ]
+ , fM[kYX]*c + fM[kYY]*s, fM[kYY]*c - fM[kYX]*s, fM[kYZ]
+ , fM[kZX]*c + fM[kZY]*s, fM[kZY]*c - fM[kZX]*s, fM[kZZ]
);
}
diff --git a/math/genvector/test/coordinates3D.cxx b/math/genvector/test/coordinates3D.cxx
index 190c2b02371..b27ac436847 100644
--- a/math/genvector/test/coordinates3D.cxx
+++ b/math/genvector/test/coordinates3D.cxx
@@ -80,7 +80,7 @@ closeEnough ( Scalar1 s1, Scalar2 s2, std::string const & coord, double ticks )
if ( (sd1 + sd2 == sd1) != (sd1 + sd2 == sd2) ) {
ret=5;
std::cout << "\nInfinity discrepancy in " << coord << "(): "
- << sd1 << " != " << sd2 << "\n";
+ << sd1 << " != " << sd2 << "\n";
std::cout.precision (pr);
return ret;
}
@@ -291,9 +291,9 @@ int coordinates3D () {
ret |= test3D (XYZVector ( -.01, 16.0, .01 ) ,2000 );
ret |= test3D (XYZVector ( -.01, -16.0, .01 ) ,2000 );
ret |= test3D (XYZVector ( 1.0, 2.0, 30.0 ) ,10 );
- // NOTE -- these larger erros are likely the results of treating
- // the vector in a ctor or assignment as foreign...
- // NO -- I'm fouling up the value of x() !!!!!
+ // NOTE -- these larger erros are likely the results of treating
+ // the vector in a ctor or assignment as foreign...
+ // NO -- I'm fouling up the value of x() !!!!!
// As we push to higher z with zero rho, some accuracy loss is expected
ret |= test3D (XYZVector ( 0.0, 0.0, 15.0 ) ,30 );
ret |= test3D (XYZVector ( 0.0, 0.0, -15.0 ) ,30 );
diff --git a/math/genvector/test/coordinates4D.cxx b/math/genvector/test/coordinates4D.cxx
index 21bb0b2f1dd..91222a9a64c 100644
--- a/math/genvector/test/coordinates4D.cxx
+++ b/math/genvector/test/coordinates4D.cxx
@@ -3,7 +3,7 @@
// Tests that each form of 4-vector has all the properties that stem from
// owning and forwarding to a 4D coordinates instance
//
-// 6/28/05 m fischler
+// 6/28/05 m fischler
// from contents of test_coordinates.h by L. Moneta.
//
// =================================================================
@@ -71,8 +71,8 @@ closeEnough ( Scalar1 s1, Scalar2 s2, std::string const & coord, double ticks )
ret=3;
std::cout << "\nAbsolute discrepancy in " << coord << "(): "
<< ss1 << " != " << ss2 << "\n"
- << " (Allowed discrepancy is " << ticks*epsilon
- << ")\nDifference is " << diff/epsilon << " ticks\n";
+ << " (Allowed discrepancy is " << ticks*epsilon
+ << ")\nDifference is " << diff/epsilon << " ticks\n";
}
std::cout.precision (pr);
return ret;
@@ -83,7 +83,7 @@ closeEnough ( Scalar1 s1, Scalar2 s2, std::string const & coord, double ticks )
if ( (sd1 + sd2 == sd1) != (sd1 + sd2 == sd2) ) {
ret=5;
std::cout << "\nInfinity discrepancy in " << coord << "(): "
- << sd1 << " != " << sd2 << "\n";
+ << sd1 << " != " << sd2 << "\n";
std::cout.precision (pr);
return ret;
}
@@ -92,7 +92,7 @@ closeEnough ( Scalar1 s1, Scalar2 s2, std::string const & coord, double ticks )
ret=9;
std::cout << "\nDiscrepancy in " << coord << "(): "
<< ss1 << " != " << ss2 << "\n"
- << " (Allowed discrepancy is " << ticks*epsilon*ss1
+ << " (Allowed discrepancy is " << ticks*epsilon*ss1
<< ")\nDifference is " << (diff/denom)/epsilon << " ticks\n";
}
std::cout.precision (pr);
@@ -127,8 +127,8 @@ int compare4D (const V1 & v1, const V2 & v2, double ticks) {
std::cout << "Discrepancy detected (see above) is between:\n "
<< CoordinateTraits<CoordType1>::name() << " and\n "
<< CoordinateTraits<CoordType2>::name() << "\n"
- << "with v = (" << v1.x() << ", " << v1.y() << ", "
- << v1.z() << ", " << v1.t() << ")\n";
+ << "with v = (" << v1.x() << ", " << v1.y() << ", "
+ << v1.z() << ", " << v1.t() << ")\n";
}
else {
std::cout << ".";
@@ -160,32 +160,32 @@ int test4D ( const LorentzVector<C> & v, double ticks ) {
double eta;
if (rho != 0) {
eta = -std::log(std::tan(theta/2));
- #ifdef TRACE1
- std::cout << ":::: rho != 0\n"
- << ":::: theta = " << theta
- <<"/n:::: tan(theta/2) = " << std::tan(theta/2)
- <<"\n:::: eta = " << eta << "\n";
- #endif
+ #ifdef TRACE1
+ std::cout << ":::: rho != 0\n"
+ << ":::: theta = " << theta
+ <<"/n:::: tan(theta/2) = " << std::tan(theta/2)
+ <<"\n:::: eta = " << eta << "\n";
+ #endif
} else if (v.z() == 0) {
eta = 0;
- #ifdef TRACE1
- std::cout << ":::: v.z() == 0\n"
- <<"\n:::: eta = " << eta << "\n";
- #endif
+ #ifdef TRACE1
+ std::cout << ":::: v.z() == 0\n"
+ <<"\n:::: eta = " << eta << "\n";
+ #endif
} else if (v.z() > 0) {
eta = v.z() + etaMax<long double>();
- #ifdef TRACE1
- std::cout << ":::: v.z() > 0\n"
- << ":::: etaMax = " << etaMax<long double>()
- <<"\n:::: eta = " << eta << "\n";
- #endif
+ #ifdef TRACE1
+ std::cout << ":::: v.z() > 0\n"
+ << ":::: etaMax = " << etaMax<long double>()
+ <<"\n:::: eta = " << eta << "\n";
+ #endif
} else {
eta = v.z() - etaMax<long double>();
- #ifdef TRACE1
- std::cout << ":::: v.z() < 0\n"
- << ":::: etaMax = " << etaMax<long double>()
- <<"\n:::: eta = " << eta << "\n";
- #endif
+ #ifdef TRACE1
+ std::cout << ":::: v.z() < 0\n"
+ << ":::: etaMax = " << etaMax<long double>()
+ <<"\n:::: eta = " << eta << "\n";
+ #endif
}
diff --git a/math/genvector/test/rotationApplication.cxx b/math/genvector/test/rotationApplication.cxx
index 09213b055de..43381f5112a 100644
--- a/math/genvector/test/rotationApplication.cxx
+++ b/math/genvector/test/rotationApplication.cxx
@@ -1,19 +1,19 @@
/**********************************************************************
- * *
- * Copyright (c) 2005 , FNAL LCG ROOT MathLib Team *
- * *
- * *
- **********************************************************************/
+ * *
+ * Copyright (c) 2005 , FNAL LCG ROOT MathLib Team *
+ * *
+ * *
+ **********************************************************************/
// RotationApplication.cpp
//
// Created by: M. Fischler, Aug 10, 2005
//
-// Tests that each Rotation produces correct results when applied to
+// Tests that each Rotation produces correct results when applied to
// each form of vector in each oordinate system, and incidently that products
// of rotations work properly.
//
-// The strategy is to build up sequences of rotations about the X, Y, and Z
+// The strategy is to build up sequences of rotations about the X, Y, and Z
// axes, such that we can easily determine the correct vector answer.
//
// =================================================================
@@ -56,18 +56,18 @@ using namespace ROOT::Math;
#ifndef __CINT__
-template <typename T1, typename T2 >
-struct Precision {
- enum { result = std::numeric_limits<T1>::digits <= std::numeric_limits<T2>::digits };
-};
+template <typename T1, typename T2 >
+struct Precision {
+ enum { result = std::numeric_limits<T1>::digits <= std::numeric_limits<T2>::digits };
+};
template <typename T1, typename T2, bool>
struct LessPreciseType {
- typedef T1 type;
+ typedef T1 type;
};
template <typename T1, typename T2>
struct LessPreciseType<T1, T2, false> {
- typedef T2 type;
+ typedef T2 type;
};
@@ -76,611 +76,611 @@ const double machEpsilon = pow (2.0, -52.0);
template <typename Scalar1, typename Scalar2>
int
closeEnough (Scalar1 s1, Scalar2 s2, std::string const & coord, double ticks) {
- int ret = 0;
- int pr = std::cout.precision(18);
- Scalar1 eps1 = std::numeric_limits<Scalar1>::epsilon();
- Scalar2 eps2 = std::numeric_limits<Scalar2>::epsilon();
- typedef typename LessPreciseType<Scalar1, Scalar2,Precision<Scalar1,Scalar2>::result>::type Scalar;
- Scalar epsilon = (eps1 >= eps2) ? eps1 : eps2;
- Scalar ss1 (s1);
- Scalar ss2 (s2);
- Scalar diff = ss1 - ss2;
- if (diff < 0) diff = -diff;
- if ( diff > ticks*epsilon ) {
- ret=3;
- std::cout << "\n\n????????\n\nAbsolute discrepancy in " << coord << "(): "
- << ss1 << " != " << ss2 << "\n"
- << " (Allowed discrepancy is " << ticks
- << " ticks = " << ticks*epsilon
- << ")\nDifference is " << diff/epsilon << " ticks\n";
- }
- std::cout.precision (pr);
- return ret;
+ int ret = 0;
+ int pr = std::cout.precision(18);
+ Scalar1 eps1 = std::numeric_limits<Scalar1>::epsilon();
+ Scalar2 eps2 = std::numeric_limits<Scalar2>::epsilon();
+ typedef typename LessPreciseType<Scalar1, Scalar2,Precision<Scalar1,Scalar2>::result>::type Scalar;
+ Scalar epsilon = (eps1 >= eps2) ? eps1 : eps2;
+ Scalar ss1 (s1);
+ Scalar ss2 (s2);
+ Scalar diff = ss1 - ss2;
+ if (diff < 0) diff = -diff;
+ if ( diff > ticks*epsilon ) {
+ ret=3;
+ std::cout << "\n\n????????\n\nAbsolute discrepancy in " << coord << "(): "
+ << ss1 << " != " << ss2 << "\n"
+ << " (Allowed discrepancy is " << ticks
+ << " ticks = " << ticks*epsilon
+ << ")\nDifference is " << diff/epsilon << " ticks\n";
+ }
+ std::cout.precision (pr);
+ return ret;
}
template <class V1, class V2>
int compare3D (const V1 & v1, const V2 & v2, double ticks) {
- int ret =0;
- typedef typename V1::CoordinateType CoordType1;
- typedef typename V2::CoordinateType CoordType2;
-
- ret |= closeEnough ( v1.x(), v2.x(), "x" ,ticks);
- ret |= closeEnough ( v1.y(), v2.y(), "y" ,ticks);
- ret |= closeEnough ( v1.z(), v2.z(), "z" ,ticks);
-
- if (ret != 0) {
- std::cout << "Discrepancy detected (see above) is between:\n "
- << CoordinateTraits<CoordType1>::name() << " and\n "
- << CoordinateTraits<CoordType2>::name() << "\n"
- << "with v = (" << v1.x() << ", " << v1.y() << ", " << v1.z()
- << ")\nv1 is " << v1
- << "\nv2 is " << v2 << "\n\n";
- }
-
- return ret;
+ int ret =0;
+ typedef typename V1::CoordinateType CoordType1;
+ typedef typename V2::CoordinateType CoordType2;
+
+ ret |= closeEnough ( v1.x(), v2.x(), "x" ,ticks);
+ ret |= closeEnough ( v1.y(), v2.y(), "y" ,ticks);
+ ret |= closeEnough ( v1.z(), v2.z(), "z" ,ticks);
+
+ if (ret != 0) {
+ std::cout << "Discrepancy detected (see above) is between:\n "
+ << CoordinateTraits<CoordType1>::name() << " and\n "
+ << CoordinateTraits<CoordType2>::name() << "\n"
+ << "with v = (" << v1.x() << ", " << v1.y() << ", " << v1.z()
+ << ")\nv1 is " << v1
+ << "\nv2 is " << v2 << "\n\n";
+ }
+
+ return ret;
}
template <class V> struct correctedTicks {
- double operator()(double ticks, const V& /*v */ , const XYZVector & /* ans */)
- {
- return ticks;
- }
+ double operator()(double ticks, const V& /*v */ , const XYZVector & /* ans */)
+ {
+ return ticks;
+ }
};
double correctTicks (double ticks,double z,double r) {
- double e = ticks*std::fabs( z*z / (r*r-z*z) );
- if (e < ticks) return ticks;
- return e;
+ double e = ticks*std::fabs( z*z / (r*r-z*z) );
+ if (e < ticks) return ticks;
+ return e;
}
template<> struct
correctedTicks< DisplacementVector3D < CylindricalEta3D<double> > > {
- double operator()(double ticks,
- const DisplacementVector3D< CylindricalEta3D<double> >& v,
- const XYZVector & ans) {
- double t1 = correctTicks (ticks, v.z(), v.r());
- double t2 = correctTicks (ticks, ans.z(), ans.r());
- return t1 > t2 ? t1 : t2;
- }
+ double operator()(double ticks,
+ const DisplacementVector3D< CylindricalEta3D<double> >& v,
+ const XYZVector & ans) {
+ double t1 = correctTicks (ticks, v.z(), v.r());
+ double t2 = correctTicks (ticks, ans.z(), ans.r());
+ return t1 > t2 ? t1 : t2;
+ }
};
-
+
template<> struct
correctedTicks< PositionVector3D < CylindricalEta3D<double> > > {
- double operator()(double ticks,
- const PositionVector3D< CylindricalEta3D<double> >& v,
- const XYZVector & ans) {
- double t1 = correctTicks (ticks, v.z(), v.r());
- double t2 = correctTicks (ticks, ans.z(), ans.r());
- return t1 > t2 ? t1 : t2;
- }
+ double operator()(double ticks,
+ const PositionVector3D< CylindricalEta3D<double> >& v,
+ const XYZVector & ans) {
+ double t1 = correctTicks (ticks, v.z(), v.r());
+ double t2 = correctTicks (ticks, ans.z(), ans.r());
+ return t1 > t2 ? t1 : t2;
+ }
};
-
+
template <class R, class V>
int testApplication(const R& r,const V& v,const XYZVector &answer,double t) {
- typedef typename V::CoordinateType CoordType;
-
- int ret = 0;
- correctedTicks<V> ct;
- double ticks = ct(t, v, answer);
- #ifdef DEBUG
- std::cout <<">>>>> Testing application of "
- << RotationTraits<R>::name() << " " << r << "\non "
- << CoordinateTraits<typename V::CoordinateType>::name() <<
- v << " ticks = " << ticks;
- #endif
- #ifdef TRACE2
- std::cout << " about to do V rv = r(v) - \n";
- #endif
- V rv = r(v);
- #ifdef TRACE2
- std::cout << "ok ";
- #endif
- // comparison here should be == but need to use 10 ticks to be sure for 32 bits machines
- // when results are flushed in memory and approximated
- if ( compare3D(rv, r*v, 10 ) != 0) {
- std::cout << "Inconsistency between R(v) and R*v for R = "
- << RotationTraits<R>::name() << " " << r
- << "\nacting on " << CoordinateTraits<CoordType>::name() << v << "\n";
- ret |= 9;
- }
- #ifdef TRACE2
- std::cout << "+ also did rv != r*v ";
- #endif
- if ( closeEnough(v.r(), rv.r(), "r", ticks) != 0 ) {
- std::cout << "Radius change between R(v) and R*v for R = "
- << RotationTraits<R>::name() << " " << r
- << "\nacting on "
- << CoordinateTraits<CoordType>::name()
- << v << "\n";
- ret |= 17;
- }
- #ifdef TRACE2
- std::cout << "\n---- about to do compare3D ----";
- #endif
- ret |= compare3D (rv, answer, ticks);
- #ifdef TRACE2
- std::cout << " done \n";
- #endif
- #ifdef DEBUG
- if (ret == 0) std::cout << " OK\n";
- #endif
- return ret;
+ typedef typename V::CoordinateType CoordType;
+
+ int ret = 0;
+ correctedTicks<V> ct;
+ double ticks = ct(t, v, answer);
+#ifdef DEBUG
+ std::cout <<">>>>> Testing application of "
+ << RotationTraits<R>::name() << " " << r << "\non "
+ << CoordinateTraits<typename V::CoordinateType>::name() <<
+ v << " ticks = " << ticks;
+#endif
+#ifdef TRACE2
+ std::cout << " about to do V rv = r(v) - \n";
+#endif
+ V rv = r(v);
+#ifdef TRACE2
+ std::cout << "ok ";
+#endif
+ // comparison here should be == but need to use 10 ticks to be sure for 32 bits machines
+ // when results are flushed in memory and approximated
+ if ( compare3D(rv, r*v, 10 ) != 0) {
+ std::cout << "Inconsistency between R(v) and R*v for R = "
+ << RotationTraits<R>::name() << " " << r
+ << "\nacting on " << CoordinateTraits<CoordType>::name() << v << "\n";
+ ret |= 9;
+ }
+#ifdef TRACE2
+ std::cout << "+ also did rv != r*v ";
+#endif
+ if ( closeEnough(v.r(), rv.r(), "r", ticks) != 0 ) {
+ std::cout << "Radius change between R(v) and R*v for R = "
+ << RotationTraits<R>::name() << " " << r
+ << "\nacting on "
+ << CoordinateTraits<CoordType>::name()
+ << v << "\n";
+ ret |= 17;
+ }
+#ifdef TRACE2
+ std::cout << "\n---- about to do compare3D ----";
+#endif
+ ret |= compare3D (rv, answer, ticks);
+#ifdef TRACE2
+ std::cout << " done \n";
+#endif
+#ifdef DEBUG
+ if (ret == 0) std::cout << " OK\n";
+#endif
+ return ret;
}
XYZVector rxv ( double phi, XYZVector v ) {
- double c = cos(phi);
- double s = sin(phi);
- return XYZVector ( v.x(), c*v.y()-s*v.z(), s*v.y()+c*v.z() );
+ double c = cos(phi);
+ double s = sin(phi);
+ return XYZVector ( v.x(), c*v.y()-s*v.z(), s*v.y()+c*v.z() );
}
XYZVector ryv ( double phi, XYZVector v ) {
- double c = cos(phi);
- double s = sin(phi);
- return XYZVector ( c*v.x()+s*v.z(), v.y(), -s*v.x()+c*v.z() );
+ double c = cos(phi);
+ double s = sin(phi);
+ return XYZVector ( c*v.x()+s*v.z(), v.y(), -s*v.x()+c*v.z() );
}
XYZVector rzv ( double phi, XYZVector v ) {
- double c = cos(phi);
- double s = sin(phi);
- return XYZVector ( c*v.x()-s*v.y(), s*v.x()+c*v.y(), v.z() );
+ double c = cos(phi);
+ double s = sin(phi);
+ return XYZVector ( c*v.x()-s*v.y(), s*v.x()+c*v.y(), v.z() );
}
enum XYZ { X, Y, Z } ;
struct TestRotation {
- std::vector<XYZ> xyz;
- std::vector<double> phi;
- TestRotation (std::vector<XYZ> const & xyz_, std::vector<double> const & phi_)
- : xyz(xyz_), phi(phi_) {}
+ std::vector<XYZ> xyz;
+ std::vector<double> phi;
+ TestRotation (std::vector<XYZ> const & xyz_, std::vector<double> const & phi_)
+ : xyz(xyz_), phi(phi_) {}
};
Rotation3D rrr (TestRotation const & t) {
- #ifdef TRACE1
- std::cout << "---- rrr ----";
- #endif
- Rotation3D r;
- for (unsigned int i=0; i<t.xyz.size(); ++i) {
- switch ( t.xyz[i] ) {
- case X:
- r = r*RotationX(t.phi[i]);
- break;
- case Y:
- r = r*RotationY(t.phi[i]);
- break;
- case Z:
- r = r*RotationZ(t.phi[i]);
- break;
- }
- }
- #ifdef TRACE1
- std::cout << " done\n";
- #endif
- return r;
+#ifdef TRACE1
+ std::cout << "---- rrr ----";
+#endif
+ Rotation3D r;
+ for (unsigned int i=0; i<t.xyz.size(); ++i) {
+ switch ( t.xyz[i] ) {
+ case X:
+ r = r*RotationX(t.phi[i]);
+ break;
+ case Y:
+ r = r*RotationY(t.phi[i]);
+ break;
+ case Z:
+ r = r*RotationZ(t.phi[i]);
+ break;
+ }
+ }
+#ifdef TRACE1
+ std::cout << " done\n";
+#endif
+ return r;
}
-XYZVector ans ( TestRotation const & t, XYZVector const & v_in) {
- XYZVector v(v_in);
- for (int i=t.xyz.size()-1; i >= 0; --i) {
- switch ( t.xyz[i] ) {
- case X:
- v = rxv ( t.phi[i],v );
- break;
- case Y:
- v = ryv ( t.phi[i],v );
- break;
- case Z:
- v = rzv ( t.phi[i],v );
- break;
- }
- }
- return v;
+XYZVector ans ( TestRotation const & t, XYZVector const & v_in) {
+ XYZVector v(v_in);
+ for (int i=t.xyz.size()-1; i >= 0; --i) {
+ switch ( t.xyz[i] ) {
+ case X:
+ v = rxv ( t.phi[i],v );
+ break;
+ case Y:
+ v = ryv ( t.phi[i],v );
+ break;
+ case Z:
+ v = rzv ( t.phi[i],v );
+ break;
+ }
+ }
+ return v;
}
const double pi = 3.1415926535897932385;
-std::vector<TestRotation>
+std::vector<TestRotation>
makeTestRotations () {
- #ifdef TRACE1
- std::cout << "---- makeTestRotations ----";
- #endif
- std::vector<TestRotation> t;
- std::vector<XYZ> xyz;
- std::vector<double> phi;
-
-
-
- xyz.clear(); phi.clear();
- xyz.push_back(X); phi.push_back( pi/2 );
- t.push_back(TestRotation(xyz,phi));
-
- xyz.clear(); phi.clear();
- xyz.push_back(Y); phi.push_back( pi/2 );
- t.push_back(TestRotation(xyz,phi));
-
- xyz.clear(); phi.clear();
- xyz.push_back(Z); phi.push_back( pi/2 );
- t.push_back(TestRotation(xyz,phi));
-
- xyz.clear(); phi.clear();
- xyz.push_back(X); phi.push_back( -pi/6 );
- t.push_back(TestRotation(xyz,phi));
-
- xyz.clear(); phi.clear();
- xyz.push_back(Y); phi.push_back( pi/6 );
- t.push_back(TestRotation(xyz,phi));
-
- xyz.clear(); phi.clear();
- xyz.push_back(Z); phi.push_back( pi/3 );
- t.push_back(TestRotation(xyz,phi));
-
- xyz.clear(); phi.clear();
- xyz.push_back(X); phi.push_back( -pi/6 );
- xyz.push_back(Y); phi.push_back( pi/3 );
- t.push_back(TestRotation(xyz,phi));
-
- xyz.clear(); phi.clear();
- xyz.push_back(X); phi.push_back( -pi/6 );
- xyz.push_back(Y); phi.push_back( pi/4 );
- xyz.push_back(Z); phi.push_back( -pi/5 );
- t.push_back(TestRotation(xyz,phi));
-
- xyz.clear(); phi.clear();
- xyz.push_back(Y); phi.push_back( pi );
- xyz.push_back(X); phi.push_back( -pi/2 );
- xyz.push_back(Z); phi.push_back( -pi/1.5 );
- xyz.push_back(Y); phi.push_back( -pi/3 );
- t.push_back(TestRotation(xyz,phi));
-
- xyz.clear(); phi.clear();
- xyz.push_back(Z); phi.push_back( 1.3 );
- xyz.push_back(Y); phi.push_back( -1.1 );
- xyz.push_back(X); phi.push_back( 0.4 );
- xyz.push_back(Y); phi.push_back( 0.7 );
- t.push_back(TestRotation(xyz,phi));
-
- xyz.clear(); phi.clear();
- xyz.push_back(X); phi.push_back( 1.3 );
- xyz.push_back(Z); phi.push_back( -1.1 );
- xyz.push_back(Y); phi.push_back( 0.4 );
- xyz.push_back(Z); phi.push_back( 0.7 );
- t.push_back(TestRotation(xyz,phi));
-
- xyz.clear(); phi.clear();
- xyz.push_back(Y); phi.push_back( 1.3 );
- xyz.push_back(X); phi.push_back( -1.1 );
- xyz.push_back(Z); phi.push_back( 0.4 );
- xyz.push_back(X); phi.push_back( 0.7 );
- t.push_back(TestRotation(xyz,phi));
-
- xyz.clear(); phi.clear();
- xyz.push_back(Z); phi.push_back( .03 );
- xyz.push_back(Y); phi.push_back( -.05 );
- xyz.push_back(X); phi.push_back( 0.04 );
- xyz.push_back(Y); phi.push_back( 0.07 );
- xyz.push_back(Z); phi.push_back( -0.02 );
- t.push_back(TestRotation(xyz,phi));
-
- #ifdef TRACE1
- std::cout << " done\n";
- #endif
- return t;
+#ifdef TRACE1
+ std::cout << "---- makeTestRotations ----";
+#endif
+ std::vector<TestRotation> t;
+ std::vector<XYZ> xyz;
+ std::vector<double> phi;
+
+
+
+ xyz.clear(); phi.clear();
+ xyz.push_back(X); phi.push_back( pi/2 );
+ t.push_back(TestRotation(xyz,phi));
+
+ xyz.clear(); phi.clear();
+ xyz.push_back(Y); phi.push_back( pi/2 );
+ t.push_back(TestRotation(xyz,phi));
+
+ xyz.clear(); phi.clear();
+ xyz.push_back(Z); phi.push_back( pi/2 );
+ t.push_back(TestRotation(xyz,phi));
+
+ xyz.clear(); phi.clear();
+ xyz.push_back(X); phi.push_back( -pi/6 );
+ t.push_back(TestRotation(xyz,phi));
+
+ xyz.clear(); phi.clear();
+ xyz.push_back(Y); phi.push_back( pi/6 );
+ t.push_back(TestRotation(xyz,phi));
+
+ xyz.clear(); phi.clear();
+ xyz.push_back(Z); phi.push_back( pi/3 );
+ t.push_back(TestRotation(xyz,phi));
+
+ xyz.clear(); phi.clear();
+ xyz.push_back(X); phi.push_back( -pi/6 );
+ xyz.push_back(Y); phi.push_back( pi/3 );
+ t.push_back(TestRotation(xyz,phi));
+
+ xyz.clear(); phi.clear();
+ xyz.push_back(X); phi.push_back( -pi/6 );
+ xyz.push_back(Y); phi.push_back( pi/4 );
+ xyz.push_back(Z); phi.push_back( -pi/5 );
+ t.push_back(TestRotation(xyz,phi));
+
+ xyz.clear(); phi.clear();
+ xyz.push_back(Y); phi.push_back( pi );
+ xyz.push_back(X); phi.push_back( -pi/2 );
+ xyz.push_back(Z); phi.push_back( -pi/1.5 );
+ xyz.push_back(Y); phi.push_back( -pi/3 );
+ t.push_back(TestRotation(xyz,phi));
+
+ xyz.clear(); phi.clear();
+ xyz.push_back(Z); phi.push_back( 1.3 );
+ xyz.push_back(Y); phi.push_back( -1.1 );
+ xyz.push_back(X); phi.push_back( 0.4 );
+ xyz.push_back(Y); phi.push_back( 0.7 );
+ t.push_back(TestRotation(xyz,phi));
+
+ xyz.clear(); phi.clear();
+ xyz.push_back(X); phi.push_back( 1.3 );
+ xyz.push_back(Z); phi.push_back( -1.1 );
+ xyz.push_back(Y); phi.push_back( 0.4 );
+ xyz.push_back(Z); phi.push_back( 0.7 );
+ t.push_back(TestRotation(xyz,phi));
+
+ xyz.clear(); phi.clear();
+ xyz.push_back(Y); phi.push_back( 1.3 );
+ xyz.push_back(X); phi.push_back( -1.1 );
+ xyz.push_back(Z); phi.push_back( 0.4 );
+ xyz.push_back(X); phi.push_back( 0.7 );
+ t.push_back(TestRotation(xyz,phi));
+
+ xyz.clear(); phi.clear();
+ xyz.push_back(Z); phi.push_back( .03 );
+ xyz.push_back(Y); phi.push_back( -.05 );
+ xyz.push_back(X); phi.push_back( 0.04 );
+ xyz.push_back(Y); phi.push_back( 0.07 );
+ xyz.push_back(Z); phi.push_back( -0.02 );
+ t.push_back(TestRotation(xyz,phi));
+
+#ifdef TRACE1
+ std::cout << " done\n";
+#endif
+ return t;
}
std::vector<XYZVector> makeTestVectors () {
- #ifdef TRACE1
- std::cout << "---- makeTestVectors ----";
- #endif
- std::vector<XYZVector> vs;
- vs.push_back(XYZVector ( 1, 0, 0 ));
- vs.push_back(XYZVector ( 0, 1, 0 ));
- vs.push_back(XYZVector ( 0, 0, 1 ));
- vs.push_back(XYZVector ( -1, 0, 0 ));
- vs.push_back(XYZVector ( 0, -1, 0 ));
- vs.push_back(XYZVector ( 0, 0, -1 ));
- vs.push_back(XYZVector ( 1, 2, 3 ));
- vs.push_back(XYZVector ( 2, -1, 3 ));
- vs.push_back(XYZVector ( -3, 1, -2 ));
- vs.push_back(XYZVector ( 0, .00001, -2 ));
-
- #ifdef TRACE1
- std::cout << " done\n";
- #endif
- return vs;
+#ifdef TRACE1
+ std::cout << "---- makeTestVectors ----";
+#endif
+ std::vector<XYZVector> vs;
+ vs.push_back(XYZVector ( 1, 0, 0 ));
+ vs.push_back(XYZVector ( 0, 1, 0 ));
+ vs.push_back(XYZVector ( 0, 0, 1 ));
+ vs.push_back(XYZVector ( -1, 0, 0 ));
+ vs.push_back(XYZVector ( 0, -1, 0 ));
+ vs.push_back(XYZVector ( 0, 0, -1 ));
+ vs.push_back(XYZVector ( 1, 2, 3 ));
+ vs.push_back(XYZVector ( 2, -1, 3 ));
+ vs.push_back(XYZVector ( -3, 1, -2 ));
+ vs.push_back(XYZVector ( 0, .00001, -2 ));
+
+#ifdef TRACE1
+ std::cout << " done\n";
+#endif
+ return vs;
}
template <class R, class V>
int doTest (TestRotation const & testRotation, XYZVector const & testVector,
- double ticks) {
- #ifdef TRACE1
- std::cout << "---- doTest ----";
- #endif
- int ret = 0;
- R r ( rrr(testRotation) );
- V v(testVector);
- XYZVector rv = ans (testRotation, testVector);
- ret |= testApplication (r, v, rv, ticks);
- #ifdef TRACE1
- std::cout << " done\n";
- #endif
-
- if (ret == 0) std::cout << ".";
-
- return ret;
+ double ticks) {
+#ifdef TRACE1
+ std::cout << "---- doTest ----";
+#endif
+ int ret = 0;
+ R r ( rrr(testRotation) );
+ V v(testVector);
+ XYZVector rv = ans (testRotation, testVector);
+ ret |= testApplication (r, v, rv, ticks);
+#ifdef TRACE1
+ std::cout << " done\n";
+#endif
+
+ if (ret == 0) std::cout << ".";
+
+ return ret;
}
template <class R, class C>
int doTestL (TestRotation const & testRotation, XYZVector const & testVector,
- double ticks) {
- #ifdef TRACE1
- std::cout << "---- doTestL ----";
- #endif
- int ret = 0;
- R r ( rrr(testRotation) );
- LorentzVector<C> v;
- double x = testVector.X();
- double y = testVector.Y();
- double z = testVector.Z();
- double t = std::sqrt (x*x + y*y + z*z + 1);
- v.SetXYZT ( x, y, z, t );
- XYZVector rv = ans (testRotation, testVector);
- ret |= testApplication (r, v, rv, ticks);
- LorentzVector<C> rv2 = r(v);
- ret |= closeEnough (t, rv2.E(), "t", ticks);
- #ifdef TRACE1
- std::cout << " done\n";
- #endif
- return ret;
+ double ticks) {
+#ifdef TRACE1
+ std::cout << "---- doTestL ----";
+#endif
+ int ret = 0;
+ R r ( rrr(testRotation) );
+ LorentzVector<C> v;
+ double x = testVector.X();
+ double y = testVector.Y();
+ double z = testVector.Z();
+ double t = std::sqrt (x*x + y*y + z*z + 1);
+ v.SetXYZT ( x, y, z, t );
+ XYZVector rv = ans (testRotation, testVector);
+ ret |= testApplication (r, v, rv, ticks);
+ LorentzVector<C> rv2 = r(v);
+ ret |= closeEnough (t, rv2.E(), "t", ticks);
+#ifdef TRACE1
+ std::cout << " done\n";
+#endif
+ return ret;
}
struct ForeignVector {
- typedef Cartesian3D<> CoordinateType;
- XYZVector v;
- template <class V>
- explicit ForeignVector (V const & v_) : v(v_) {}
- ForeignVector (double xx, double yy, double zz) : v(xx,yy,zz) {}
- double x() const { return v.x(); }
- double y() const { return v.y(); }
- double z() const { return v.z(); }
- double r() const { return v.r(); }
- bool operator==(ForeignVector const & rhs) {return v == rhs.v;}
- bool operator!=(ForeignVector const & rhs) {return v != rhs.v;}
+ typedef Cartesian3D<> CoordinateType;
+ XYZVector v;
+ template <class V>
+ explicit ForeignVector (V const & v_) : v(v_) {}
+ ForeignVector (double xx, double yy, double zz) : v(xx,yy,zz) {}
+ double x() const { return v.x(); }
+ double y() const { return v.y(); }
+ double z() const { return v.z(); }
+ double r() const { return v.r(); }
+ bool operator==(ForeignVector const & rhs) {return v == rhs.v;}
+ bool operator!=(ForeignVector const & rhs) {return v != rhs.v;}
};
std::ostream & operator<< (std::ostream& os, const ForeignVector& v) {
- return os << v.v;
+ return os << v.v;
}
template <class R>
int doTestOfR (TestRotation const & testRotation, XYZVector const & testVector){
- #ifdef TRACE1
- std::cout << "---- doTestofR ----\n";
- #endif
- int ret = 0;
- const double ticks = 100; // move from 32 to 100
- #ifdef DEBUG
- std::cout << ">>>>> DisplacementVector3D< Cartesian3D<double> \n";
- #endif
- ret |= doTest <R, DisplacementVector3D< Cartesian3D<double> > >
- (testRotation,testVector,ticks);
- #ifdef DEBUG
- std::cout << ">>>>> DisplacementVector3D< Polar3D<double> \n";
- #endif
- ret |= doTest <R, DisplacementVector3D< Polar3D<double> > >
- (testRotation,testVector,ticks);
- #ifdef DEBUG
- std::cout << ">>>>> DisplacementVector3D< CylindricalEta3D<double> \n";
- #endif
- ret |= doTest <R, DisplacementVector3D< CylindricalEta3D<double> > >
- (testRotation,testVector,ticks);
- #ifdef DEBUG
- std::cout << ">>>>> PositionVector3D< Cartesian3D<double> \n";
- #endif
- ret |= doTest <R, PositionVector3D< Cartesian3D<double> > >
- (testRotation,testVector,ticks);
- #ifdef DEBUG
- std::cout << ">>>>> PositionVector3D< Polar3D<double> \n";
- #endif
- ret |= doTest <R, PositionVector3D< Polar3D<double> > >
- (testRotation,testVector,ticks);
- #ifdef DEBUG
- std::cout << ">>>>> PositionVector3D< CylindricalEta3D<double> \n";
- #endif
- ret |= doTest <R, PositionVector3D< CylindricalEta3D<double> > >
- (testRotation,testVector,ticks);
- #ifdef DEBUG
- std::cout << ">>>>> ForeignVector\n";
- #endif
- ret |= doTest <R, ForeignVector >
- (testRotation,testVector,ticks);
- #ifdef DEBUG
- std::cout << ">>>>> LorentzVector<PxPyPzE4D<double> >\n";
- #endif
- ret |= doTestL <R, PxPyPzE4D<double> >
- (testRotation,testVector,ticks);
- #ifdef TRACE1
- std::cout << " ---- doTestofR ---- done\n";
- #endif
-
- if (ret == 0) std::cout << ".";
-
- // TODO - other 4D coordinates
-
- return ret;
+#ifdef TRACE1
+ std::cout << "---- doTestofR ----\n";
+#endif
+ int ret = 0;
+ const double ticks = 100; // move from 32 to 100
+#ifdef DEBUG
+ std::cout << ">>>>> DisplacementVector3D< Cartesian3D<double> \n";
+#endif
+ ret |= doTest <R, DisplacementVector3D< Cartesian3D<double> > >
+ (testRotation,testVector,ticks);
+#ifdef DEBUG
+ std::cout << ">>>>> DisplacementVector3D< Polar3D<double> \n";
+#endif
+ ret |= doTest <R, DisplacementVector3D< Polar3D<double> > >
+ (testRotation,testVector,ticks);
+#ifdef DEBUG
+ std::cout << ">>>>> DisplacementVector3D< CylindricalEta3D<double> \n";
+#endif
+ ret |= doTest <R, DisplacementVector3D< CylindricalEta3D<double> > >
+ (testRotation,testVector,ticks);
+#ifdef DEBUG
+ std::cout << ">>>>> PositionVector3D< Cartesian3D<double> \n";
+#endif
+ ret |= doTest <R, PositionVector3D< Cartesian3D<double> > >
+ (testRotation,testVector,ticks);
+#ifdef DEBUG
+ std::cout << ">>>>> PositionVector3D< Polar3D<double> \n";
+#endif
+ ret |= doTest <R, PositionVector3D< Polar3D<double> > >
+ (testRotation,testVector,ticks);
+#ifdef DEBUG
+ std::cout << ">>>>> PositionVector3D< CylindricalEta3D<double> \n";
+#endif
+ ret |= doTest <R, PositionVector3D< CylindricalEta3D<double> > >
+ (testRotation,testVector,ticks);
+#ifdef DEBUG
+ std::cout << ">>>>> ForeignVector\n";
+#endif
+ ret |= doTest <R, ForeignVector >
+ (testRotation,testVector,ticks);
+#ifdef DEBUG
+ std::cout << ">>>>> LorentzVector<PxPyPzE4D<double> >\n";
+#endif
+ ret |= doTestL <R, PxPyPzE4D<double> >
+ (testRotation,testVector,ticks);
+#ifdef TRACE1
+ std::cout << " ---- doTestofR ---- done\n";
+#endif
+
+ if (ret == 0) std::cout << ".";
+
+ // TODO - other 4D coordinates
+
+ return ret;
}
-int exerciseTestCase (TestRotation const & testRotation,
- XYZVector const & testVector)
+int exerciseTestCase (TestRotation const & testRotation,
+ XYZVector const & testVector)
{
- std::cout << ">>>>> Rotation Tests of " << testVector << "\t\t: " ;
-
- #ifdef TRACE1
- std::cout << "---- exerciseTestCase ----";
- #endif
- int ret = 0;
- ret |= doTestOfR <Rotation3D> (testRotation,testVector);
- ret |= doTestOfR <AxisAngle> (testRotation,testVector);
- ret |= doTestOfR <EulerAngles> (testRotation,testVector);
- ret |= doTestOfR <Quaternion> (testRotation,testVector);
- ret |= doTestOfR <RotationZYX> (testRotation,testVector);
- #ifdef TRACE1
- std::cout << " done\n";
- #endif
-
- if (ret == 0)
- std::cout << "\t OK\n";
- else {
- std::cout << "\t Failed!\n ";
- std::cerr << "\n>>>>> Rotation Tests of " << testVector << "\t\t:\t FAILED \n";
- }
-
- return ret;
+ std::cout << ">>>>> Rotation Tests of " << testVector << "\t\t: " ;
+
+#ifdef TRACE1
+ std::cout << "---- exerciseTestCase ----";
+#endif
+ int ret = 0;
+ ret |= doTestOfR <Rotation3D> (testRotation,testVector);
+ ret |= doTestOfR <AxisAngle> (testRotation,testVector);
+ ret |= doTestOfR <EulerAngles> (testRotation,testVector);
+ ret |= doTestOfR <Quaternion> (testRotation,testVector);
+ ret |= doTestOfR <RotationZYX> (testRotation,testVector);
+#ifdef TRACE1
+ std::cout << " done\n";
+#endif
+
+ if (ret == 0)
+ std::cout << "\t OK\n";
+ else {
+ std::cout << "\t Failed!\n ";
+ std::cerr << "\n>>>>> Rotation Tests of " << testVector << "\t\t:\t FAILED \n";
+ }
+
+ return ret;
}
// ===== Axial test section =============
template <class R, class V>
int doTestA (XYZVector const & testVector, double ticks) {
- #ifdef TRACE1
- std::cout << "---- doTestA ----";
- #endif
- int ret = 0;
- V v(testVector);
- XYZVector rv;
- for (double angle = -4.0; angle < 4.0; angle += .15) {
- RotationX rx (angle);
- rv = rxv (angle, testVector);
- ret |= testApplication (rx, v, rv, ticks);
- RotationY ry (angle);
- rv = ryv (angle, testVector);
- ret |= testApplication (ry, v, rv, ticks);
- RotationZ rz (angle);
- rv = rzv (angle, testVector);
- ret |= testApplication (rz, v, rv, ticks);
- }
- #ifdef TRACE1
- std::cout << " done\n";
- #endif
- if (ret == 0) std::cout << ".";
- return ret;
+#ifdef TRACE1
+ std::cout << "---- doTestA ----";
+#endif
+ int ret = 0;
+ V v(testVector);
+ XYZVector rv;
+ for (double angle = -4.0; angle < 4.0; angle += .15) {
+ RotationX rx (angle);
+ rv = rxv (angle, testVector);
+ ret |= testApplication (rx, v, rv, ticks);
+ RotationY ry (angle);
+ rv = ryv (angle, testVector);
+ ret |= testApplication (ry, v, rv, ticks);
+ RotationZ rz (angle);
+ rv = rzv (angle, testVector);
+ ret |= testApplication (rz, v, rv, ticks);
+ }
+#ifdef TRACE1
+ std::cout << " done\n";
+#endif
+ if (ret == 0) std::cout << ".";
+ return ret;
}
template <class R, class C>
int doTestLA (XYZVector const & testVector, double ticks) {
- #ifdef TRACE1
- std::cout << "---- doTestLA ----";
- #endif
- int ret = 0;
- LorentzVector<C> v;
- double x = testVector.X();
- double y = testVector.Y();
- double z = testVector.Z();
- double t = std::sqrt (x*x + y*y + z*z + 1);
- v.SetXYZT ( x, y, z, t );
- XYZVector rv;
- for (double angle = -4.0; angle < 4.0; angle += .15) {
- //std::cout << "\n============ angle is " << angle << "\n";
- RotationX rx (angle);
- rv = rxv (angle, testVector);
- ret |= testApplication (rx, v, rv, ticks);
- RotationY ry (angle);
- rv = ryv (angle, testVector);
- ret |= testApplication (ry, v, rv, ticks);
- RotationZ rz (angle);
- rv = rzv (angle, testVector);
- ret |= testApplication (rz, v, rv, ticks);
- }
- #ifdef TRACE1
- std::cout << " done\n";
- #endif
-
- if (ret == 0) std::cout << ".";
- return ret;
+#ifdef TRACE1
+ std::cout << "---- doTestLA ----";
+#endif
+ int ret = 0;
+ LorentzVector<C> v;
+ double x = testVector.X();
+ double y = testVector.Y();
+ double z = testVector.Z();
+ double t = std::sqrt (x*x + y*y + z*z + 1);
+ v.SetXYZT ( x, y, z, t );
+ XYZVector rv;
+ for (double angle = -4.0; angle < 4.0; angle += .15) {
+ //std::cout << "\n============ angle is " << angle << "\n";
+ RotationX rx (angle);
+ rv = rxv (angle, testVector);
+ ret |= testApplication (rx, v, rv, ticks);
+ RotationY ry (angle);
+ rv = ryv (angle, testVector);
+ ret |= testApplication (ry, v, rv, ticks);
+ RotationZ rz (angle);
+ rv = rzv (angle, testVector);
+ ret |= testApplication (rz, v, rv, ticks);
+ }
+#ifdef TRACE1
+ std::cout << " done\n";
+#endif
+
+ if (ret == 0) std::cout << ".";
+ return ret;
}
template <class R>
int doTestOfAxial (XYZVector const & testVector){
- #ifdef TRACE1
- std::cout << "---- doTestOfAxial ----\n";
- #endif
- int ret = 0;
- const double ticks = 32;
- #ifdef DEBUG
- std::cout << ">>>>> DisplacementVector3D< Cartesian3D<double> \n";
- #endif
- ret |= doTestA <R, DisplacementVector3D< Cartesian3D<double> > >
- (testVector,ticks);
- #ifdef DEBUG
- std::cout << ">>>>> DisplacementVector3D< Polar3D<double> \n";
- #endif
- ret |= doTestA <R, DisplacementVector3D< Polar3D<double> > >
- (testVector,ticks);
- #ifdef DEBUG
- std::cout << ">>>>> DisplacementVector3D< CylindricalEta3D<double> \n";
- #endif
- ret |= doTestA <R, DisplacementVector3D< CylindricalEta3D<double> > >
- (testVector,ticks);
- #ifdef DEBUG
- std::cout << ">>>>> PositionVector3D< Cartesian3D<double> \n";
- #endif
- ret |= doTestA <R, PositionVector3D< Cartesian3D<double> > >
- (testVector,ticks);
- #ifdef DEBUG
- std::cout << ">>>>> PositionVector3D< Polar3D<double> \n";
- #endif
- ret |= doTestA <R, PositionVector3D< Polar3D<double> > > (testVector,ticks);
- #ifdef DEBUG
- std::cout << ">>>>> PositionVector3D< CylindricalEta3D<double> \n";
- #endif
- ret |= doTestA <R, PositionVector3D< CylindricalEta3D<double> > >
- (testVector,ticks);
- #ifdef DEBUG
- std::cout << ">>>>> ForeignVector\n";
- #endif
- ret |= doTestA <R, ForeignVector > (testVector,ticks);
- #ifdef DEBUG
- std::cout << ">>>>> LorentzVector<PxPyPzE4D<double> >\n";
- #endif
- ret |= doTestLA <R, PxPyPzE4D<double> > (testVector,ticks);
- #ifdef TRACE1
- std::cout << " ---- doTestofR ---- done\n";
- #endif
- // TODO - other 4D coordinates
-
- if (ret == 0) std::cout << ".";
+#ifdef TRACE1
+ std::cout << "---- doTestOfAxial ----\n";
+#endif
+ int ret = 0;
+ const double ticks = 32;
+#ifdef DEBUG
+ std::cout << ">>>>> DisplacementVector3D< Cartesian3D<double> \n";
+#endif
+ ret |= doTestA <R, DisplacementVector3D< Cartesian3D<double> > >
+ (testVector,ticks);
+#ifdef DEBUG
+ std::cout << ">>>>> DisplacementVector3D< Polar3D<double> \n";
+#endif
+ ret |= doTestA <R, DisplacementVector3D< Polar3D<double> > >
+ (testVector,ticks);
+#ifdef DEBUG
+ std::cout << ">>>>> DisplacementVector3D< CylindricalEta3D<double> \n";
+#endif
+ ret |= doTestA <R, DisplacementVector3D< CylindricalEta3D<double> > >
+ (testVector,ticks);
+#ifdef DEBUG
+ std::cout << ">>>>> PositionVector3D< Cartesian3D<double> \n";
+#endif
+ ret |= doTestA <R, PositionVector3D< Cartesian3D<double> > >
+ (testVector,ticks);
+#ifdef DEBUG
+ std::cout << ">>>>> PositionVector3D< Polar3D<double> \n";
+#endif
+ ret |= doTestA <R, PositionVector3D< Polar3D<double> > > (testVector,ticks);
+#ifdef DEBUG
+ std::cout << ">>>>> PositionVector3D< CylindricalEta3D<double> \n";
+#endif
+ ret |= doTestA <R, PositionVector3D< CylindricalEta3D<double> > >
+ (testVector,ticks);
+#ifdef DEBUG
+ std::cout << ">>>>> ForeignVector\n";
+#endif
+ ret |= doTestA <R, ForeignVector > (testVector,ticks);
+#ifdef DEBUG
+ std::cout << ">>>>> LorentzVector<PxPyPzE4D<double> >\n";
+#endif
+ ret |= doTestLA <R, PxPyPzE4D<double> > (testVector,ticks);
+#ifdef TRACE1
+ std::cout << " ---- doTestofR ---- done\n";
+#endif
+ // TODO - other 4D coordinates
+
+ if (ret == 0) std::cout << ".";
return ret;
}
-int exerciseAxialTest (XYZVector const & testVector)
+int exerciseAxialTest (XYZVector const & testVector)
{
- #ifdef TRACE1
- std::cout << "---- exerciseAxialTest ----";
- #endif
+#ifdef TRACE1
+ std::cout << "---- exerciseAxialTest ----";
+#endif
- std::cout << ">>>>> Axial Rotation Tests of " << testVector << "\t\t: ";
+ std::cout << ">>>>> Axial Rotation Tests of " << testVector << "\t\t: ";
- int ret = 0;
- ret |= doTestOfAxial <RotationX> (testVector);
- ret |= doTestOfAxial <RotationY> (testVector);
- ret |= doTestOfAxial <RotationZ> (testVector);
- #ifdef TRACE1
- std::cout << " done\n";
- #endif
+ int ret = 0;
+ ret |= doTestOfAxial <RotationX> (testVector);
+ ret |= doTestOfAxial <RotationY> (testVector);
+ ret |= doTestOfAxial <RotationZ> (testVector);
+#ifdef TRACE1
+ std::cout << " done\n";
+#endif
- if (ret == 0)
- std::cout << "\t OK\n";
- else {
- std::cout << "\t Failed!\n ";
- std::cerr << "\n>>>>> Axial Rotation Tests of " << testVector << "\t\t:\t FAILED \n";
- }
+ if (ret == 0)
+ std::cout << "\t OK\n";
+ else {
+ std::cout << "\t Failed!\n ";
+ std::cerr << "\n>>>>> Axial Rotation Tests of " << testVector << "\t\t:\t FAILED \n";
+ }
- return ret;
+ return ret;
}
@@ -690,39 +690,39 @@ int exerciseAxialTest (XYZVector const & testVector)
int rotationApplication (bool forceRun = false) {
- int ret = 0;
+ int ret = 0;
- bool skipTests = false;
+ bool skipTests = false;
#if defined(__i386__)
- // do not run by default tests on 32 bit architecture
- // since extended precision will make it difficult
- skipTests = true;
-#endif
-
- if (skipTests && !forceRun) {
- std::cout << "Skip the tests - it is probably a 32 bit arch - return 0" << std::endl;
- return 0;
- }
-
- std::vector<TestRotation> testRotations = makeTestRotations();
- std::vector<XYZVector> testVectors = makeTestVectors();
- for ( std::vector<TestRotation>::const_iterator n = testRotations.begin();
+ // do not run by default tests on 32 bit architecture
+ // since extended precision will make it difficult
+ skipTests = true;
+#endif
+
+ if (skipTests && !forceRun) {
+ std::cout << "Skip the tests - it is probably a 32 bit arch - return 0" << std::endl;
+ return 0;
+ }
+
+ std::vector<TestRotation> testRotations = makeTestRotations();
+ std::vector<XYZVector> testVectors = makeTestVectors();
+ for ( std::vector<TestRotation>::const_iterator n = testRotations.begin();
n != testRotations.end(); ++n ) {
- for ( std::vector<XYZVector>::const_iterator m = testVectors.begin();
- m != testVectors.end(); ++m ) {
- ret |= exerciseTestCase (*n, *m);
- }
- }
- for ( std::vector<XYZVector>::const_iterator vp = testVectors.begin();
+ for ( std::vector<XYZVector>::const_iterator m = testVectors.begin();
+ m != testVectors.end(); ++m ) {
+ ret |= exerciseTestCase (*n, *m);
+ }
+ }
+ for ( std::vector<XYZVector>::const_iterator vp = testVectors.begin();
vp != testVectors.end(); ++vp ) {
- ret |= exerciseAxialTest (*vp);
- }
-
- return ret;
+ ret |= exerciseAxialTest (*vp);
+ }
+
+ return ret;
}
int main() {
- int ret = rotationApplication(true);
+ int ret = rotationApplication(true);
if (ret) std::cerr << "test FAILED !!! " << std::endl;
else std::cout << "test OK " << std::endl;
return ret;
diff --git a/math/genvector/test/stress2D.cxx b/math/genvector/test/stress2D.cxx
index 66fe681fa59..8adc5232661 100644
--- a/math/genvector/test/stress2D.cxx
+++ b/math/genvector/test/stress2D.cxx
@@ -89,7 +89,7 @@ public:
int pr = std::cout.precision(8);
std::cout << s << "\t" << " time = " << time.RealTime() << "\t(sec)\t"
// << time.CpuTime()
- << std::endl;
+ << std::endl;
std::cout.precision(pr);
}
@@ -417,15 +417,14 @@ double testDeltaPhi( const std::vector<V *> & dataV, TStopwatch & tim, double& t
// if (cutPtEta(v1,ptMin, etaMax) ) {
// double delta;
// for (unsigned int j = i +1; j < n; ++j) {
-// V & v2 = *(dataV[j]);
-// delta = VectorUtil::DeltaR(v1,v2);
-// if (delta < deltaMax) {
-// V v3 = v1 + v2;
-// nsel++;
-// if ( cutPtEtaAndMass(v3))
-// nsel2++;
-// }
-
+// V & v2 = *(dataV[j]);
+// delta = VectorUtil::DeltaR(v1,v2);
+// if (delta < deltaMax) {
+// V v3 = v1 + v2;
+// nsel++;
+// if ( cutPtEtaAndMass(v3))
+// nsel2++;
+// }
// }
// }
// }
@@ -450,8 +449,8 @@ double testDeltaPhi( const std::vector<V *> & dataV, TStopwatch & tim, double& t
// V & v1 = *(dataV[i]);
// if ( cutPtEta(v1, ptMin, etaMax) ) {
// for (unsigned int j = i +1; j < n; ++j) {
-// V & v2 = *(dataV[j]);
-// if ( VectorUtil::DeltaR(v1,v2) < 0.5) nsel++;
+// V & v2 = *(dataV[j]);
+// if ( VectorUtil::DeltaR(v1,v2) < 0.5) nsel++;
// }
// }
// }
diff --git a/math/genvector/test/stress3D.cxx b/math/genvector/test/stress3D.cxx
index 82e9a536ad8..b14525b9e63 100644
--- a/math/genvector/test/stress3D.cxx
+++ b/math/genvector/test/stress3D.cxx
@@ -46,7 +46,7 @@ public:
int pr = std::cout.precision(8);
std::cout << s << "\t" << " time = " << time.RealTime() << "\t(sec)\t"
// << time.CpuTime()
- << std::endl;
+ << std::endl;
std::cout.precision(pr);
}
diff --git a/math/genvector/test/testVectorIO.cxx b/math/genvector/test/testVectorIO.cxx
index d7a075d7caf..6a53d11a0b9 100644
--- a/math/genvector/test/testVectorIO.cxx
+++ b/math/genvector/test/testVectorIO.cxx
@@ -128,11 +128,11 @@ double testDummy(int n) {
timer.Start();
for (int i = 0; i < n; ++i) {
p[0] = R.Gaus(0,10);
- p[1] = R.Gaus(0,10);
- p[2] = R.Gaus(0,10);
- p[3] = R.Gaus(100,10);
- setValues(v1,p);
- s += getMag2(v1);
+ p[1] = R.Gaus(0,10);
+ p[2] = R.Gaus(0,10);
+ p[3] = R.Gaus(100,10);
+ setValues(v1,p);
+ s += getMag2(v1);
}
timer.Stop();
@@ -175,14 +175,14 @@ double write(int n, const std::string & file_name, const std::string & vector_ty
double s = 0;
for (int i = 0; i < n; ++i) {
p[0] = R.Gaus(0,10);
- p[1] = R.Gaus(0,10);
- p[2] = R.Gaus(0,10);
- p[3] = R.Gaus(100,10);
- //CylindricalEta4D<double> & c = v1->Coordinates();
- //c.SetValues(Px,pY,pZ,E);
- setValues(*v1,p);
- t1.Fill();
- s += getMag2(*v1);
+ p[1] = R.Gaus(0,10);
+ p[2] = R.Gaus(0,10);
+ p[3] = R.Gaus(100,10);
+ //CylindricalEta4D<double> & c = v1->Coordinates();
+ //c.SetValues(Px,pY,pZ,E);
+ setValues(*v1,p);
+ t1.Fill();
+ s += getMag2(*v1);
}
f1.Write();
@@ -287,16 +287,16 @@ double writeTrack(int n, const std::string & file_name, int compress = 0) {
typedef typename TrackType::PointType P;
for (int i = 0; i < n; ++i) {
- q.SetXYZT( R.Gaus(0,10),
- R.Gaus(0,10),
- R.Gaus(0,10),
- R.Gaus(100,10) );
- p.SetXYZ( q.X(), q.Y(), q.Z() );
-
- track->Set( V(q), P(p) );
-
- t1.Fill();
- s += getMag2( *track );
+ q.SetXYZT( R.Gaus(0,10),
+ R.Gaus(0,10),
+ R.Gaus(0,10),
+ R.Gaus(100,10) );
+ p.SetXYZ( q.X(), q.Y(), q.Z() );
+
+ track->Set( V(q), P(p) );
+
+ t1.Fill();
+ s += getMag2( *track );
}
f1.Write();
diff --git a/math/mathcore/inc/Fit/ParameterSettings.h b/math/mathcore/inc/Fit/ParameterSettings.h
index 9da180d84a3..70f3f5a1e12 100644
--- a/math/mathcore/inc/Fit/ParameterSettings.h
+++ b/math/mathcore/inc/Fit/ParameterSettings.h
@@ -58,7 +58,7 @@ public:
///constructor for double limited Parameter
ParameterSettings(const std::string & name, double val, double err,
- double min, double max) :
+ double min, double max) :
fValue(val), fStepSize(err), fFix(false),
fLowerLimit(0.), fUpperLimit(0.), fHasLowerLimit(false), fHasUpperLimit(false),
fName(name)
diff --git a/math/mathcore/inc/Math/AllIntegrationTypes.h b/math/mathcore/inc/Math/AllIntegrationTypes.h
index 32179070f18..f0d8e7f3e45 100644
--- a/math/mathcore/inc/Math/AllIntegrationTypes.h
+++ b/math/mathcore/inc/Math/AllIntegrationTypes.h
@@ -31,16 +31,16 @@ namespace Math {
/**
- enumeration specifying the integration types.
- <ul>
+ enumeration specifying the integration types.
+ <ul>
<li>kDEFAULT: default type specifiend in the static options
<li>kGAUSS: simple Gauss integration method with fixed rule
<li>kLEGENDRE: Gauss-Legendre integration
- <li>kNONADAPTIVE : to be used for smooth functions
- <li>kADAPTIVE : to be used for general functions without singularities.
- <li>kADAPTIVESINGULAR: default adaptive integration type which can be used in the case of the presence of singularities.
- </ul>
- @ingroup Integration
+ <li>kNONADAPTIVE : to be used for smooth functions
+ <li>kADAPTIVE : to be used for general functions without singularities.
+ <li>kADAPTIVESINGULAR: default adaptive integration type which can be used in the case of the presence of singularities.
+ </ul>
+ @ingroup Integration
*/
enum Type { kDEFAULT = -1, kGAUSS, kLEGENDRE, kADAPTIVE, kADAPTIVESINGULAR, kNONADAPTIVE};
@@ -51,16 +51,16 @@ namespace Math {
/**
- enumeration specifying the integration types.
- <ul>
- <li>kDEFAULT : default type specified in the static option
- <li>kADAPTIVE : adaptive multi-dimensional integration
- <li>kPLAIN MC integration
- <li>kMISER MC integration
- <li>kVEGAS MC integration
- </ul>
- @ingroup MCIntegration
- */
+ enumeration specifying the integration types.
+ <ul>
+ <li>kDEFAULT : default type specified in the static option
+ <li>kADAPTIVE : adaptive multi-dimensional integration
+ <li>kPLAIN MC integration
+ <li>kMISER MC integration
+ <li>kVEGAS MC integration
+ </ul>
+ @ingroup MCIntegration
+ */
enum Type {kDEFAULT = -1, kADAPTIVE, kVEGAS, kMISER, kPLAIN};
diff --git a/math/mathcore/inc/Math/KDTree.h b/math/mathcore/inc/Math/KDTree.h
index 747d84f64dc..641b2f4669e 100644
--- a/math/mathcore/inc/Math/KDTree.h
+++ b/math/mathcore/inc/Math/KDTree.h
@@ -175,7 +175,7 @@ namespace ROOT
virtual void GetClosestPoints(const point_type& rRef,UInt_t nPoints,std::vector<std::pair<const _DataPoint*,Double_t> >& vFoundPoints) const;
virtual void GetPointsWithinDist(const point_type& rRef,value_type fDist,std::vector<const _DataPoint*>& vFoundPoints) const;
virtual Bool_t Insert(const point_type& rPoint);
-
+
const Cut* fCut; //pointer to cut object owned by this node
};
@@ -212,8 +212,8 @@ namespace ROOT
protected:
virtual BinNode* Clone();
-
- // intrinsic bin properties
+
+ // intrinsic bin properties
std::vector<tBoundary> fBoundaries; //bin boundaries
Double_t fSumw; //sum of weights
Double_t fSumw2; //sum of weights^2
diff --git a/math/mathcore/inc/Math/TDataPoint.h b/math/mathcore/inc/Math/TDataPoint.h
index 76402c74412..913b5566a12 100644
--- a/math/mathcore/inc/Math/TDataPoint.h
+++ b/math/mathcore/inc/Math/TDataPoint.h
@@ -47,7 +47,7 @@ public:
Bool_t Less(TDataPoint& rPoint,unsigned int iAxis) const;
void SetCoordinate(unsigned int iAxis,_val_type fValue);
void SetWeight(float fWeight) {m_fWeight = fWeight;}
-
+
private:
value_type m_vCoordinates[K]; //coordinates
value_type m_fWeight; //weight at this point
diff --git a/math/mathcore/inc/Math/TDataPointN.h b/math/mathcore/inc/Math/TDataPointN.h
index 9cc3c4040a7..240aca32bd0 100644
--- a/math/mathcore/inc/Math/TDataPointN.h
+++ b/math/mathcore/inc/Math/TDataPointN.h
@@ -56,7 +56,7 @@ public:
bool Less(TDataPointN& rPoint,unsigned int iAxis) const;
void SetCoordinate(unsigned int iAxis,value_type fValue);
void SetWeight(float fWeight) {m_fWeight = fWeight;}
-
+
private:
value_type* m_vCoordinates;
value_type m_fWeight;
diff --git a/math/mathcore/inc/TKDTree.h b/math/mathcore/inc/TKDTree.h
index 32385bf4721..d8470796f00 100644
--- a/math/mathcore/inc/TKDTree.h
+++ b/math/mathcore/inc/TKDTree.h
@@ -11,7 +11,7 @@
template <typename Index, typename Value> class TKDTree : public TObject
{
public:
-
+
TKDTree();
TKDTree(Index npoints, Index ndim, UInt_t bsize);
TKDTree(Index npoints, Index ndim, UInt_t bsize, Value **data);
diff --git a/math/mathcore/src/FitUtil.cxx b/math/mathcore/src/FitUtil.cxx
index 9a1e2afe91d..0c9f79b97e2 100644
--- a/math/mathcore/src/FitUtil.cxx
+++ b/math/mathcore/src/FitUtil.cxx
@@ -429,7 +429,7 @@ double FitUtil::EvaluateChi2(const IModelFunction & func, const BinData & data,
if (invError > 0) {
nPoints++;
- double tmp = ( y -fval )* invError;
+ double tmp = ( y -fval )* invError;
double resval = tmp * tmp;
@@ -640,7 +640,7 @@ double FitUtil::EvaluateChi2Residual(const IModelFunction & func, const BinData
}
- double resval = ( y -fval )* invError;
+ double resval = ( y -fval )* invError;
// avoid infinities or nan in resval
resval = CorrectValue(resval);
@@ -792,7 +792,7 @@ void FitUtil::EvaluateChi2Gradient(const IModelFunction & f, const BinData & dat
}
// calculate derivative point contribution
- double tmp = - 2.0 * ( y -fval )* invError * invError * gradFunc[ipar];
+ double tmp = - 2.0 * ( y -fval )* invError * invError * gradFunc[ipar];
g[ipar] += tmp;
}
diff --git a/math/mathcore/src/FitUtilParallel.cxx b/math/mathcore/src/FitUtilParallel.cxx
index 8ae1317c39a..a60c9afd8fa 100644
--- a/math/mathcore/src/FitUtilParallel.cxx
+++ b/math/mathcore/src/FitUtilParallel.cxx
@@ -127,7 +127,7 @@ void *EvaluateResidual(void * ptr) {
// eventually add possibility of excluding some points (like singularity)
if (fval > - std::numeric_limits<double>::max() && fval < std::numeric_limits<double>::max() ) {
// calculat chi2 point
- double tmp = ( y -fval )* invError;
+ double tmp = ( y -fval )* invError;
chi2 += tmp*tmp;
}
else
diff --git a/math/mathcore/src/SpecFuncCephes.cxx b/math/mathcore/src/SpecFuncCephes.cxx
index 27978f41833..1b299b32a45 100644
--- a/math/mathcore/src/SpecFuncCephes.cxx
+++ b/math/mathcore/src/SpecFuncCephes.cxx
@@ -225,7 +225,7 @@ double lgam( double x )
z = q * std::sin( ROOT::Math::Pi() * z );
if( z == 0 )
return (std::numeric_limits<double>::infinity());
-/* z = log(ROOT::Math::Pi()) - log( z ) - w;*/
+/* z = log(ROOT::Math::Pi()) - log( z ) - w;*/
z = std::log(ROOT::Math::Pi()) - std::log( z ) - w;
return( z );
}
@@ -604,7 +604,7 @@ double incbcf( double a, double b, double x )
thresh = 3.0 * kMACHEP;
do
{
-
+
xk = -( x * k1 * k2 )/( k3 * k4 );
pk = pkm1 + pkm2 * xk;
qk = qkm1 + qkm2 * xk;
@@ -698,7 +698,7 @@ double incbd( double a, double b, double x )
thresh = 3.0 * kMACHEP;
do
{
-
+
xk = -( z * k1 * k2 )/( k3 * k4 );
pk = pkm1 + pkm2 * xk;
qk = qkm1 + qkm2 * xk;
diff --git a/math/mathcore/src/SpecFuncCephesInv.cxx b/math/mathcore/src/SpecFuncCephesInv.cxx
index 6b5e2426b71..d5ec15ff1d3 100644
--- a/math/mathcore/src/SpecFuncCephesInv.cxx
+++ b/math/mathcore/src/SpecFuncCephesInv.cxx
@@ -20,9 +20,9 @@ namespace Cephes {
-/*
+/*
*
- * Inverse of Normal distribution function
+ * Inverse of Normal distribution function
*
*
*
@@ -173,7 +173,7 @@ double ndtri( double y0 )
-/*
+/*
*
* Inverse of complemented imcomplete gamma integral
*
@@ -362,7 +362,7 @@ done:
}
-/*
+/*
*
* Inverse of imcomplete beta integral
*
diff --git a/math/mathcore/src/TKDTree.cxx b/math/mathcore/src/TKDTree.cxx
index 09f67a4f315..a9832029c8c 100644
--- a/math/mathcore/src/TKDTree.cxx
+++ b/math/mathcore/src/TKDTree.cxx
@@ -425,9 +425,9 @@ void TKDTree<Index, Value>::Build()
fOffset = fNPoints-filled;
//
- // printf("Row0 %d\n", fRowT0);
- // printf("CrossNode %d\n", fCrossNode);
- // printf("Offset %d\n", fOffset);
+ // printf("Row0 %d\n", fRowT0);
+ // printf("CrossNode %d\n", fCrossNode);
+ // printf("Offset %d\n", fOffset);
//
//
//4.
@@ -688,38 +688,38 @@ void TKDTree<Index, Value>::FindPoint(Value * point, Index &index, Int_t &iter){
// find the index of point
// works only if we keep fData pointers
- Int_t stackNode[128];
- Int_t currentIndex =0;
- stackNode[0] = 0;
- iter =0;
- //
- while (currentIndex>=0){
- iter++;
- Int_t inode = stackNode[currentIndex];
- currentIndex--;
- if (IsTerminal(inode)){
- // investigate terminal node
- Int_t indexIP = (inode >= fCrossNode) ? (inode-fCrossNode)*fBucketSize : (inode-fNNodes)*fBucketSize+fOffset;
- printf("terminal %d indexP %d\n", inode, indexIP);
- for (Int_t ibucket=0;ibucket<fBucketSize;ibucket++){
- Bool_t isOK = kTRUE;
- indexIP+=ibucket;
- printf("ibucket %d index %d\n", ibucket, indexIP);
- if (indexIP>=fNPoints) continue;
- Int_t index0 = fIndPoints[indexIP];
- for (Int_t idim=0;idim<fNDim;idim++) if (fData[idim][index0]!=point[idim]) isOK = kFALSE;
- if (isOK) index = index0;
+ Int_t stackNode[128];
+ Int_t currentIndex =0;
+ stackNode[0] = 0;
+ iter =0;
+ //
+ while (currentIndex>=0){
+ iter++;
+ Int_t inode = stackNode[currentIndex];
+ currentIndex--;
+ if (IsTerminal(inode)){
+ // investigate terminal node
+ Int_t indexIP = (inode >= fCrossNode) ? (inode-fCrossNode)*fBucketSize : (inode-fNNodes)*fBucketSize+fOffset;
+ printf("terminal %d indexP %d\n", inode, indexIP);
+ for (Int_t ibucket=0;ibucket<fBucketSize;ibucket++){
+ Bool_t isOK = kTRUE;
+ indexIP+=ibucket;
+ printf("ibucket %d index %d\n", ibucket, indexIP);
+ if (indexIP>=fNPoints) continue;
+ Int_t index0 = fIndPoints[indexIP];
+ for (Int_t idim=0;idim<fNDim;idim++) if (fData[idim][index0]!=point[idim]) isOK = kFALSE;
+ if (isOK) index = index0;
+ }
+ continue;
}
- continue;
- }
- if (point[fAxis[inode]]<=fValue[inode]){
- currentIndex++;
- stackNode[currentIndex]=(inode*2)+1;
- }
- if (point[fAxis[inode]]>=fValue[inode]){
- currentIndex++;
- stackNode[currentIndex]=(inode*2)+2;
+ if (point[fAxis[inode]]<=fValue[inode]){
+ currentIndex++;
+ stackNode[currentIndex]=(inode*2)+1;
+ }
+ if (point[fAxis[inode]]>=fValue[inode]){
+ currentIndex++;
+ stackNode[currentIndex]=(inode*2)+2;
}
}
//
diff --git a/math/mathcore/src/TRandom1.cxx b/math/mathcore/src/TRandom1.cxx
index a90080d4751..36ec70a0455 100644
--- a/math/mathcore/src/TRandom1.cxx
+++ b/math/mathcore/src/TRandom1.cxx
@@ -28,221 +28,221 @@ int TRandom1::fgNumEngines = 0;
int TRandom1::fgMaxIndex = 215;
#ifndef __CINT__
const UInt_t fgSeedTable[215][2] = {
- { 9876, 54321 },
- { 1299961164, 253987020 },
- { 669708517, 2079157264 },
- { 190904760, 417696270 },
- { 1289741558, 1376336092 },
- { 1803730167, 324952955 },
- { 489854550, 582847132 },
- { 1348037628, 1661577989 },
- { 350557787, 1155446919 },
- { 591502945, 634133404 },
- { 1901084678, 862916278 },
- { 1988640932, 1785523494 },
- { 1873836227, 508007031 },
- { 1146416592, 967585720 },
- { 1837193353, 1522927634 },
- { 38219936, 921609208 },
- { 349152748, 112892610 },
- { 744459040, 1735807920 },
- { 1983990104, 728277902 },
- { 309164507, 2126677523 },
- { 362993787, 1897782044 },
- { 556776976, 462072869 },
- { 1584900822, 2019394912 },
- { 1249892722, 791083656 },
- { 1686600998, 1983731097 },
- { 1127381380, 198976625 },
- { 1999420861, 1810452455 },
- { 1972906041, 664182577 },
- { 84636481, 1291886301 },
- { 1186362995, 954388413 },
- { 2141621785, 61738584 },
- { 1969581251, 1557880415 },
- { 1150606439, 136325185 },
- { 95187861, 1592224108 },
- { 940517655, 1629971798 },
- { 215350428, 922659102 },
- { 786161212, 1121345074 },
- { 1450830056, 1922787776 },
- { 1696578057, 2025150487 },
- { 1803414346, 1851324780 },
- { 1017898585, 1452594263 },
- { 1184497978, 82122239 },
- { 633338765, 1829684974 },
- { 430889421, 230039326 },
- { 492544653, 76320266 },
- { 389386975, 1314148944 },
- { 1720322786, 709120323 },
- { 1868768216, 1992898523 },
- { 443210610, 811117710 },
- { 1191938868, 1548484733 },
- { 616890172, 159787986 },
- { 935835339, 1231440405 },
- { 1058009367, 1527613300 },
- { 1463148129, 1970575097 },
- { 1795336935, 434768675 },
- { 274019517, 605098487 },
- { 483689317, 217146977 },
- { 2070804364, 340596558 },
- { 930226308, 1602100969 },
- { 989324440, 801809442 },
- { 410606853, 1893139948 },
- { 1583588576, 1219225407 },
- { 2102034391, 1394921405 },
- { 2005037790, 2031006861 },
- { 1244218766, 923231061 },
- { 49312790, 775496649 },
- { 721012176, 321339902 },
- { 1719909107, 1865748178 },
- { 1156177430, 1257110891 },
- { 307561322, 1918244397 },
- { 906041433, 360476981 },
- { 1591375755, 268492659 },
- { 461522398, 227343256 },
- { 2145930725, 2020665454 },
- { 1938419274, 1331283701 },
- { 174405412, 524140103 },
- { 494343653, 18063908 },
- { 1025534808, 181709577 },
- { 2048959776, 1913665637 },
- { 950636517, 794796256 },
- { 1828843197, 1335757744 },
- { 211109723, 983900607 },
- { 825474095, 1046009991 },
- { 374915657, 381856628 },
- { 1241296328, 698149463 },
- { 1260624655, 1024538273 },
- { 900676210, 1628865823 },
- { 697951025, 500570753 },
- { 1007920268, 1708398558 },
- { 264596520, 624727803 },
- { 1977924811, 674673241 },
- { 1440257718, 271184151 },
- { 1928778847, 993535203 },
- { 1307807366, 1801502463 },
- { 1498732610, 300876954 },
- { 1617712402, 1574250679 },
- { 1261800762, 1556667280 },
- { 949929273, 560721070 },
- { 1766170474, 1953522912 },
- { 1849939248, 19435166 },
- { 887262858, 1219627824 },
- { 483086133, 603728993 },
- { 1330541052, 1582596025 },
- { 1850591475, 723593133 },
- { 1431775678, 1558439000 },
- { 922493739, 1356554404 },
- { 1058517206, 948567762 },
- { 709067283, 1350890215 },
- { 1044787723, 2144304941 },
- { 999707003, 513837520 },
- { 2140038663, 1850568788 },
- { 1803100150, 127574047 },
- { 867445693, 1149173981 },
- { 408583729, 914837991 },
- { 1166715497, 602315845 },
- { 430738528, 1743308384 },
- { 1388022681, 1760110496 },
- { 1664028066, 654300326 },
- { 1767741172, 1338181197 },
- { 1625723550, 1742482745 },
- { 464486085, 1507852127 },
- { 754082421, 1187454014 },
- { 1315342834, 425995190 },
- { 960416608, 2004255418 },
- { 1262630671, 671761697 },
- { 59809238, 103525918 },
- { 1205644919, 2107823293 },
- { 1615183160, 1152411412 },
- { 1024474681, 2118672937 },
- { 1703877649, 1235091369 },
- { 1821417852, 1098463802 },
- { 1738806466, 1529062843 },
- { 620780646, 1654833544 },
- { 1070174101, 795158254 },
- { 658537995, 1693620426 },
- { 2055317555, 508053916 },
- { 1647371686, 1282395762 },
- { 29067379, 409683067 },
- { 1763495989, 1917939635 },
- { 1602690753, 810926582 },
- { 885787576, 513818500 },
- { 1853512561, 1195205756 },
- { 1798585498, 1970460256 },
- { 1819261032, 1306536501 },
- { 1133245275, 37901 },
- { 689459799, 1334389069 },
- { 1730609912, 1854586207 },
- { 1556832175, 1228729041 },
- { 251375753, 683687209 },
- { 2083946182, 1763106152 },
- { 2142981854, 1365385561 },
- { 763711891, 1735754548 },
- { 1581256466, 173689858 },
- { 2121337132, 1247108250 },
- { 1004003636, 891894307 },
- { 569816524, 358675254 },
- { 626626425, 116062841 },
- { 632086003, 861268491 },
- { 1008211580, 779404957 },
- { 1134217766, 1766838261 },
- { 1423829292, 1706666192 },
- { 942037869, 1549358884 },
- { 1959429535, 480779114 },
- { 778311037, 1940360875 },
- { 1531372185, 2009078158 },
- { 241935492, 1050047003 },
- { 272453504, 1870883868 },
- { 390441332, 1057903098 },
- { 1230238834, 1548117688 },
- { 1242956379, 1217296445 },
- { 515648357, 1675011378 },
- { 364477932, 355212934 },
- { 2096008713, 1570161804 },
- { 1409752526, 214033983 },
- { 1288158292, 1760636178 },
- { 407562666, 1265144848 },
- { 1071056491, 1582316946 },
- { 1014143949, 911406955 },
- { 203080461, 809380052 },
- { 125647866, 1705464126 },
- { 2015685843, 599230667 },
- { 1425476020, 668203729 },
- { 1673735652, 567931803 },
- { 1714199325, 181737617 },
- { 1389137652, 678147926 },
- { 288547803, 435433694 },
- { 200159281, 654399753 },
- { 1580828223, 1298308945 },
- { 1832286107, 169991953 },
- { 182557704, 1046541065 },
- { 1688025575, 1248944426 },
- { 1508287706, 1220577001 },
- { 36721212, 1377275347 },
- { 1968679856, 1675229747 },
- { 279109231, 1835333261 },
- { 1358617667, 1416978076 },
- { 740626186, 2103913602 },
- { 1882655908, 251341858 },
- { 648016670, 1459615287 },
- { 780255321, 154906988 },
- { 857296483, 203375965 },
- { 1631676846, 681204578 },
- { 1906971307, 1623728832 },
- { 1541899600, 1168449797 },
- { 1267051693, 1020078717 },
- { 1998673940, 1298394942 },
- { 1914117058, 1381290704 },
- { 426068513, 1381618498 },
- { 139365577, 1598767734 },
- { 2129910384, 952266588 },
- { 661788054, 19661356 },
- { 1104640222, 240506063 },
- { 356133630, 1676634527 },
- { 242242374, 1863206182 },
- { 957935844, 1490681416 }};
+ { 9876, 54321 },
+ { 1299961164, 253987020 },
+ { 669708517, 2079157264 },
+ { 190904760, 417696270 },
+ { 1289741558, 1376336092 },
+ { 1803730167, 324952955 },
+ { 489854550, 582847132 },
+ { 1348037628, 1661577989 },
+ { 350557787, 1155446919 },
+ { 591502945, 634133404 },
+ { 1901084678, 862916278 },
+ { 1988640932, 1785523494 },
+ { 1873836227, 508007031 },
+ { 1146416592, 967585720 },
+ { 1837193353, 1522927634 },
+ { 38219936, 921609208 },
+ { 349152748, 112892610 },
+ { 744459040, 1735807920 },
+ { 1983990104, 728277902 },
+ { 309164507, 2126677523 },
+ { 362993787, 1897782044 },
+ { 556776976, 462072869 },
+ { 1584900822, 2019394912 },
+ { 1249892722, 791083656 },
+ { 1686600998, 1983731097 },
+ { 1127381380, 198976625 },
+ { 1999420861, 1810452455 },
+ { 1972906041, 664182577 },
+ { 84636481, 1291886301 },
+ { 1186362995, 954388413 },
+ { 2141621785, 61738584 },
+ { 1969581251, 1557880415 },
+ { 1150606439, 136325185 },
+ { 95187861, 1592224108 },
+ { 940517655, 1629971798 },
+ { 215350428, 922659102 },
+ { 786161212, 1121345074 },
+ { 1450830056, 1922787776 },
+ { 1696578057, 2025150487 },
+ { 1803414346, 1851324780 },
+ { 1017898585, 1452594263 },
+ { 1184497978, 82122239 },
+ { 633338765, 1829684974 },
+ { 430889421, 230039326 },
+ { 492544653, 76320266 },
+ { 389386975, 1314148944 },
+ { 1720322786, 709120323 },
+ { 1868768216, 1992898523 },
+ { 443210610, 811117710 },
+ { 1191938868, 1548484733 },
+ { 616890172, 159787986 },
+ { 935835339, 1231440405 },
+ { 1058009367, 1527613300 },
+ { 1463148129, 1970575097 },
+ { 1795336935, 434768675 },
+ { 274019517, 605098487 },
+ { 483689317, 217146977 },
+ { 2070804364, 340596558 },
+ { 930226308, 1602100969 },
+ { 989324440, 801809442 },
+ { 410606853, 1893139948 },
+ { 1583588576, 1219225407 },
+ { 2102034391, 1394921405 },
+ { 2005037790, 2031006861 },
+ { 1244218766, 923231061 },
+ { 49312790, 775496649 },
+ { 721012176, 321339902 },
+ { 1719909107, 1865748178 },
+ { 1156177430, 1257110891 },
+ { 307561322, 1918244397 },
+ { 906041433, 360476981 },
+ { 1591375755, 268492659 },
+ { 461522398, 227343256 },
+ { 2145930725, 2020665454 },
+ { 1938419274, 1331283701 },
+ { 174405412, 524140103 },
+ { 494343653, 18063908 },
+ { 1025534808, 181709577 },
+ { 2048959776, 1913665637 },
+ { 950636517, 794796256 },
+ { 1828843197, 1335757744 },
+ { 211109723, 983900607 },
+ { 825474095, 1046009991 },
+ { 374915657, 381856628 },
+ { 1241296328, 698149463 },
+ { 1260624655, 1024538273 },
+ { 900676210, 1628865823 },
+ { 697951025, 500570753 },
+ { 1007920268, 1708398558 },
+ { 264596520, 624727803 },
+ { 1977924811, 674673241 },
+ { 1440257718, 271184151 },
+ { 1928778847, 993535203 },
+ { 1307807366, 1801502463 },
+ { 1498732610, 300876954 },
+ { 1617712402, 1574250679 },
+ { 1261800762, 1556667280 },
+ { 949929273, 560721070 },
+ { 1766170474, 1953522912 },
+ { 1849939248, 19435166 },
+ { 887262858, 1219627824 },
+ { 483086133, 603728993 },
+ { 1330541052, 1582596025 },
+ { 1850591475, 723593133 },
+ { 1431775678, 1558439000 },
+ { 922493739, 1356554404 },
+ { 1058517206, 948567762 },
+ { 709067283, 1350890215 },
+ { 1044787723, 2144304941 },
+ { 999707003, 513837520 },
+ { 2140038663, 1850568788 },
+ { 1803100150, 127574047 },
+ { 867445693, 1149173981 },
+ { 408583729, 914837991 },
+ { 1166715497, 602315845 },
+ { 430738528, 1743308384 },
+ { 1388022681, 1760110496 },
+ { 1664028066, 654300326 },
+ { 1767741172, 1338181197 },
+ { 1625723550, 1742482745 },
+ { 464486085, 1507852127 },
+ { 754082421, 1187454014 },
+ { 1315342834, 425995190 },
+ { 960416608, 2004255418 },
+ { 1262630671, 671761697 },
+ { 59809238, 103525918 },
+ { 1205644919, 2107823293 },
+ { 1615183160, 1152411412 },
+ { 1024474681, 2118672937 },
+ { 1703877649, 1235091369 },
+ { 1821417852, 1098463802 },
+ { 1738806466, 1529062843 },
+ { 620780646, 1654833544 },
+ { 1070174101, 795158254 },
+ { 658537995, 1693620426 },
+ { 2055317555, 508053916 },
+ { 1647371686, 1282395762 },
+ { 29067379, 409683067 },
+ { 1763495989, 1917939635 },
+ { 1602690753, 810926582 },
+ { 885787576, 513818500 },
+ { 1853512561, 1195205756 },
+ { 1798585498, 1970460256 },
+ { 1819261032, 1306536501 },
+ { 1133245275, 37901 },
+ { 689459799, 1334389069 },
+ { 1730609912, 1854586207 },
+ { 1556832175, 1228729041 },
+ { 251375753, 683687209 },
+ { 2083946182, 1763106152 },
+ { 2142981854, 1365385561 },
+ { 763711891, 1735754548 },
+ { 1581256466, 173689858 },
+ { 2121337132, 1247108250 },
+ { 1004003636, 891894307 },
+ { 569816524, 358675254 },
+ { 626626425, 116062841 },
+ { 632086003, 861268491 },
+ { 1008211580, 779404957 },
+ { 1134217766, 1766838261 },
+ { 1423829292, 1706666192 },
+ { 942037869, 1549358884 },
+ { 1959429535, 480779114 },
+ { 778311037, 1940360875 },
+ { 1531372185, 2009078158 },
+ { 241935492, 1050047003 },
+ { 272453504, 1870883868 },
+ { 390441332, 1057903098 },
+ { 1230238834, 1548117688 },
+ { 1242956379, 1217296445 },
+ { 515648357, 1675011378 },
+ { 364477932, 355212934 },
+ { 2096008713, 1570161804 },
+ { 1409752526, 214033983 },
+ { 1288158292, 1760636178 },
+ { 407562666, 1265144848 },
+ { 1071056491, 1582316946 },
+ { 1014143949, 911406955 },
+ { 203080461, 809380052 },
+ { 125647866, 1705464126 },
+ { 2015685843, 599230667 },
+ { 1425476020, 668203729 },
+ { 1673735652, 567931803 },
+ { 1714199325, 181737617 },
+ { 1389137652, 678147926 },
+ { 288547803, 435433694 },
+ { 200159281, 654399753 },
+ { 1580828223, 1298308945 },
+ { 1832286107, 169991953 },
+ { 182557704, 1046541065 },
+ { 1688025575, 1248944426 },
+ { 1508287706, 1220577001 },
+ { 36721212, 1377275347 },
+ { 1968679856, 1675229747 },
+ { 279109231, 1835333261 },
+ { 1358617667, 1416978076 },
+ { 740626186, 2103913602 },
+ { 1882655908, 251341858 },
+ { 648016670, 1459615287 },
+ { 780255321, 154906988 },
+ { 857296483, 203375965 },
+ { 1631676846, 681204578 },
+ { 1906971307, 1623728832 },
+ { 1541899600, 1168449797 },
+ { 1267051693, 1020078717 },
+ { 1998673940, 1298394942 },
+ { 1914117058, 1381290704 },
+ { 426068513, 1381618498 },
+ { 139365577, 1598767734 },
+ { 2129910384, 952266588 },
+ { 661788054, 19661356 },
+ { 1104640222, 240506063 },
+ { 356133630, 1676634527 },
+ { 242242374, 1863206182 },
+ { 957935844, 1490681416 }};
#endif
ClassImp(TRandom1)
diff --git a/math/mathcore/test/kDTreeTest.cxx b/math/mathcore/test/kDTreeTest.cxx
index fb538c82e79..8f52ca94933 100644
--- a/math/mathcore/test/kDTreeTest.cxx
+++ b/math/mathcore/test/kDTreeTest.cxx
@@ -70,7 +70,7 @@ void TestBuild(const Int_t npoints, const Int_t bsize){
Float_t end = Mem();
printf("Memory leak %f KB\n", end-before);
delete[] data0;
- return;
+ return;
}
//______________________________________________________________________
@@ -322,32 +322,32 @@ void TestkdtreeIF(Int_t npoints, Int_t bsize, Int_t nloop, Int_t mode)
Int_t nfound = 0;
for (Int_t kloop = 0;kloop<nloop;kloop++){
if (kloop==0){
- counteriter = 0;
- counterfound= 0;
- countern = 0;
+ counteriter = 0;
+ counterfound= 0;
+ countern = 0;
}
for (Int_t i=0;i<npoints;i++){
- Float_t point[2]={data[0][i],data[1][i]};
- Float_t delta[2]={drangey,drangez};
- Int_t iter =0;
- nfound =0;
- Int_t bnode =0;
- //kdtree->FindBNode(point,delta, bnode);
- //continue;
- kdtree->FindInRangeA(point,delta,res,nfound,iter,bnode);
- if (kloop==0){
- //Bool_t isOK = kTRUE;
- Bool_t isOK = kFALSE;
- for (Int_t ipoint=0;ipoint<nfound;ipoint++)
- if (res[ipoint]==i) isOK =kTRUE;
- counteriter+=iter;
- counterfound+=nfound;
- if (isOK) {
- countern++;
- }else{
- printf("Bug\n");
- }
- }
+ Float_t point[2]={data[0][i],data[1][i]};
+ Float_t delta[2]={drangey,drangez};
+ Int_t iter =0;
+ nfound =0;
+ Int_t bnode =0;
+ //kdtree->FindBNode(point,delta, bnode);
+ //continue;
+ kdtree->FindInRangeA(point,delta,res,nfound,iter,bnode);
+ if (kloop==0){
+ //Bool_t isOK = kTRUE;
+ Bool_t isOK = kFALSE;
+ for (Int_t ipoint=0;ipoint<nfound;ipoint++)
+ if (res[ipoint]==i) isOK =kTRUE;
+ counteriter+=iter;
+ counterfound+=nfound;
+ if (isOK) {
+ countern++;
+ }else{
+ printf("Bug\n");
+ }
+ }
}
}
diff --git a/math/mathcore/test/newKDTreeTest.cxx b/math/mathcore/test/newKDTreeTest.cxx
index 32176ee9bc8..e7312464e8d 100644
--- a/math/mathcore/test/newKDTreeTest.cxx
+++ b/math/mathcore/test/newKDTreeTest.cxx
@@ -1,7 +1,7 @@
// @(#)root/mathcore:$Id$
-// Author: C. Gumpert 09/2011
+// Author: C. Gumpert 09/2011
-// program to test new KDTree class
+// program to test new KDTree class
#include <time.h>
// STL include(s)
@@ -17,387 +17,387 @@
template<class _DataPoint>
void CreatePseudoData(const unsigned long int nPoints,std::vector<const _DataPoint*>& vDataPoints)
{
- _DataPoint* pData = 0;
- for(unsigned long int i = 0; i < nPoints; ++i)
- {
- pData = new _DataPoint();
- for(unsigned int k = 0; k < _DataPoint::Dimension(); ++k)
+ _DataPoint* pData = 0;
+ for(unsigned long int i = 0; i < nPoints; ++i)
+ {
+ pData = new _DataPoint();
+ for(unsigned int k = 0; k < _DataPoint::Dimension(); ++k)
pData->SetCoordinate(k,rand() % 1000);
- pData->SetWeight(rand() % 1000);
- vDataPoints.push_back(pData);
- }
+ pData->SetWeight(rand() % 1000);
+ vDataPoints.push_back(pData);
+ }
}
template<class _DataPoint>
void DeletePseudoData(std::vector<const _DataPoint*>& vDataPoints)
{
- for(typename std::vector<const _DataPoint*>::iterator it = vDataPoints.begin();
- it != vDataPoints.end(); ++it)
- delete *it;
+ for(typename std::vector<const _DataPoint*>::iterator it = vDataPoints.begin();
+ it != vDataPoints.end(); ++it)
+ delete *it;
- vDataPoints.clear();
+ vDataPoints.clear();
}
template<class _DataPoint>
ROOT::Math::KDTree<_DataPoint>* BuildTree(const std::vector<const _DataPoint*>& vDataPoints,const unsigned int iBucketSize)
{
- ROOT::Math::KDTree<_DataPoint>* pTree = 0;
- try
- {
- pTree = new ROOT::Math::KDTree<_DataPoint>(iBucketSize);
- //pTree->SetSplitOption(TKDTree<_DataPoint>::kBinContent);
-
- for(typename std::vector<const _DataPoint*>::const_iterator it = vDataPoints.begin(); it != vDataPoints.end(); ++it)
- pTree->Insert(**it);
- }
- catch (std::exception& e)
- {
- std::cerr << "exception caught: " << e.what() << std::endl;
- if(pTree)
+ ROOT::Math::KDTree<_DataPoint>* pTree = 0;
+ try
+ {
+ pTree = new ROOT::Math::KDTree<_DataPoint>(iBucketSize);
+ //pTree->SetSplitOption(TKDTree<_DataPoint>::kBinContent);
+
+ for(typename std::vector<const _DataPoint*>::const_iterator it = vDataPoints.begin(); it != vDataPoints.end(); ++it)
+ pTree->Insert(**it);
+ }
+ catch (std::exception& e)
+ {
+ std::cerr << "exception caught: " << e.what() << std::endl;
+ if(pTree)
delete pTree;
- pTree = 0;
- }
+ pTree = 0;
+ }
- return pTree;
+ return pTree;
}
template<class _DataPoint>
bool CheckBasicTreeProperties(const ROOT::Math::KDTree<_DataPoint>* pTree,const std::vector<const _DataPoint*>& vDataPoints)
{
- if(pTree->GetEntries() != vDataPoints.size())
- {
- std::cout << " --> wrong number of data points in tree: " << pTree->GetEntries() << " != " << vDataPoints.size() << std::endl;
- return false;
- }
-
- double fSumw = 0;
- double fSumw2 = 0;
- for(typename std::vector<const _DataPoint*>::const_iterator it = vDataPoints.begin();
- it != vDataPoints.end(); ++it)
- {
- fSumw += (*it)->GetWeight();
- fSumw2 += pow((*it)->GetWeight(),2);
- }
-
- if(fabs(pTree->GetTotalSumw2() - fSumw2)/fSumw2 > 1e-4)
- {
- std::cout << " --> inconsistent Sum weights^2 in tree: " << pTree->GetTotalSumw2() << " != " << fSumw2 << std::endl;
- return false;
- }
-
- if(fabs(pTree->GetTotalSumw() - fSumw)/fSumw > 1e-4)
- {
- std::cout << " --> inconsistent Sum weights in tree: " << pTree->GetTotalSumw() << " != " << fSumw << std::endl;
- return false;
- }
-
- if(fabs(pTree->GetEffectiveEntries() - pow(fSumw,2)/fSumw2)/(pow(fSumw,2)/fSumw2) > 1e-4)
- {
- std::cout << " --> inconsistent effective entries in tree: " << pTree->GetEffectiveEntries() << " != " << pow(fSumw,2)/fSumw2 << std::endl;
- return false;
- }
-
- return true;
+ if(pTree->GetEntries() != vDataPoints.size())
+ {
+ std::cout << " --> wrong number of data points in tree: " << pTree->GetEntries() << " != " << vDataPoints.size() << std::endl;
+ return false;
+ }
+
+ double fSumw = 0;
+ double fSumw2 = 0;
+ for(typename std::vector<const _DataPoint*>::const_iterator it = vDataPoints.begin();
+ it != vDataPoints.end(); ++it)
+ {
+ fSumw += (*it)->GetWeight();
+ fSumw2 += pow((*it)->GetWeight(),2);
+ }
+
+ if(fabs(pTree->GetTotalSumw2() - fSumw2)/fSumw2 > 1e-4)
+ {
+ std::cout << " --> inconsistent Sum weights^2 in tree: " << pTree->GetTotalSumw2() << " != " << fSumw2 << std::endl;
+ return false;
+ }
+
+ if(fabs(pTree->GetTotalSumw() - fSumw)/fSumw > 1e-4)
+ {
+ std::cout << " --> inconsistent Sum weights in tree: " << pTree->GetTotalSumw() << " != " << fSumw << std::endl;
+ return false;
+ }
+
+ if(fabs(pTree->GetEffectiveEntries() - pow(fSumw,2)/fSumw2)/(pow(fSumw,2)/fSumw2) > 1e-4)
+ {
+ std::cout << " --> inconsistent effective entries in tree: " << pTree->GetEffectiveEntries() << " != " << pow(fSumw,2)/fSumw2 << std::endl;
+ return false;
+ }
+
+ return true;
}
template<class _DataPoint>
bool CheckBinBoundaries(const ROOT::Math::KDTree<_DataPoint>* pTree)
-{
- typedef std::pair<typename _DataPoint::value_type,typename _DataPoint::value_type> tBoundary;
-
- std::cout << " --> checking " << pTree->GetNBins() << " bins" << std::endl;
-
- unsigned int iBin = 0;
- for(typename ROOT::Math::KDTree<_DataPoint>::iterator it = pTree->First(); it != pTree->End(); ++it,++iBin)
- {
- const std::vector<const _DataPoint*> vDataPoints = it.TN()->GetPoints();
- assert(vDataPoints.size() == it->GetEntries());
-
- std::vector<tBoundary> vBoundaries = it->GetBoundaries();
- assert(_DataPoint::Dimension() == vBoundaries.size());
-
- // check whether all points in this bin are inside the boundaries
- for(typename std::vector<const _DataPoint*>::const_iterator pit = vDataPoints.begin();
- pit != vDataPoints.end(); ++pit)
- {
- for(unsigned int k = 0; k < _DataPoint::Dimension(); ++k)
+{
+ typedef std::pair<typename _DataPoint::value_type,typename _DataPoint::value_type> tBoundary;
+
+ std::cout << " --> checking " << pTree->GetNBins() << " bins" << std::endl;
+
+ unsigned int iBin = 0;
+ for(typename ROOT::Math::KDTree<_DataPoint>::iterator it = pTree->First(); it != pTree->End(); ++it,++iBin)
+ {
+ const std::vector<const _DataPoint*> vDataPoints = it.TN()->GetPoints();
+ assert(vDataPoints.size() == it->GetEntries());
+
+ std::vector<tBoundary> vBoundaries = it->GetBoundaries();
+ assert(_DataPoint::Dimension() == vBoundaries.size());
+
+ // check whether all points in this bin are inside the boundaries
+ for(typename std::vector<const _DataPoint*>::const_iterator pit = vDataPoints.begin();
+ pit != vDataPoints.end(); ++pit)
{
- if(((*pit)->GetCoordinate(k) < vBoundaries.at(k).first) || ((*pit)->GetCoordinate(k) > vBoundaries.at(k).second))
- {
- std::cout << " --> boundaries of bin " << iBin << " in " << k << ". dimension are inconsistent with data point in bucket" << std::endl;
- return false;
- }
+ for(unsigned int k = 0; k < _DataPoint::Dimension(); ++k)
+ {
+ if(((*pit)->GetCoordinate(k) < vBoundaries.at(k).first) || ((*pit)->GetCoordinate(k) > vBoundaries.at(k).second))
+ {
+ std::cout << " --> boundaries of bin " << iBin << " in " << k << ". dimension are inconsistent with data point in bucket" << std::endl;
+ return false;
+ }
+ }
}
- }
- }
+ }
- return true;
+ return true;
}
template<class _DataPoint>
bool CheckEffectiveBinEntries(const ROOT::Math::KDTree<_DataPoint>* pTree)
{
- for(typename ROOT::Math::KDTree<_DataPoint>::iterator it = pTree->First(); it != pTree->End(); ++it)
- {
- if(it->GetEffectiveEntries() > 2*pTree->GetBucketSize())
- {
- std::cout << " --> found bin with " << it->GetEffectiveEntries() << " while the bucketsize is " << pTree->GetBucketSize() << std::endl;
- return false;
- }
- }
+ for(typename ROOT::Math::KDTree<_DataPoint>::iterator it = pTree->First(); it != pTree->End(); ++it)
+ {
+ if(it->GetEffectiveEntries() > 2*pTree->GetBucketSize())
+ {
+ std::cout << " --> found bin with " << it->GetEffectiveEntries() << " while the bucketsize is " << pTree->GetBucketSize() << std::endl;
+ return false;
+ }
+ }
- return true;
+ return true;
}
template<class _DataPoint>
bool CheckFindBin(const ROOT::Math::KDTree<_DataPoint>* pTree)
{
- typedef std::pair<typename _DataPoint::value_type,typename _DataPoint::value_type> tBoundary;
-
- _DataPoint test;
- std::cout << " --> test reference point at (";
- for(unsigned int k = 0; k < _DataPoint::Dimension(); ++k)
- {
- test.SetCoordinate(k,rand() % 1000);
- std::cout << test.GetCoordinate(k);
- if(k < _DataPoint::Dimension()-1)
+ typedef std::pair<typename _DataPoint::value_type,typename _DataPoint::value_type> tBoundary;
+
+ _DataPoint test;
+ std::cout << " --> test reference point at (";
+ for(unsigned int k = 0; k < _DataPoint::Dimension(); ++k)
+ {
+ test.SetCoordinate(k,rand() % 1000);
+ std::cout << test.GetCoordinate(k);
+ if(k < _DataPoint::Dimension()-1)
std::cout << ",";
- }
- std::cout << ")" << std::endl;
+ }
+ std::cout << ")" << std::endl;
- const typename ROOT::Math::KDTree<_DataPoint>::Bin* bin = pTree->FindBin(test);
+ const typename ROOT::Math::KDTree<_DataPoint>::Bin* bin = pTree->FindBin(test);
- // check whether test point is actually inside the bin boundaries
- // is not necessarily the case if the point as the range of the bin which is NOT determined by a splitting but by the minimum coordinate of points inside the bin
- std::vector<tBoundary> vBoundaries = bin->GetBoundaries();
- assert(_DataPoint::Dimension() == vBoundaries.size());
+ // check whether test point is actually inside the bin boundaries
+ // is not necessarily the case if the point as the range of the bin which is NOT determined by a splitting but by the minimum coordinate of points inside the bin
+ std::vector<tBoundary> vBoundaries = bin->GetBoundaries();
+ assert(_DataPoint::Dimension() == vBoundaries.size());
- for(unsigned int k = 0; k < _DataPoint::Dimension(); ++k)
- {
- if((test.GetCoordinate(k) < vBoundaries.at(k).first) || (test.GetCoordinate(k) > vBoundaries.at(k).second))
- {
- if(pTree->IsFrozen() && bin)
+ for(unsigned int k = 0; k < _DataPoint::Dimension(); ++k)
+ {
+ if((test.GetCoordinate(k) < vBoundaries.at(k).first) || (test.GetCoordinate(k) > vBoundaries.at(k).second))
{
- std::cout << " --> " << test.GetCoordinate(k) << " is not within (" << vBoundaries.at(k).first << "," << vBoundaries.at(k).second << ")" << std::endl;
- return false;
+ if(pTree->IsFrozen() && bin)
+ {
+ std::cout << " --> " << test.GetCoordinate(k) << " is not within (" << vBoundaries.at(k).first << "," << vBoundaries.at(k).second << ")" << std::endl;
+ return false;
+ }
}
- }
- }
+ }
- return true;
+ return true;
}
template<class _DataPoint>
bool CheckNearestNeighborSearches(const ROOT::Math::KDTree<_DataPoint>* pTree,const std::vector<const _DataPoint*>& vDataPoints)
-{
- _DataPoint test;
- std::cout << " --> test with reference point at (";
- for(unsigned int k = 0; k < _DataPoint::Dimension(); ++k)
- {
- test.SetCoordinate(k,rand() % 1000);
- std::cout << test.GetCoordinate(k);
- if(k < _DataPoint::Dimension()-1)
+{
+ _DataPoint test;
+ std::cout << " --> test with reference point at (";
+ for(unsigned int k = 0; k < _DataPoint::Dimension(); ++k)
+ {
+ test.SetCoordinate(k,rand() % 1000);
+ std::cout << test.GetCoordinate(k);
+ if(k < _DataPoint::Dimension()-1)
std::cout << ",";
- }
- std::cout << ")" << std::endl;
-
- std::vector<const _DataPoint*> vFoundPoints;
- std::vector<const _DataPoint*> vFoundPointsCheck;
-
- double fDist = rand() % 500;
- std::cout << " --> look for points within in distance of " << fDist << std::endl;
- pTree->GetPointsWithinDist(test,fDist,vFoundPoints);
-
- // get points by hand
- for(typename std::vector<const _DataPoint*>::const_iterator it = vDataPoints.begin();
- it != vDataPoints.end(); ++it)
- {
- if((*it)->Distance(test) <= fDist)
- {
- vFoundPointsCheck.push_back(*it);
- // check whether this point was also found by the algorithm
- bool bChecked = false;
- for(unsigned int i = 0; i < vFoundPoints.size(); ++i)
- {
- if(vFoundPoints.at(i) == *it)
- {
- bChecked = true;
- break;
- }
- }
+ }
+ std::cout << ")" << std::endl;
- if(!bChecked)
+ std::vector<const _DataPoint*> vFoundPoints;
+ std::vector<const _DataPoint*> vFoundPointsCheck;
+
+ double fDist = rand() % 500;
+ std::cout << " --> look for points within in distance of " << fDist << std::endl;
+ pTree->GetPointsWithinDist(test,fDist,vFoundPoints);
+
+ // get points by hand
+ for(typename std::vector<const _DataPoint*>::const_iterator it = vDataPoints.begin();
+ it != vDataPoints.end(); ++it)
+ {
+ if((*it)->Distance(test) <= fDist)
{
- std::cout << " --> point (";
- for(unsigned int k = 0; k < _DataPoint::Dimension(); ++k)
- {
- std::cout << (*it)->GetCoordinate(k);
- if(k < _DataPoint::Dimension()-1)
- std::cout << ",";
- }
- std::cout << ") was not found by the algorithm while its distance to the reference point is " << (*it)->Distance(test) << std::endl;
-
- return false;
+ vFoundPointsCheck.push_back(*it);
+ // check whether this point was also found by the algorithm
+ bool bChecked = false;
+ for(unsigned int i = 0; i < vFoundPoints.size(); ++i)
+ {
+ if(vFoundPoints.at(i) == *it)
+ {
+ bChecked = true;
+ break;
+ }
+ }
+
+ if(!bChecked)
+ {
+ std::cout << " --> point (";
+ for(unsigned int k = 0; k < _DataPoint::Dimension(); ++k)
+ {
+ std::cout << (*it)->GetCoordinate(k);
+ if(k < _DataPoint::Dimension()-1)
+ std::cout << ",";
+ }
+ std::cout << ") was not found by the algorithm while its distance to the reference point is " << (*it)->Distance(test) << std::endl;
+
+ return false;
+ }
}
- }
- }
-
- if(vFoundPointsCheck.size() != vFoundPoints.size())
- {
- std::cout << " --> GetPointsWithinDist returns wrong number of found points (" << vFoundPointsCheck.size() << " expected/ " << vFoundPoints.size() << " found)" << std::endl;
- return false;
- }
-
- const int nNeighbors = (int)(rand() % 100/1000.0 * pTree->GetEntries() + 1);
- std::cout << " --> look for " << nNeighbors << " nearest neighbors" << std::endl;
-
- std::vector<std::pair<const _DataPoint*,double> > vFoundNeighbors;
- std::vector<std::pair<const _DataPoint*,double> > vFoundNeighborsCheck;
- typename std::vector<std::pair<const _DataPoint*,double> >::iterator nit;
-
- pTree->GetClosestPoints(test,nNeighbors,vFoundNeighbors);
- fDist = vFoundNeighbors.back().second;
-
- // check closest points manually
- for(typename std::vector<const _DataPoint*>::const_iterator it = vDataPoints.begin();
- it != vDataPoints.end(); ++it)
- {
- if((*it)->Distance(test) <= fDist)
+ }
+
+ if(vFoundPointsCheck.size() != vFoundPoints.size())
+ {
+ std::cout << " --> GetPointsWithinDist returns wrong number of found points (" << vFoundPointsCheck.size() << " expected/ " << vFoundPoints.size() << " found)" << std::endl;
+ return false;
+ }
+
+ const int nNeighbors = (int)(rand() % 100/1000.0 * pTree->GetEntries() + 1);
+ std::cout << " --> look for " << nNeighbors << " nearest neighbors" << std::endl;
+
+ std::vector<std::pair<const _DataPoint*,double> > vFoundNeighbors;
+ std::vector<std::pair<const _DataPoint*,double> > vFoundNeighborsCheck;
+ typename std::vector<std::pair<const _DataPoint*,double> >::iterator nit;
+
+ pTree->GetClosestPoints(test,nNeighbors,vFoundNeighbors);
+ fDist = vFoundNeighbors.back().second;
+
+ // check closest points manually
+ for(typename std::vector<const _DataPoint*>::const_iterator it = vDataPoints.begin();
+ it != vDataPoints.end(); ++it)
+ {
+ if((*it)->Distance(test) <= fDist)
vFoundNeighborsCheck.push_back(std::make_pair(*it,(*it)->Distance(test)));
- }
-
- // vFoundNeighborsCheck can have more data points because there might be more points with the same (maximal) distance
- if(vFoundNeighborsCheck.size() < vFoundNeighbors.size())
- {
- std::cout << " --> GetClosestPoints returns wrong number of found points (" << vFoundNeighborsCheck.size() << " expected/ " << vFoundNeighbors.size() << " found)" << std::endl;
- return false;
- }
-
- //check whether all points found by the algorithm are also found manually
- bool bChecked = false;
- for(unsigned int i = 0; i < vFoundNeighbors.size(); ++i)
- {
- bChecked = false;
- for(unsigned int j = 0; j < vFoundNeighborsCheck.size(); ++j)
- {
- if(vFoundNeighbors.at(i).first == vFoundNeighborsCheck.at(j).first)
+ }
+
+ // vFoundNeighborsCheck can have more data points because there might be more points with the same (maximal) distance
+ if(vFoundNeighborsCheck.size() < vFoundNeighbors.size())
+ {
+ std::cout << " --> GetClosestPoints returns wrong number of found points (" << vFoundNeighborsCheck.size() << " expected/ " << vFoundNeighbors.size() << " found)" << std::endl;
+ return false;
+ }
+
+ //check whether all points found by the algorithm are also found manually
+ bool bChecked = false;
+ for(unsigned int i = 0; i < vFoundNeighbors.size(); ++i)
+ {
+ bChecked = false;
+ for(unsigned int j = 0; j < vFoundNeighborsCheck.size(); ++j)
{
- if(fabs(vFoundNeighbors.at(i).second - vFoundNeighborsCheck.at(j).second)/vFoundNeighbors.at(i).second < 1e-2)
- bChecked = true;
+ if(vFoundNeighbors.at(i).first == vFoundNeighborsCheck.at(j).first)
+ {
+ if(fabs(vFoundNeighbors.at(i).second - vFoundNeighborsCheck.at(j).second)/vFoundNeighbors.at(i).second < 1e-2)
+ bChecked = true;
- break;
+ break;
+ }
}
- }
- if(!bChecked)
+ if(!bChecked)
return false;
- }
-
- return true;
+ }
+
+ return true;
}
template<class _DataPoint>
bool CheckTreeClear(ROOT::Math::KDTree<_DataPoint>* pTree,const std::vector<const _DataPoint*>& vDataPoints)
{
- pTree->Reset();
- if(pTree->GetEntries() != 0)
- {
- std::cout << " --> tree contains still " << pTree->GetEntries() << " data points after calling Clear()" << std::endl;
- return false;
- }
- if(pTree->GetNBins() != 1)
- {
- std::cout << " --> tree contains more than one bin after calling Clear()" << std::endl;
- return false;
- }
- if(pTree->GetEffectiveEntries() != 0)
- {
- std::cout << " --> tree contains still " << pTree->GetEffectiveEntries() << " effective entries after calling Clear()" << std::endl;
- return false;
- }
-
- // try to fill tree again
- try
- {
- for(typename std::vector<const _DataPoint*>::const_iterator it = vDataPoints.begin(); it != vDataPoints.end(); ++it)
- pTree->Insert(**it);
- }
- catch (std::exception& e)
- {
- std::cout << " --> unable to fill tree after calling Clear()" << std::endl;
- std::cerr << "exception caught: " << e.what() << std::endl;
-
- return false;
- }
-
- return true;
+ pTree->Reset();
+ if(pTree->GetEntries() != 0)
+ {
+ std::cout << " --> tree contains still " << pTree->GetEntries() << " data points after calling Clear()" << std::endl;
+ return false;
+ }
+ if(pTree->GetNBins() != 1)
+ {
+ std::cout << " --> tree contains more than one bin after calling Clear()" << std::endl;
+ return false;
+ }
+ if(pTree->GetEffectiveEntries() != 0)
+ {
+ std::cout << " --> tree contains still " << pTree->GetEffectiveEntries() << " effective entries after calling Clear()" << std::endl;
+ return false;
+ }
+
+ // try to fill tree again
+ try
+ {
+ for(typename std::vector<const _DataPoint*>::const_iterator it = vDataPoints.begin(); it != vDataPoints.end(); ++it)
+ pTree->Insert(**it);
+ }
+ catch (std::exception& e)
+ {
+ std::cout << " --> unable to fill tree after calling Clear()" << std::endl;
+ std::cerr << "exception caught: " << e.what() << std::endl;
+
+ return false;
+ }
+
+ return true;
}
int main()
{
- std::cout << "\nunit test for class KDTree" << std::endl;
- std::cout << "==========================\n" << std::endl;
-
- int iSeed = time(0);
- std::cout << "using random seed: " << iSeed << std::endl;
-
- srand(iSeed);
-
- const unsigned long int NPOINTS = 1e5;
- const unsigned int BUCKETSIZE = 1e2;
- const unsigned int DIM = 5;
-
- typedef ROOT::Math::TDataPoint<DIM> DP;
-
- std::cout << "using " << NPOINTS << " data points in " << DIM << " dimensions" << std::endl;
- std::cout << "bucket size: " << BUCKETSIZE << std::endl;
-
- std::vector<const DP*> vDataPoints;
- CreatePseudoData(NPOINTS,vDataPoints);
-
- ROOT::Math::KDTree<DP>* pTree = BuildTree(vDataPoints,BUCKETSIZE);
-
- if(CheckBasicTreeProperties(pTree,vDataPoints))
- std::cerr << "basic tree properties...DONE" << std::endl;
- else
- std::cerr << "basic tree properties...FAILED" << std::endl;
-
- if(CheckBinBoundaries(pTree))
- std::cerr << "consistency check of bin boundaries...DONE" << std::endl;
- else
- std::cerr << "consistency check of bin boundaries...FAILED" << std::endl;
-
- if(CheckEffectiveBinEntries(pTree))
- std::cerr << "check effective entries per bin...DONE" << std::endl;
- else
- std::cerr << "check effective entries per bin...FAILED" << std::endl;
-
- if(CheckFindBin(pTree))
- std::cerr << "check FindBin...DONE" << std::endl;
- else
- std::cerr << "check FindBin...FAILED" << std::endl;
-
- if(CheckNearestNeighborSearches(pTree,vDataPoints))
- std::cerr << "check nearest neighbor searches...DONE" << std::endl;
- else
- std::cerr << "check nearest neighbor searches...FAILED" << std::endl;
-
- if(CheckTreeClear(pTree,vDataPoints))
- std::cerr << "check KDTree::Clear...DONE" << std::endl;
- else
- std::cerr << "check KDTree:Clear...FAILED" << std::endl;
-
- //pTree->Print();
- pTree->Freeze();
- //pTree->Print();
- ROOT::Math::KDTree<DP>* pCopy = pTree->GetFrozenCopy();
- //pCopy->Print();
-
- delete pCopy;
- delete pTree;
-
- DeletePseudoData(vDataPoints);
-
- return 0;
+ std::cout << "\nunit test for class KDTree" << std::endl;
+ std::cout << "==========================\n" << std::endl;
+
+ int iSeed = time(0);
+ std::cout << "using random seed: " << iSeed << std::endl;
+
+ srand(iSeed);
+
+ const unsigned long int NPOINTS = 1e5;
+ const unsigned int BUCKETSIZE = 1e2;
+ const unsigned int DIM = 5;
+
+ typedef ROOT::Math::TDataPoint<DIM> DP;
+
+ std::cout << "using " << NPOINTS << " data points in " << DIM << " dimensions" << std::endl;
+ std::cout << "bucket size: " << BUCKETSIZE << std::endl;
+
+ std::vector<const DP*> vDataPoints;
+ CreatePseudoData(NPOINTS,vDataPoints);
+
+ ROOT::Math::KDTree<DP>* pTree = BuildTree(vDataPoints,BUCKETSIZE);
+
+ if(CheckBasicTreeProperties(pTree,vDataPoints))
+ std::cerr << "basic tree properties...DONE" << std::endl;
+ else
+ std::cerr << "basic tree properties...FAILED" << std::endl;
+
+ if(CheckBinBoundaries(pTree))
+ std::cerr << "consistency check of bin boundaries...DONE" << std::endl;
+ else
+ std::cerr << "consistency check of bin boundaries...FAILED" << std::endl;
+
+ if(CheckEffectiveBinEntries(pTree))
+ std::cerr << "check effective entries per bin...DONE" << std::endl;
+ else
+ std::cerr << "check effective entries per bin...FAILED" << std::endl;
+
+ if(CheckFindBin(pTree))
+ std::cerr << "check FindBin...DONE" << std::endl;
+ else
+ std::cerr << "check FindBin...FAILED" << std::endl;
+
+ if(CheckNearestNeighborSearches(pTree,vDataPoints))
+ std::cerr << "check nearest neighbor searches...DONE" << std::endl;
+ else
+ std::cerr << "check nearest neighbor searches...FAILED" << std::endl;
+
+ if(CheckTreeClear(pTree,vDataPoints))
+ std::cerr << "check KDTree::Clear...DONE" << std::endl;
+ else
+ std::cerr << "check KDTree:Clear...FAILED" << std::endl;
+
+ //pTree->Print();
+ pTree->Freeze();
+ //pTree->Print();
+ ROOT::Math::KDTree<DP>* pCopy = pTree->GetFrozenCopy();
+ //pCopy->Print();
+
+ delete pCopy;
+ delete pTree;
+
+ DeletePseudoData(vDataPoints);
+
+ return 0;
}
diff --git a/math/mathcore/test/testTMath.cxx b/math/mathcore/test/testTMath.cxx
index db18dd6cb58..2c02afa8bdd 100644
--- a/math/mathcore/test/testTMath.cxx
+++ b/math/mathcore/test/testTMath.cxx
@@ -30,9 +30,9 @@ void testNormCross()
TMath::NormCross(fv1,fv2,fout);
cout << "NormCross(const " << type << " v1[3],const "
- << type << " v2[3]," << type << " out[3]): out = ["
- << fout[0] << ", " << fout[1] << ", " << fout[2] << "]"
- << endl;
+ << type << " v2[3]," << type << " out[3]): out = ["
+ << fout[0] << ", " << fout[1] << ", " << fout[2] << "]"
+ << endl;
}
diff --git a/math/mathmore/inc/Math/GSLIntegrator.h b/math/mathmore/inc/Math/GSLIntegrator.h
index 59629dd1931..514f2706aee 100644
--- a/math/mathmore/inc/Math/GSLIntegrator.h
+++ b/math/mathmore/inc/Math/GSLIntegrator.h
@@ -208,7 +208,7 @@ namespace Math {
double Integral(const IGenFunction & f);
/**
- evaluate the Cauchy principal value of the integral of a previously defined function f over
+ evaluate the Cauchy principal value of the integral of a previously defined function f over
the defined interval (a,b) with a singularity at c
@param a lower interval value
@param b lower interval value
@@ -217,7 +217,7 @@ namespace Math {
double IntegralCauchy(double a, double b, double c);
/**
- evaluate the Cauchy principal value of the integral of a function f over the defined interval (a,b)
+ evaluate the Cauchy principal value of the integral of a function f over the defined interval (a,b)
with a singularity at c
@param f integration function. The function type must implement the mathlib::IGenFunction interface
@param a lower interval value
diff --git a/math/mathmore/inc/Math/GSLMCIntegrator.h b/math/mathmore/inc/Math/GSLMCIntegrator.h
index b5d6abcf925..86267bd5f7f 100644
--- a/math/mathmore/inc/Math/GSLMCIntegrator.h
+++ b/math/mathmore/inc/Math/GSLMCIntegrator.h
@@ -234,23 +234,23 @@ public:
/**
- set random number generator
+ set random number generator
*/
void SetGenerator(GSLRngWrapper* r);
/**
- set integration method
+ set integration method
*/
void SetType(MCIntegration::Type type);
/**
- set integration method using a name instead of an enumeration
+ set integration method using a name instead of an enumeration
*/
void SetTypeName(const char * typeName);
/**
- set integration mode for VEGAS method
+ set integration mode for VEGAS method
The possible MODE are :
MCIntegration::kIMPORTANCE (default) : VEGAS will use importance sampling
MCIntegration::kSTRATIFIED : VEGAS will use stratified sampling if certain condition are satisfied
@@ -260,28 +260,28 @@ public:
void SetMode(MCIntegration::Mode mode);
/**
- set default parameters for VEGAS method
+ set default parameters for VEGAS method
*/
void SetParameters(const VegasParameters &p);
/**
- set default parameters for MISER method
+ set default parameters for MISER method
*/
void SetParameters(const MiserParameters &p);
/**
- set parameters for PLAIN method
+ set parameters for PLAIN method
*/
//void SetPParameters(const PlainParameters &p);
/**
- returns the error sigma from the last iteration of the Vegas algorithm
+ returns the error sigma from the last iteration of the Vegas algorithm
*/
double Sigma();
/**
- returns chi-squared per degree of freedom for the estimate of the integral in the Vegas algorithm
+ returns chi-squared per degree of freedom for the estimate of the integral in the Vegas algorithm
*/
double ChiSqr();
diff --git a/math/mathmore/inc/Math/IntegrationTypes.h b/math/mathmore/inc/Math/IntegrationTypes.h
index c936465c79d..67b46c8435a 100644
--- a/math/mathmore/inc/Math/IntegrationTypes.h
+++ b/math/mathmore/inc/Math/IntegrationTypes.h
@@ -52,17 +52,17 @@ namespace Math {
/**
- enumeration specifying the Gauss-KronRod integration rule for ADAPTIVE integration type
- @ingroup Integration
+ enumeration specifying the Gauss-KronRod integration rule for ADAPTIVE integration type
+ @ingroup Integration
*/
// Gauss KronRod Adaptive rule
enum GKRule { kGAUSS15 = 1,
- kGAUSS21 = 2,
- kGAUSS31 = 3,
- kGAUSS41 = 4,
- kGAUSS51 = 5,
- kGAUSS61 = 6
+ kGAUSS21 = 2,
+ kGAUSS31 = 3,
+ kGAUSS41 = 4,
+ kGAUSS51 = 5,
+ kGAUSS61 = 6
};
diff --git a/math/mathmore/inc/Math/InterpolationTypes.h b/math/mathmore/inc/Math/InterpolationTypes.h
index a6335042dd8..5dd80898075 100644
--- a/math/mathmore/inc/Math/InterpolationTypes.h
+++ b/math/mathmore/inc/Math/InterpolationTypes.h
@@ -36,12 +36,12 @@ namespace ROOT {
namespace Math {
- namespace Interpolation {
+ namespace Interpolation {
- /**
- Enumeration defining the types of interpolation methods availables.
- Passed as argument to instantiate mathlib::Interpolator objects.
- The types available are (more information is available in the
+ /**
+ Enumeration defining the types of interpolation methods availables.
+ Passed as argument to instantiate mathlib::Interpolator objects.
+ The types available are (more information is available in the
<A HREF="http://www.gnu.org/software/gsl/manual/html_node/Interpolation-Types.html">GSL manual</A>):
<ul>
<li>LINEAR interpolation;
@@ -49,24 +49,24 @@ namespace Math {
<li>CSPLINE cubic spline with natural boundary conditions;
<li>CSPLINE_PERIODIC cubic spline with periodic boundary conditions;
<li>AKIMA, Akima spline with natural boundary conditions ( requires a minimum of 5 points);
- <li>AKIMA_PERIODIC, Akima spline with periodic boundaries ( requires a minimum of 5 points);
+ <li>AKIMA_PERIODIC, Akima spline with periodic boundaries ( requires a minimum of 5 points);
</ul>
@ingroup Interpolation
- */
-
- // enumerations for the type of interpolations
- enum Type { kLINEAR,
- kPOLYNOMIAL,
- kCSPLINE,
- kCSPLINE_PERIODIC,
- kAKIMA,
- kAKIMA_PERIODIC
- };
- }
-
+ */
+ // enumerations for the type of interpolations
+ enum Type { kLINEAR,
+ kPOLYNOMIAL,
+ kCSPLINE,
+ kCSPLINE_PERIODIC,
+ kAKIMA,
+ kAKIMA_PERIODIC
+ };
+ }
+
+
} // namespace Math
} // namespace ROOT
diff --git a/math/mathmore/inc/Math/Random.h b/math/mathmore/inc/Math/Random.h
index cd16d5169e7..e480b8ea560 100644
--- a/math/mathmore/inc/Math/Random.h
+++ b/math/mathmore/inc/Math/Random.h
@@ -137,14 +137,14 @@ namespace Math {
}
/**
- set the random generator seed
+ set the random generator seed
*/
void SetSeed(unsigned int seed) {
return fEngine.SetSeed(seed);
}
/** Random Distributions
- Use naming and signatures compatible with ROOT TRandom
+ Use naming and signatures compatible with ROOT TRandom
**/
/**
diff --git a/math/mathmore/inc/Math/RootFinderAlgorithms.h b/math/mathmore/inc/Math/RootFinderAlgorithms.h
index a19284715aa..e3994087995 100644
--- a/math/mathmore/inc/Math/RootFinderAlgorithms.h
+++ b/math/mathmore/inc/Math/RootFinderAlgorithms.h
@@ -53,9 +53,9 @@ namespace Roots {
//________________________________________________________________________________________________________
/**
Roots::Bisection
- Bisection algorithm, simplest algorithm for bracketing the roots of a function, but slowest one.
- See the <A HREF="http://www.gnu.org/software/gsl/manual/html_node/Root-Bracketing-Algorithms.html">GSL manual</A> for more information
- @ingroup RootFinders
+ Bisection algorithm, simplest algorithm for bracketing the roots of a function, but slowest one.
+ See the <A HREF="http://www.gnu.org/software/gsl/manual/html_node/Root-Bracketing-Algorithms.html">GSL manual</A> for more information
+ @ingroup RootFinders
*/
class Bisection : public GSLRootFinder {
@@ -101,7 +101,7 @@ namespace Roots {
Brent-Dekker algorithm which combines an interpolation strategy with the bisection algorithm
See the <A HREF="http://www.gnu.org/software/gsl/manual/html_node/Root-Bracketing-Algorithms.html">
GSL manual</A> for more information
-
+
@ingroup RootFinders
*/
diff --git a/math/mathmore/src/GSLDerivator.h b/math/mathmore/src/GSLDerivator.h
index 5c99a4a2700..7060fd57514 100644
--- a/math/mathmore/src/GSLDerivator.h
+++ b/math/mathmore/src/GSLDerivator.h
@@ -93,7 +93,7 @@ public:
(for example the function object itself)
*/
void SetFunction( GSLFuncPointer f, void * p = 0);
-
+
/**
Computes the numerical derivative at a point x using an adaptive central
difference algorithm with a step size h.
diff --git a/math/mathmore/src/GSLInterpolator.h b/math/mathmore/src/GSLInterpolator.h
index b2325e5ce22..d77a55ec028 100644
--- a/math/mathmore/src/GSLInterpolator.h
+++ b/math/mathmore/src/GSLInterpolator.h
@@ -74,7 +74,7 @@ namespace Math {
{
assert(fAccel);
double y = 0;
- static unsigned int nErrors = 0;
+ static unsigned int nErrors = 0;
if (fResetNErrors) { nErrors = 0; fResetNErrors = false;}
int ierr = gsl_spline_eval_e(fSpline, x, fAccel, &y );
if (ierr){
@@ -83,7 +83,7 @@ namespace Math {
MATH_WARN_MSG("GSLInterpolator::Eval",gsl_strerror(ierr) ) //Trying to suppress errors B Zimmerman 11-11-11
else if(nErrors == 4)
MATH_WARN_MSG("GSLInterpolator::Eval","Suppressing additional warnings");
- }
+ }
return y;
}
@@ -91,14 +91,14 @@ namespace Math {
{
assert(fAccel);
double deriv = 0;
- static unsigned int nErrors = 0;
+ static unsigned int nErrors = 0;
if (fResetNErrors) { nErrors = 0; fResetNErrors = false;}
int ierr = gsl_spline_eval_deriv_e(fSpline, x, fAccel, &deriv );
if (ierr){
++nErrors;
if(nErrors < 5)
MATH_WARN_MSG("GSLInterpolator::Deriv",gsl_strerror(ierr) )
- else if(nErrors == 4)
+ else if(nErrors == 4)
MATH_WARN_MSG("GSLInterpolator::Deriv","Suppressing additional warnings");
}
return deriv;
@@ -107,7 +107,7 @@ namespace Math {
double Deriv2( double x ) const {
assert(fAccel);
double deriv2 = 0;
- static unsigned int nErrors = 0;
+ static unsigned int nErrors = 0;
if (fResetNErrors) { nErrors = 0; fResetNErrors = false;}
int ierr = gsl_spline_eval_deriv2_e(fSpline, x, fAccel, &deriv2 );
if (ierr){
@@ -116,7 +116,7 @@ namespace Math {
MATH_WARN_MSG("GSLInterpolator::Deriv2",gsl_strerror(ierr) )
else if(nErrors == 4)
MATH_WARN_MSG("GSLInterpolator::Deriv2","Suppressing additional warnings");
- }
+ }
return deriv2;
}
@@ -124,14 +124,14 @@ namespace Math {
if ( a > b) return -Integ(b,a); // gsl will report an error in this case
assert(fAccel);
double result = 0;
- static unsigned int nErrors = 0;
+ static unsigned int nErrors = 0;
if (fResetNErrors) { nErrors = 0; fResetNErrors = false;}
int ierr = gsl_spline_eval_integ_e(fSpline, a, b, fAccel, &result );
if (ierr){
++nErrors;
if(nErrors < 5)
MATH_WARN_MSG("GSLInterpolator::Integ",gsl_strerror(ierr) )
- else if(nErrors == 4)
+ else if(nErrors == 4)
MATH_WARN_MSG("GSLInterpolator::Integ","Suppress additional warnings" )
}
return result;
diff --git a/math/mathmore/src/GSLMCIntegrator.cxx b/math/mathmore/src/GSLMCIntegrator.cxx
index bacc0de1429..08c46439a97 100644
--- a/math/mathmore/src/GSLMCIntegrator.cxx
+++ b/math/mathmore/src/GSLMCIntegrator.cxx
@@ -384,7 +384,7 @@ void GSLMCIntegrator::SetParameters(const MiserParameters &p)
MATH_ERROR_MSG("GSLIntegrator::SetParameters"," Parameters not matching integration type");
}
-
+
void GSLMCIntegrator::DoInitialize ( )
{
// initialize by setting integration type
diff --git a/math/mathmore/src/Polynomial.cxx b/math/mathmore/src/Polynomial.cxx
index 34dd20002c8..edbf8b3a09c 100644
--- a/math/mathmore/src/Polynomial.cxx
+++ b/math/mathmore/src/Polynomial.cxx
@@ -147,7 +147,7 @@ IGenFunction * Polynomial::Clone() const {
f->SetParameters( Parameters() );
return f;
}
-
+
const std::vector< std::complex <double> > & Polynomial::FindRoots(){
@@ -176,9 +176,9 @@ const std::vector< std::complex <double> > & Polynomial::FindRoots(){
int nr = gsl_poly_complex_solve_quadratic(Parameters()[2], Parameters()[1], Parameters()[0], &z1, &z2);
if ( nr != 2) {
#ifdef DEBUG
- std::cout << "Polynomial quadratic ::- FAILED to find roots" << std::endl;
+ std::cout << "Polynomial quadratic ::- FAILED to find roots" << std::endl;
#endif
- return fRoots;
+ return fRoots;
}
fRoots.push_back(std::complex<double>(z1.dat[0],z1.dat[1]) );
fRoots.push_back(std::complex<double>(z2.dat[0],z2.dat[1]) );
@@ -194,9 +194,9 @@ const std::vector< std::complex <double> > & Polynomial::FindRoots(){
int nr = gsl_poly_complex_solve_cubic(a, b, c, &z1, &z2, &z3);
if (nr != 3) {
#ifdef DEBUG
- std::cout << "Polynomial cubic::- FAILED to find roots" << std::endl;
+ std::cout << "Polynomial cubic::- FAILED to find roots" << std::endl;
#endif
- return fRoots;
+ return fRoots;
}
fRoots.push_back(std::complex<double> (z1.dat[0],z1.dat[1]) );
@@ -216,9 +216,9 @@ const std::vector< std::complex <double> > & Polynomial::FindRoots(){
int nr = gsl_poly_complex_solve_quartic(a, b, c, d, &z1, &z2, &z3, & z4);
if (nr != 4) {
#ifdef DEBUG
- std::cout << "Polynomial quartic ::- FAILED to find roots" << std::endl;
+ std::cout << "Polynomial quartic ::- FAILED to find roots" << std::endl;
#endif
- return fRoots;
+ return fRoots;
}
fRoots.push_back(std::complex<double> (z1.dat[0],z1.dat[1]) );
fRoots.push_back(std::complex<double> (z2.dat[0],z2.dat[1]) );
diff --git a/math/mathmore/src/complex_quartic.h b/math/mathmore/src/complex_quartic.h
index e5be6cef831..afd95000554 100644
--- a/math/mathmore/src/complex_quartic.h
+++ b/math/mathmore/src/complex_quartic.h
@@ -273,7 +273,7 @@ gsl_poly_complex_solve_quartic (double a, double b, double c, double d,
gsl_complex prod_w = gsl_complex_mul (w1, w2);
//gsl_complex mod_prod_w = gsl_complex_abs (prod_w);
/*
- Changed from gsl_complex to double in order to make it compile.
+ Changed from gsl_complex to double in order to make it compile.
*/
double mod_prod_w = gsl_complex_abs (prod_w);
if (0.0 != mod_prod_w)
diff --git a/math/mathmore/test/piRandom.C b/math/mathmore/test/piRandom.C
index 7067a3f7147..e3f237f1a18 100644
--- a/math/mathmore/test/piRandom.C
+++ b/math/mathmore/test/piRandom.C
@@ -53,9 +53,9 @@ void generate( R & r, TH1D * h) {
for (int ievt = 0; ievt < n; ievt+=1000 ) {
r.RndmArray(2000,rn);
for (int i=0; i < 1000; i++) {
- x=rn[2*i];
- y=rn[2*i+1];
- if ( ( x*x + y*y ) <= 1.0 ) n1++;
+ x=rn[2*i];
+ y=rn[2*i+1];
+ if ( ( x*x + y*y ) <= 1.0 ) n1++;
}
}
double piEstimate = 4.0 * double(n1)/double(n);
@@ -66,7 +66,7 @@ void generate( R & r, TH1D * h) {
w.Stop();
std::cout << std::endl;
std::cout << "Random: " << typeid(r).name()
- << "\n\tTime = " << w.RealTime() << " " << w.CpuTime() << std::endl;
+ << "\n\tTime = " << w.RealTime() << " " << w.CpuTime() << std::endl;
std::cout << "Time/call: " << w.CpuTime()/(2*n)*1.0E9 << std::endl;
}
diff --git a/math/mathmore/test/pirndm.C b/math/mathmore/test/pirndm.C
index 547bb7c9d83..fb07d27e787 100644
--- a/math/mathmore/test/pirndm.C
+++ b/math/mathmore/test/pirndm.C
@@ -67,14 +67,14 @@ void piRandom(const char *name, Random *r, Long64_t n, Int_t color) {
i += NR2;
r->RndmArray(NR,rn);
for (Int_t j=0;j<NR;j+=2) {
- if (rn[j]*rn[j]+rn[j+1]*rn[j+1] <= 1) npi++;
- if (rn[j] < 0.001) h2->Fill(rn[j],rn[j+1]);
+ if (rn[j]*rn[j]+rn[j+1]*rn[j+1] <= 1) npi++;
+ if (rn[j] < 0.001) h2->Fill(rn[j],rn[j+1]);
}
// r1 = r->Rndm();
// r2 = r->Rndm();
// if (r1*r1+r2*r2 <= 1) npi++;
if (i && i % (n/10) == 0) {
- gSystem->ProcessEvents();
+ gSystem->ProcessEvents();
Double_t norm = 4./Double_t(i);
diffpi = norm*npi - pi;
gr->SetPoint(k,i,diffpi);
diff --git a/math/mathmore/test/testMCIntegration.cxx b/math/mathmore/test/testMCIntegration.cxx
index f18b6d1135d..5ad93107b4d 100644
--- a/math/mathmore/test/testMCIntegration.cxx
+++ b/math/mathmore/test/testMCIntegration.cxx
@@ -258,8 +258,8 @@ bool performance()
p[0] = N;
for (unsigned int i=0; i < N; i++)
{
- a[i] = -1.;//-TMath::Pi();
- b[i] = 1;//TMath::Pi();
+ a[i] = -1.;//-TMath::Pi();
+ b[i] = 1;//TMath::Pi();
}
//x[N] = N;
double val0, err0;
diff --git a/math/mathmore/test/testRandom.cxx b/math/mathmore/test/testRandom.cxx
index 2cbd1712c7f..706e398f169 100644
--- a/math/mathmore/test/testRandom.cxx
+++ b/math/mathmore/test/testRandom.cxx
@@ -138,9 +138,9 @@ void generate( R & r, bool array=true) {
r.RndmArray(1000,x);
r.RndmArray(1000,y);
for (int j = 0; j < 1000; ++j)
- if ( ( x[j]*x[j] + y[j]*y[j] ) <= 1.0 ) n1++;
+ if ( ( x[j]*x[j] + y[j]*y[j] ) <= 1.0 ) n1++;
}
- }
+ }
else {
for (int i = 0; i < n; ++i) {
x=r.Uniform();
@@ -152,8 +152,8 @@ void generate( R & r, bool array=true) {
printName(r);
std::cout << "\tTime = " << w.RealTime()*1.0E9/NEVT << " "
- << w.CpuTime()*1.0E9/NEVT
- << " (ns/call)" << std::endl;
+ << w.CpuTime()*1.0E9/NEVT
+ << " (ns/call)" << std::endl;
double piEstimate = 4.0 * double(n1)/double(n);
double delta = piEstimate-PI;
double sigma = std::sqrt( PI * (4 - PI)/double(n) );
diff --git a/math/mathmore/test/testRandomDist.cxx b/math/mathmore/test/testRandomDist.cxx
index 24f7a963ab9..3c2a253f875 100644
--- a/math/mathmore/test/testRandomDist.cxx
+++ b/math/mathmore/test/testRandomDist.cxx
@@ -104,8 +104,8 @@ void testPoisson( R & r,double mu,TH1D & h) {
w.Stop();
if (fillHist) { fillHist=false; return; }
std::cout << "Poisson - mu = " << mu << "\t\t"<< findName(r) << "\tTime = " << w.RealTime()*1.0E9/NEVT << " \t"
- << w.CpuTime()*1.0E9/NEVT
- << "\t(ns/call)" << std::endl;
+ << w.CpuTime()*1.0E9/NEVT
+ << "\t(ns/call)" << std::endl;
// fill histogram the second pass
fillHist = true;
testPoisson(r,mu,h);
@@ -133,8 +133,8 @@ unsigned int genPoisson( R & r, double mu) {
double x,y,v;
do {
do {
- y = std::tan( pi * r.Rndm() );
- x = sqm * y + m - 1.;
+ y = std::tan( pi * r.Rndm() );
+ x = sqm * y + m - 1.;
}
while (x <= 0);
v = r.Rndm();
@@ -200,8 +200,8 @@ unsigned int genPoisson2( R & r, double mu) {
do {
do {
- y = std::tan(pi*r.Rndm());
- em = sq*y + mu;
+ y = std::tan(pi*r.Rndm());
+ em = sq*y + mu;
} while( em < 0.0 );
em = std::floor(em);
@@ -233,8 +233,8 @@ void testPoisson2( R & r,double mu,TH1D & h) {
w.Stop();
if (fillHist) { fillHist=false; return; }
std::cout << "Poisson \t"<< findName(r) << "\tTime = " << w.RealTime()*1.0E9/NEVT << " \t"
- << w.CpuTime()*1.0E9/NEVT
- << "\t(ns/call)" << std::endl;
+ << w.CpuTime()*1.0E9/NEVT
+ << "\t(ns/call)" << std::endl;
// fill histogram the second pass
fillHist = true;
testPoisson2(r,mu,h);
@@ -259,8 +259,8 @@ void testPoissonCLHEP( R & r, double mu,TH1D & h) {
w.Stop();
if (fillHist) { fillHist=false; return; }
std::cout << "Poisson - mu = " << mu << "\t\t" << findName(r) <<"\tTime = " << w.RealTime()*1.0E9/NEVT << " \t"
- << w.CpuTime()*1.0E9/NEVT
- << "\t(ns/call)" << std::endl;
+ << w.CpuTime()*1.0E9/NEVT
+ << "\t(ns/call)" << std::endl;
// fill histogram the second pass
fillHist = true;
testPoissonCLHEP(r,mu,h);
@@ -285,8 +285,8 @@ void testGausCLHEP( R & r,double mu,double sigma,TH1D & h) {
w.Stop();
if (fillHist) { fillHist=false; return; }
std::cout << "Gaussian - mu,sigma = " << mu << " , " << sigma << "\t"<< findName(r) << "\tTime = " << w.RealTime()*1.0E9/NEVT << " \t"
- << w.CpuTime()*1.0E9/NEVT
- << "\t(ns/call)" << std::endl;
+ << w.CpuTime()*1.0E9/NEVT
+ << "\t(ns/call)" << std::endl;
// fill histogram the second pass
fillHist = true;
testGausCLHEP(r,mu,sigma,h);
@@ -309,8 +309,8 @@ void testFlatCLHEP( R & r,TH1D & h) {
w.Stop();
if (fillHist) { fillHist=false; return; }
std::cout << "Flat - [0,1] \t"<< findName(r) << "\tTime = " << w.RealTime()*1.0E9/NEVT << " \t"
- << w.CpuTime()*1.0E9/NEVT
- << "\t(ns/call)" << std::endl;
+ << w.CpuTime()*1.0E9/NEVT
+ << "\t(ns/call)" << std::endl;
// fill histogram the second pass
fillHist = true;
testFlatCLHEP(r,h);
@@ -338,8 +338,8 @@ void testFlat( R & r,TH1D & h) {
w.Stop();
if (fillHist) { fillHist=false; return; }
std::cout << "Flat - [0,1] \t"<< findName(r) << "\tTime = " << w.RealTime()*1.0E9/NEVT << " \t"
- << w.CpuTime()*1.0E9/NEVT
- << "\t(ns/call)" << std::endl;
+ << w.CpuTime()*1.0E9/NEVT
+ << "\t(ns/call)" << std::endl;
// fill histogram the second pass
fillHist = true;
testFlat(r,h);
@@ -365,8 +365,8 @@ void testGaus( R & r,double mu,double sigma,TH1D & h) {
w.Stop();
if (fillHist) { fillHist=false; return; }
std::cout << "Gaussian - mu,sigma = " << mu << " , " << sigma << "\t"<< findName(r) << "\tTime = " << w.RealTime()*1.0E9/NEVT << " \t"
- << w.CpuTime()*1.0E9/NEVT
- << "\t(ns/call)" << std::endl;
+ << w.CpuTime()*1.0E9/NEVT
+ << "\t(ns/call)" << std::endl;
// fill histogram the second pass
fillHist = true;
testGaus(r,mu,sigma,h);
@@ -392,8 +392,8 @@ void testLandau( R & r,TH1D & h) {
w.Stop();
if (fillHist) { fillHist=false; return; }
std::cout << "Landau " << "\t\t\t\t"<< findName(r) << "\tTime = " << w.RealTime()*1.0E9/NEVT << " \t"
- << w.CpuTime()*1.0E9/NEVT
- << "\t(ns/call)" << std::endl;
+ << w.CpuTime()*1.0E9/NEVT
+ << "\t(ns/call)" << std::endl;
// fill histogram the second pass
fillHist = true;
testLandau(r,h);
@@ -419,8 +419,8 @@ void testBreitWigner( R & r,double mu,double gamma,TH1D & h) {
w.Stop();
if (fillHist) { fillHist=false; return; }
std::cout << "Breit-Wigner - m,g = " << mu << " , " << gamma << "\t"<< findName(r) << "\tTime = " << w.RealTime()*1.0E9/NEVT << " \t"
- << w.CpuTime()*1.0E9/NEVT
- << "\t(ns/call)" << std::endl;
+ << w.CpuTime()*1.0E9/NEVT
+ << "\t(ns/call)" << std::endl;
// fill histogram the second pass
fillHist = true;
testBreitWigner(r,mu,gamma,h);
@@ -445,8 +445,8 @@ void testBinomial( R & r,int ntot,double p,TH1D & h) {
w.Stop();
if (fillHist) { fillHist=false; return; }
std::cout << "Binomial - ntot,p = " << ntot << " , " << p << "\t"<< findName(r) << "\tTime = " << w.RealTime()*1.0E9/NEVT << " \t"
- << w.CpuTime()*1.0E9/NEVT
- << "\t(ns/call)" << std::endl;
+ << w.CpuTime()*1.0E9/NEVT
+ << "\t(ns/call)" << std::endl;
// fill histogram the second pass
fillHist = true;
testBinomial(r,ntot,p,h);
@@ -470,8 +470,8 @@ void testBinomialCLHEP( R & r,int ntot,double p,TH1D & h) {
w.Stop();
if (fillHist) { fillHist=false; return; }
std::cout << "Binomial - ntot,p = " << ntot << " , " << p << "\t"<< findName(r) << "\tTime = " << w.RealTime()*1.0E9/NEVT << " \t"
- << w.CpuTime()*1.0E9/NEVT
- << "\t(ns/call)" << std::endl;
+ << w.CpuTime()*1.0E9/NEVT
+ << "\t(ns/call)" << std::endl;
// fill histogram the second pass
fillHist = true;
testBinomialCLHEP(r,ntot,p,h);
@@ -553,8 +553,8 @@ void testExp( R & r,TH1D & h) {
w.Stop();
if (fillHist) { fillHist=false; return; }
std::cout << "Exponential " << "\t\t\t"<< findName(r) << "\tTime = " << w.RealTime()*1.0E9/NEVT << " \t"
- << w.CpuTime()*1.0E9/NEVT
- << "\t(ns/call)" << std::endl;
+ << w.CpuTime()*1.0E9/NEVT
+ << "\t(ns/call)" << std::endl;
// fill histogram the second pass
fillHist = true;
testExp(r,h);
@@ -581,8 +581,8 @@ void testCircle( R & r,TH1D & h) {
if (fillHist) { fillHist=false; return; }
std::cout << "Circle " << "\t\t\t\t"<< findName(r) << "\tTime = " << w.RealTime()*1.0E9/NEVT << " \t"
- << w.CpuTime()*1.0E9/NEVT
- << "\t(ns/call)" << std::endl;
+ << w.CpuTime()*1.0E9/NEVT
+ << "\t(ns/call)" << std::endl;
// fill histogram the second pass
fillHist = true;
testCircle(r,h);
@@ -644,8 +644,8 @@ void testSphere( R & r,TH1D & h1, TH1D & h2 ) {
if (fillHist) { fillHist=false; return; }
std::cout << "Sphere " << "\t\t\t\t"<< findName(r) << "\tTime = " << w.RealTime()*1.0E9/NEVT << " \t"
- << w.CpuTime()*1.0E9/NEVT
- << "\t(ns/call)" << std::endl;
+ << w.CpuTime()*1.0E9/NEVT
+ << "\t(ns/call)" << std::endl;
// fill histogram the second pass
fillHist = true;
diff --git a/math/matrix/inc/TVectorT.h b/math/matrix/inc/TVectorT.h
index 62676f624d2..95b5684550a 100644
--- a/math/matrix/inc/TVectorT.h
+++ b/math/matrix/inc/TVectorT.h
@@ -97,7 +97,7 @@ public:
TVectorT<Element> &Use (Int_t lwb,Int_t upb,Element *data);
const TVectorT<Element> &Use (Int_t lwb,Int_t upb,const Element *data) const
- { return (const TVectorT<Element>&)(const_cast<TVectorT<Element> *>(this))->Use(lwb,upb,const_cast<Element *>(data)); }
+ { return (const TVectorT<Element>&)(const_cast<TVectorT<Element> *>(this))->Use(lwb,upb,const_cast<Element *>(data)); }
TVectorT<Element> &Use (Int_t n,Element *data);
const TVectorT<Element> &Use (Int_t n,const Element *data) const ;
TVectorT<Element> &Use (TVectorT<Element> &v);
diff --git a/math/minuit2/doc/Doxyfile.in b/math/minuit2/doc/Doxyfile.in
index 253d8bd7a42..86b2440c1de 100644
--- a/math/minuit2/doc/Doxyfile.in
+++ b/math/minuit2/doc/Doxyfile.in
@@ -385,7 +385,7 @@ RECURSIVE = YES
EXCLUDE = @top_srcdir@/cmt \
@top_srcdir@/config \
@top_srcdir@/build \
- @top_srcdir@/test
+ @top_srcdir@/test
# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories
# that are symbolic links (a Unix filesystem feature) are excluded from the input.
diff --git a/math/minuit2/inc/Minuit2/AnalyticalGradientCalculator.h b/math/minuit2/inc/Minuit2/AnalyticalGradientCalculator.h
index 06e9cc19770..494d7a8640f 100644
--- a/math/minuit2/inc/Minuit2/AnalyticalGradientCalculator.h
+++ b/math/minuit2/inc/Minuit2/AnalyticalGradientCalculator.h
@@ -32,7 +32,7 @@ public:
virtual FunctionGradient operator()(const MinimumParameters&) const;
virtual FunctionGradient operator()(const MinimumParameters&,
- const FunctionGradient&) const;
+ const FunctionGradient&) const;
virtual bool CheckGradient() const;
diff --git a/math/minuit2/inc/Minuit2/BasicMinimumState.h b/math/minuit2/inc/Minuit2/BasicMinimumState.h
index 0d3cfc6a00a..e79b88994c9 100644
--- a/math/minuit2/inc/Minuit2/BasicMinimumState.h
+++ b/math/minuit2/inc/Minuit2/BasicMinimumState.h
@@ -28,10 +28,10 @@ class BasicMinimumState {
public:
BasicMinimumState(unsigned int n) :
- fParameters(MinimumParameters(n)), fError(MinimumError(n)),
+ fParameters(MinimumParameters(n)), fError(MinimumError(n)),
fGradient(FunctionGradient(n)), fEDM(0.), fNFcn(0) {}
BasicMinimumState(const MinimumParameters& states, const MinimumError& err,
- const FunctionGradient& grad, double edm, int nfcn) :
+ const FunctionGradient& grad, double edm, int nfcn) :
fParameters(states), fError(err), fGradient(grad), fEDM(edm), fNFcn(nfcn) {}
BasicMinimumState(const MinimumParameters& states, double edm, int nfcn) : fParameters(states), fError(MinimumError(states.Vec().size())), fGradient(FunctionGradient(states.Vec().size())), fEDM(edm), fNFcn(nfcn) {}
diff --git a/math/minuit2/inc/Minuit2/CombinedMinimumBuilder.h b/math/minuit2/inc/Minuit2/CombinedMinimumBuilder.h
index 9cf7576c7e7..b2af7b82912 100644
--- a/math/minuit2/inc/Minuit2/CombinedMinimumBuilder.h
+++ b/math/minuit2/inc/Minuit2/CombinedMinimumBuilder.h
@@ -24,7 +24,7 @@ class CombinedMinimumBuilder : public MinimumBuilder {
public:
CombinedMinimumBuilder() : fVMMinimizer(VariableMetricMinimizer()),
- fSimplexMinimizer(SimplexMinimizer()) {}
+ fSimplexMinimizer(SimplexMinimizer()) {}
~CombinedMinimumBuilder() {}
diff --git a/math/minuit2/inc/Minuit2/DavidonErrorUpdator.h b/math/minuit2/inc/Minuit2/DavidonErrorUpdator.h
index 48ecf684530..dcf4c2b4ee4 100644
--- a/math/minuit2/inc/Minuit2/DavidonErrorUpdator.h
+++ b/math/minuit2/inc/Minuit2/DavidonErrorUpdator.h
@@ -31,7 +31,7 @@ public:
virtual ~DavidonErrorUpdator() {}
virtual MinimumError Update(const MinimumState&, const MinimumParameters&,
- const FunctionGradient&) const;
+ const FunctionGradient&) const;
private:
diff --git a/math/minuit2/inc/Minuit2/FumiliBuilder.h b/math/minuit2/inc/Minuit2/FumiliBuilder.h
index 6ea3f7b7cec..f170b36ee40 100644
--- a/math/minuit2/inc/Minuit2/FumiliBuilder.h
+++ b/math/minuit2/inc/Minuit2/FumiliBuilder.h
@@ -42,7 +42,7 @@ class FumiliBuilder : public MinimumBuilder {
public:
FumiliBuilder() : fEstimator(VariableMetricEDMEstimator()),
- fErrorUpdator(FumiliErrorUpdator()) {}
+ fErrorUpdator(FumiliErrorUpdator()) {}
~FumiliBuilder() {}
diff --git a/math/minuit2/inc/Minuit2/FumiliErrorUpdator.h b/math/minuit2/inc/Minuit2/FumiliErrorUpdator.h
index 1dd8a2c697c..1ac1e479735 100644
--- a/math/minuit2/inc/Minuit2/FumiliErrorUpdator.h
+++ b/math/minuit2/inc/Minuit2/FumiliErrorUpdator.h
@@ -75,9 +75,9 @@ public:
*/
virtual MinimumError Update(const MinimumState& fMinimumState,
- const MinimumParameters& fMinimumParameters,
- const GradientCalculator& fGradientCalculator,
- double lambda) const;
+ const MinimumParameters& fMinimumParameters,
+ const GradientCalculator& fGradientCalculator,
+ double lambda) const;
@@ -95,7 +95,7 @@ public:
*/
virtual MinimumError Update(const MinimumState&, const MinimumParameters&,
- const FunctionGradient&) const;
+ const FunctionGradient&) const;
diff --git a/math/minuit2/inc/Minuit2/FumiliGradientCalculator.h b/math/minuit2/inc/Minuit2/FumiliGradientCalculator.h
index 39c4a42c065..603d6918ba3 100644
--- a/math/minuit2/inc/Minuit2/FumiliGradientCalculator.h
+++ b/math/minuit2/inc/Minuit2/FumiliGradientCalculator.h
@@ -33,11 +33,11 @@ public:
{}
~FumiliGradientCalculator() {}
-
+
FunctionGradient operator()(const MinimumParameters&) const;
FunctionGradient operator()(const MinimumParameters&,
- const FunctionGradient&) const;
+ const FunctionGradient&) const;
const MnUserTransformation& Trafo() const {return fTransformation;}
diff --git a/math/minuit2/inc/Minuit2/FumiliMaximumLikelihoodFCN.h b/math/minuit2/inc/Minuit2/FumiliMaximumLikelihoodFCN.h
index 61fad149396..014709e4f33 100644
--- a/math/minuit2/inc/Minuit2/FumiliMaximumLikelihoodFCN.h
+++ b/math/minuit2/inc/Minuit2/FumiliMaximumLikelihoodFCN.h
@@ -143,20 +143,20 @@ public:
double operator()(const std::vector<double>& par) const {
- double sumoflogs = 0.0;
- std::vector<double> vecElements = Elements(par);
- unsigned int vecElementsSize = vecElements.size();
-
- for (unsigned int i = 0; i < vecElementsSize; ++i) {
- double tmp = vecElements[i];
- //for max likelihood probability have to be positive
- assert(tmp >= 0);
- sumoflogs -= ROOT::Math::Util::EvalLog(tmp);
- //std::cout << " i " << tmp << " lik " << sumoflogs << std::endl;
- }
-
-
- return sumoflogs;
+ double sumoflogs = 0.0;
+ std::vector<double> vecElements = Elements(par);
+ unsigned int vecElementsSize = vecElements.size();
+
+ for (unsigned int i = 0; i < vecElementsSize; ++i) {
+ double tmp = vecElements[i];
+ //for max likelihood probability have to be positive
+ assert(tmp >= 0);
+ sumoflogs -= ROOT::Math::Util::EvalLog(tmp);
+ //std::cout << " i " << tmp << " lik " << sumoflogs << std::endl;
+ }
+
+
+ return sumoflogs;
}
diff --git a/math/minuit2/inc/Minuit2/FumiliStandardChi2FCN.h b/math/minuit2/inc/Minuit2/FumiliStandardChi2FCN.h
index fbf7fb10d12..e7ac97c0b96 100644
--- a/math/minuit2/inc/Minuit2/FumiliStandardChi2FCN.h
+++ b/math/minuit2/inc/Minuit2/FumiliStandardChi2FCN.h
@@ -62,31 +62,31 @@ public:
*/
- FumiliStandardChi2FCN(const ParametricFunction& modelFCN, const std::vector<double>& meas,
- const std::vector<double>& pos,
- const std::vector<double>& mvar)
- { //this->fModelFCN = &modelFunction;
- this->SetModelFunction(modelFCN);
-
- assert(meas.size() == pos.size());
- assert(meas.size() == mvar.size());
- fMeasurements = meas;
- std::vector<double> x(1);
- unsigned int n = mvar.size();
- fPositions.reserve( n);
- // correct for variance == 0
- fInvErrors.resize(n);
- for (unsigned int i = 0; i < n; ++i)
- {
- x[0] = pos[i];
- fPositions.push_back(x);
- // PAW/ROOT hack : use 1 for 0 entries bins
- if (mvar[i] == 0)
- fInvErrors[i] = 1;
- else
- fInvErrors[i] = 1.0/std::sqrt(mvar[i]);
- }
-
+ FumiliStandardChi2FCN(const ParametricFunction& modelFCN, const std::vector<double>& meas,
+ const std::vector<double>& pos,
+ const std::vector<double>& mvar)
+ { //this->fModelFCN = &modelFunction;
+ this->SetModelFunction(modelFCN);
+
+ assert(meas.size() == pos.size());
+ assert(meas.size() == mvar.size());
+ fMeasurements = meas;
+ std::vector<double> x(1);
+ unsigned int n = mvar.size();
+ fPositions.reserve( n);
+ // correct for variance == 0
+ fInvErrors.resize(n);
+ for (unsigned int i = 0; i < n; ++i)
+ {
+ x[0] = pos[i];
+ fPositions.push_back(x);
+ // PAW/ROOT hack : use 1 for 0 entries bins
+ if (mvar[i] == 0)
+ fInvErrors[i] = 1;
+ else
+ fInvErrors[i] = 1.0/std::sqrt(mvar[i]);
+ }
+
}
@@ -108,26 +108,26 @@ public:
*/
FumiliStandardChi2FCN(const ParametricFunction& modelFCN, const std::vector<double>& meas,
- const std::vector<std::vector<double> >& pos,
- const std::vector<double>& mvar)
- { //this->fModelFCN = &modelFunction;
- this->SetModelFunction(modelFCN);
-
- assert(meas.size() == pos.size());
- assert(meas.size() == mvar.size());
- fMeasurements = meas;
- fPositions = pos;
- // correct for variance == 0
- unsigned int n = mvar.size();
- fInvErrors.resize(n);
- for (unsigned int i = 0; i < n; ++i)
- {
- // PAW/ROOT hack : use 1 for 0 entries bins
- if (mvar[i] == 0)
- fInvErrors[i] = 1;
- else
- fInvErrors[i] = 1.0/std::sqrt(mvar[i]);
- }
+ const std::vector<std::vector<double> >& pos,
+ const std::vector<double>& mvar)
+ { //this->fModelFCN = &modelFunction;
+ this->SetModelFunction(modelFCN);
+
+ assert(meas.size() == pos.size());
+ assert(meas.size() == mvar.size());
+ fMeasurements = meas;
+ fPositions = pos;
+ // correct for variance == 0
+ unsigned int n = mvar.size();
+ fInvErrors.resize(n);
+ for (unsigned int i = 0; i < n; ++i)
+ {
+ // PAW/ROOT hack : use 1 for 0 entries bins
+ if (mvar[i] == 0)
+ fInvErrors[i] = 1;
+ else
+ fInvErrors[i] = 1.0/std::sqrt(mvar[i]);
+ }
}
diff --git a/math/minuit2/inc/Minuit2/FumiliStandardMaximumLikelihoodFCN.h b/math/minuit2/inc/Minuit2/FumiliStandardMaximumLikelihoodFCN.h
index 4bd2c68373c..ad9737304b5 100644
--- a/math/minuit2/inc/Minuit2/FumiliStandardMaximumLikelihoodFCN.h
+++ b/math/minuit2/inc/Minuit2/FumiliStandardMaximumLikelihoodFCN.h
@@ -51,8 +51,8 @@ public:
*/
- FumiliStandardMaximumLikelihoodFCN(const ParametricFunction& modelFCN,
- const std::vector<double>& pos)
+ FumiliStandardMaximumLikelihoodFCN(const ParametricFunction& modelFCN,
+ const std::vector<double>& pos)
{
this->SetModelFunction(modelFCN);
unsigned int n = pos.size();
@@ -77,9 +77,9 @@ public:
*/
- FumiliStandardMaximumLikelihoodFCN(const ParametricFunction& modelFCN,
- const std::vector<std::vector<double> >& pos) {
- this->SetModelFunction(modelFCN);
+ FumiliStandardMaximumLikelihoodFCN(const ParametricFunction& modelFCN,
+ const std::vector<std::vector<double> >& pos) {
+ this->SetModelFunction(modelFCN);
fPositions = pos;
}
diff --git a/math/minuit2/inc/Minuit2/FunctionGradient.h b/math/minuit2/inc/Minuit2/FunctionGradient.h
index e002da5f5ac..c284f5fbcac 100644
--- a/math/minuit2/inc/Minuit2/FunctionGradient.h
+++ b/math/minuit2/inc/Minuit2/FunctionGradient.h
@@ -31,7 +31,7 @@ public:
fData(MnRefCountedPointer<BasicFunctionGradient>(new BasicFunctionGradient(grd))) {}
FunctionGradient(const MnAlgebraicVector& grd, const MnAlgebraicVector& g2,
- const MnAlgebraicVector& gstep) :
+ const MnAlgebraicVector& gstep) :
fData(MnRefCountedPointer<BasicFunctionGradient>(new BasicFunctionGradient(grd, g2, gstep))) {}
~FunctionGradient() {}
diff --git a/math/minuit2/inc/Minuit2/GradientCalculator.h b/math/minuit2/inc/Minuit2/GradientCalculator.h
index e82721276c4..b6903311bf7 100644
--- a/math/minuit2/inc/Minuit2/GradientCalculator.h
+++ b/math/minuit2/inc/Minuit2/GradientCalculator.h
@@ -31,7 +31,7 @@ public:
virtual FunctionGradient operator()(const MinimumParameters&) const = 0;
virtual FunctionGradient operator()(const MinimumParameters&,
- const FunctionGradient&) const = 0;
+ const FunctionGradient&) const = 0;
};
} // namespace Minuit2
diff --git a/math/minuit2/inc/Minuit2/HessianGradientCalculator.h b/math/minuit2/inc/Minuit2/HessianGradientCalculator.h
index 3903aadfc0e..2d02665f433 100644
--- a/math/minuit2/inc/Minuit2/HessianGradientCalculator.h
+++ b/math/minuit2/inc/Minuit2/HessianGradientCalculator.h
@@ -34,7 +34,7 @@ class HessianGradientCalculator : public GradientCalculator {
public:
HessianGradientCalculator(const MnFcn& fcn, const MnUserTransformation& par,
- const MnStrategy& stra) :
+ const MnStrategy& stra) :
fFcn(fcn), fTransformation(par), fStrategy(stra) {}
virtual ~HessianGradientCalculator() {}
@@ -42,7 +42,7 @@ public:
virtual FunctionGradient operator()(const MinimumParameters&) const;
virtual FunctionGradient operator()(const MinimumParameters&,
- const FunctionGradient&) const;
+ const FunctionGradient&) const;
std::pair<FunctionGradient, MnAlgebraicVector> DeltaGradient(const MinimumParameters&, const FunctionGradient&) const;
diff --git a/math/minuit2/inc/Minuit2/InitialGradientCalculator.h b/math/minuit2/inc/Minuit2/InitialGradientCalculator.h
index 29d7ae63d79..89f1c25a936 100644
--- a/math/minuit2/inc/Minuit2/InitialGradientCalculator.h
+++ b/math/minuit2/inc/Minuit2/InitialGradientCalculator.h
@@ -30,7 +30,7 @@ class InitialGradientCalculator : public GradientCalculator {
public:
InitialGradientCalculator(const MnFcn& fcn, const MnUserTransformation& par,
- const MnStrategy& stra) :
+ const MnStrategy& stra) :
fFcn(fcn), fTransformation(par), fStrategy(stra) {};
virtual ~InitialGradientCalculator() {}
@@ -38,7 +38,7 @@ public:
virtual FunctionGradient operator()(const MinimumParameters&) const;
virtual FunctionGradient operator()(const MinimumParameters&,
- const FunctionGradient&) const;
+ const FunctionGradient&) const;
const MnFcn& Fcn() const {return fFcn;}
const MnUserTransformation& Trafo() const {return fTransformation;}
diff --git a/math/minuit2/inc/Minuit2/LaProd.h b/math/minuit2/inc/Minuit2/LaProd.h
index 970e01d34b3..aa8faba889a 100644
--- a/math/minuit2/inc/Minuit2/LaProd.h
+++ b/math/minuit2/inc/Minuit2/LaProd.h
@@ -23,18 +23,18 @@ namespace ROOT {
LM" remove this for fixing alpha poblem
#define OP_MULT1(MT1,MT2,MAT1,MAT2,T) \
template<class B> \
-inline ABObj<AlgebraicProdType<MT1,MT2>::Type,ABProd<ABObj<MT1,MAT1,T>, ABObj<MT2,B,T> >,T> operator*(const ABObj<MT1,MAT1,T>& a, const ABObj<MT2,B,T>& b) { return ABObj<AlgebraicProdType<MT1,MT2>::Type,ABProd<ABObj<MT1,MAT1,T>, ABObj<MT2,B,T> >,T>(ABProd<ABObj<MT1,MAT1,T>, ABObj<MT2,B,T> >(a, b)); } \
-template<class A> \
+inline ABObj<AlgebraicProdType<MT1,MT2>::Type,ABProd<ABObj<MT1,MAT1,T>, ABObj<MT2,B,T> >,T> operator*(const ABObj<MT1,MAT1,T>& a, const ABObj<MT2,B,T>& b) { return ABObj<AlgebraicProdType<MT1,MT2>::Type,ABProd<ABObj<MT1,MAT1,T>, ABObj<MT2,B,T> >,T>(ABProd<ABObj<MT1,MAT1,T>, ABObj<MT2,B,T> >(a, b)); } \
+template<class A> \
inline ABObj<AlgebraicProdType<MT1,MT2>::Type,ABProd<ABObj<MT1,A,T>, ABObj<MT2,MAT2,T> >,T> operator*(const ABObj<MT1,A,T>& a, const ABObj<MT2,MAT2,T>& b) { \
- return ABObj<AlgebraicProdType<MT1,MT2>::Type,ABProd<ABObj<MT1,A,T>, ABObj<MT2,MAT2,T> >,T>(ABProd<ABObj<MT1,A,T>, ABObj<MT2,MAT2,T> >(a, b)); \
+ return ABObj<AlgebraicProdType<MT1,MT2>::Type,ABProd<ABObj<MT1,A,T>, ABObj<MT2,MAT2,T> >,T>(ABProd<ABObj<MT1,A,T>, ABObj<MT2,MAT2,T> >(a, b)); \
} \
\
*/
#define OP_MULT1(MT1,MT2,MAT1,MAT2,T) \
-inline ABObj<AlgebraicProdType<MT1,MT2>::Type,ABProd<ABObj<MT1,MAT1,T>, ABObj<MT2,MAT2,T> >,T> operator*(const ABObj<MT1,MAT1,T>& a, const ABObj<MT2,MAT2,T>& b) { \
- return ABObj<AlgebraicProdType<MT1,MT2>::Type,ABProd<ABObj<MT1,MAT1,T>, ABObj<MT2,MAT2,T> >,T>(ABProd<ABObj<MT1,MAT1,T>, ABObj<MT2,MAT2,T> >(a, b)); \
-}
+inline ABObj<AlgebraicProdType<MT1,MT2>::Type,ABProd<ABObj<MT1,MAT1,T>, ABObj<MT2,MAT2,T> >,T> operator*(const ABObj<MT1,MAT1,T>& a, const ABObj<MT2,MAT2,T>& b) { \
+ return ABObj<AlgebraicProdType<MT1,MT2>::Type,ABProd<ABObj<MT1,MAT1,T>, ABObj<MT2,MAT2,T> >,T>(ABProd<ABObj<MT1,MAT1,T>, ABObj<MT2,MAT2,T> >(a, b)); \
+}
OP_MULT1(sym,vec,LASymMatrix,LAVector,double)
// OP_MULT1(sym,gen,LASymMatrix,LAGenMatrix,double)
diff --git a/math/minuit2/inc/Minuit2/LaSum.h b/math/minuit2/inc/Minuit2/LaSum.h
index d488a27af38..095bb9a800d 100644
--- a/math/minuit2/inc/Minuit2/LaSum.h
+++ b/math/minuit2/inc/Minuit2/LaSum.h
@@ -23,12 +23,12 @@ namespace ROOT {
inline ABObj<MT,MAT1,T> operator-(const ABObj<MT,MAT1,T>& m) {\
return ABObj<MT,MAT1,T> (m.Obj(), T(-1.)*m.f());\
}\
- \
-inline ABObj<MT,ABSum<ABObj<MT,MAT1,T>, ABObj<MT,MAT1,T> >,T> operator+(const ABObj<MT,MAT1,T>& a, const ABObj<MT,MAT1,T>& b) { \
- return ABObj<MT,ABSum<ABObj<MT,MAT1,T>, ABObj<MT,MAT1,T> >,T>(ABSum<ABObj<MT,MAT1,T>, ABObj<MT,MAT1,T> >(a, b)); \
-} \
-inline ABObj<MT,ABSum<ABObj<MT,MAT1,T>, ABObj<MT,MAT1,T> >,T> operator-(const ABObj<MT,MAT1,T>& a, const ABObj<MT,MAT1,T>& b) { \
- return ABObj<MT,ABSum<ABObj<MT,MAT1,T>, ABObj<MT,MAT1,T> >,T>(ABSum<ABObj<MT,MAT1,T>, ABObj<MT,MAT1,T> >(a,ABObj<MT,MAT1,T> (b.Obj(),T(-1.)*b.f()))); \
+ \
+inline ABObj<MT,ABSum<ABObj<MT,MAT1,T>, ABObj<MT,MAT1,T> >,T> operator+(const ABObj<MT,MAT1,T>& a, const ABObj<MT,MAT1,T>& b) { \
+ return ABObj<MT,ABSum<ABObj<MT,MAT1,T>, ABObj<MT,MAT1,T> >,T>(ABSum<ABObj<MT,MAT1,T>, ABObj<MT,MAT1,T> >(a, b)); \
+} \
+inline ABObj<MT,ABSum<ABObj<MT,MAT1,T>, ABObj<MT,MAT1,T> >,T> operator-(const ABObj<MT,MAT1,T>& a, const ABObj<MT,MAT1,T>& b) { \
+ return ABObj<MT,ABSum<ABObj<MT,MAT1,T>, ABObj<MT,MAT1,T> >,T>(ABSum<ABObj<MT,MAT1,T>, ABObj<MT,MAT1,T> >(a,ABObj<MT,MAT1,T> (b.Obj(),T(-1.)*b.f()))); \
}
OP_ADD1(vec,LAVector,double)
diff --git a/math/minuit2/inc/Minuit2/MinimumErrorUpdator.h b/math/minuit2/inc/Minuit2/MinimumErrorUpdator.h
index 08e5cd77b7d..f97cd78d197 100644
--- a/math/minuit2/inc/Minuit2/MinimumErrorUpdator.h
+++ b/math/minuit2/inc/Minuit2/MinimumErrorUpdator.h
@@ -27,7 +27,7 @@ public:
virtual ~MinimumErrorUpdator() {}
virtual MinimumError Update(const MinimumState&, const MinimumParameters&,
- const FunctionGradient&) const = 0;
+ const FunctionGradient&) const = 0;
};
diff --git a/math/minuit2/inc/Minuit2/MinimumState.h b/math/minuit2/inc/Minuit2/MinimumState.h
index 837b5e0227f..0730d1ea8c1 100644
--- a/math/minuit2/inc/Minuit2/MinimumState.h
+++ b/math/minuit2/inc/Minuit2/MinimumState.h
@@ -40,7 +40,7 @@ public:
/** state with parameters, Gradient and covariance (from Gradient methods
such as Migrad) */
MinimumState(const MinimumParameters& states, const MinimumError& err,
- const FunctionGradient& grad, double edm, int nfcn) :
+ const FunctionGradient& grad, double edm, int nfcn) :
fData(MnRefCountedPointer<BasicMinimumState>(new BasicMinimumState(states, err, grad, edm, nfcn))) {}
~MinimumState() {}
diff --git a/math/minuit2/inc/Minuit2/MnParabolaFactory.h b/math/minuit2/inc/Minuit2/MnParabolaFactory.h
index 7faeb5a1108..70c9b75da79 100644
--- a/math/minuit2/inc/Minuit2/MnParabolaFactory.h
+++ b/math/minuit2/inc/Minuit2/MnParabolaFactory.h
@@ -27,10 +27,10 @@ public:
~MnParabolaFactory() {}
MnParabola operator()(const MnParabolaPoint&, const MnParabolaPoint&,
- const MnParabolaPoint&) const;
+ const MnParabolaPoint&) const;
MnParabola operator()(const MnParabolaPoint&, double,
- const MnParabolaPoint&) const;
+ const MnParabolaPoint&) const;
private:
diff --git a/math/minuit2/inc/Minuit2/MnStrategy.h b/math/minuit2/inc/Minuit2/MnStrategy.h
index 2944ca8b204..72c86bfe531 100644
--- a/math/minuit2/inc/Minuit2/MnStrategy.h
+++ b/math/minuit2/inc/Minuit2/MnStrategy.h
@@ -20,8 +20,8 @@ namespace ROOT {
high (>=2);
acts on: Migrad (behavioural),
Minos (lowers strategy by 1 for Minos-own minimization),
- Hesse (iterations),
- Numerical2PDerivative (iterations)
+ Hesse (iterations),
+ Numerical2PDerivative (iterations)
*/
class MnStrategy {
diff --git a/math/minuit2/inc/Minuit2/Numerical2PGradientCalculator.h b/math/minuit2/inc/Minuit2/Numerical2PGradientCalculator.h
index 571cb888ba5..7086f3ad5f2 100644
--- a/math/minuit2/inc/Minuit2/Numerical2PGradientCalculator.h
+++ b/math/minuit2/inc/Minuit2/Numerical2PGradientCalculator.h
@@ -39,8 +39,8 @@ class Numerical2PGradientCalculator : public GradientCalculator {
public:
Numerical2PGradientCalculator(const MnFcn& fcn,
- const MnUserTransformation& par,
- const MnStrategy& stra) :
+ const MnUserTransformation& par,
+ const MnStrategy& stra) :
fFcn(fcn), fTransformation(par), fStrategy(stra) {}
virtual ~Numerical2PGradientCalculator() {}
@@ -56,7 +56,7 @@ public:
virtual FunctionGradient operator()(const MinimumParameters&,
- const FunctionGradient&) const;
+ const FunctionGradient&) const;
const MnFcn& Fcn() const {return fFcn;}
const MnUserTransformation& Trafo() const {return fTransformation;}
diff --git a/math/minuit2/inc/Minuit2/SinParameterTransformation.h b/math/minuit2/inc/Minuit2/SinParameterTransformation.h
index f0042b7f01d..7b8040befd1 100644
--- a/math/minuit2/inc/Minuit2/SinParameterTransformation.h
+++ b/math/minuit2/inc/Minuit2/SinParameterTransformation.h
@@ -32,7 +32,7 @@ public:
double Int2ext(double Value, double Upper, double Lower) const;
double Ext2int(double Value, double Upper, double Lower,
- const MnMachinePrecision&) const;
+ const MnMachinePrecision&) const;
double DInt2Ext(double Value, double Upper, double Lower) const;
private:
diff --git a/math/minuit2/inc/Minuit2/StackAllocator.h b/math/minuit2/inc/Minuit2/StackAllocator.h
index d6d3515e07f..19c44b33ec3 100644
--- a/math/minuit2/inc/Minuit2/StackAllocator.h
+++ b/math/minuit2/inc/Minuit2/StackAllocator.h
@@ -109,14 +109,14 @@ public:
int previousBlock = ReadInt( nextBlock - sizeof(int));
if ( nextBlock == fStackOffset) {
// deallocating last allocated
- fStackOffset = previousBlock;
+ fStackOffset = previousBlock;
}
else {
// overwrite previous adr of next block
- int nextNextBlock = ReadInt(nextBlock);
- WriteInt( nextNextBlock - sizeof(int), previousBlock);
- // overwrite head of deleted block
- WriteInt( previousBlock, nextNextBlock);
+ int nextNextBlock = ReadInt(nextBlock);
+ WriteInt( nextNextBlock - sizeof(int), previousBlock);
+ // overwrite head of deleted block
+ WriteInt( previousBlock, nextNextBlock);
}
fBlockCount--;
@@ -149,8 +149,8 @@ public:
int ToInt( void* p) {
unsigned char* pc = static_cast<unsigned char*>(p);
- // std::cout << "toInt: p = " << p << " fStack = " << (void*) fStack << std::endl;
- // VC 7.1 warning:conversin from __w64 int to int
+ // std::cout << "toInt: p = " << p << " fStack = " << (void*) fStack << std::endl;
+ // VC 7.1 warning:conversin from __w64 int to int
int userBlock = pc - fStack;
return userBlock - sizeof(int); // correct for starting int
}
@@ -163,8 +163,8 @@ public:
void CheckOverflow( int n) {
if (fStackOffset + n >= default_size) {
- //std::cout << " no more space on stack allocator" << std::endl;
- throw StackOverflow();
+ //std::cout << " no more space on stack allocator" << std::endl;
+ throw StackOverflow();
}
}
@@ -177,29 +177,29 @@ public:
int end = fStackOffset;
int nblocks = 0;
while (beg < fStackOffset) {
- end = ReadInt( beg);
-
- // std::cout << "beg = " << beg << " end = " << end
- // << " fStackOffset = " << fStackOffset << std::endl;
-
- int beg2 = ReadInt( end - sizeof(int));
- if ( beg != beg2) {
- //std::cout << " beg != beg2 " << std::endl;
- return false;
- }
- nblocks++;
- beg = end;
+ end = ReadInt( beg);
+
+ // std::cout << "beg = " << beg << " end = " << end
+ // << " fStackOffset = " << fStackOffset << std::endl;
+
+ int beg2 = ReadInt( end - sizeof(int));
+ if ( beg != beg2) {
+ //std::cout << " beg != beg2 " << std::endl;
+ return false;
+ }
+ nblocks++;
+ beg = end;
}
- if (end != fStackOffset) {
- //std::cout << " end != fStackOffset" << std::endl;
- return false;
- }
- if (nblocks != fBlockCount) {
- //std::cout << "nblocks != fBlockCount" << std::endl;
- return false;
- }
- //std::cout << "Allocator is in consistent state, nblocks = " << nblocks << std::endl;
- return true;
+ if (end != fStackOffset) {
+ //std::cout << " end != fStackOffset" << std::endl;
+ return false;
+ }
+ if (nblocks != fBlockCount) {
+ //std::cout << "nblocks != fBlockCount" << std::endl;
+ return false;
+ }
+ //std::cout << "Allocator is in consistent state, nblocks = " << nblocks << std::endl;
+ return true;
}
private:
diff --git a/math/minuit2/src/DavidonErrorUpdator.cxx b/math/minuit2/src/DavidonErrorUpdator.cxx
index b9fb269a2fe..205d460d1e9 100644
--- a/math/minuit2/src/DavidonErrorUpdator.cxx
+++ b/math/minuit2/src/DavidonErrorUpdator.cxx
@@ -89,8 +89,8 @@ MinimumError DavidonErrorUpdator::Update(const MinimumState& s0,
/*
MinimumError DavidonErrorUpdator::Update(const MinimumState& s0,
- const MinimumParameters& p1,
- const FunctionGradient& g1) const {
+ const MinimumParameters& p1,
+ const FunctionGradient& g1) const {
const MnAlgebraicSymMatrix& v0 = s0.Error().InvHessian();
MnAlgebraicVector dx = p1.Vec() - s0.Vec();
diff --git a/math/minuit2/src/FumiliGradientCalculator.cxx b/math/minuit2/src/FumiliGradientCalculator.cxx
index 4bbe9b55059..a30c0ada4d0 100644
--- a/math/minuit2/src/FumiliGradientCalculator.cxx
+++ b/math/minuit2/src/FumiliGradientCalculator.cxx
@@ -74,7 +74,7 @@ FunctionGradient FumiliGradientCalculator::operator()(const MinimumParameters& p
// unsigned int jext = fTransformation.ExtOfInt(j);
// double jderiv = 1.0;
// if ( fTransformation.Parameter(jext).HasLimits())
- // jderiv = fTransformation.DInt2Ext( j, par.Vec()(j) ) ;
+ // jderiv = fTransformation.DInt2Ext( j, par.Vec()(j) ) ;
// // h(i,j) = deriv[i]*deriv[j]*fFcn.Hessian(iext,jext);
// h(i,j) = ideriv*jderiv*fFcn.Hessian(iext,jext);
diff --git a/math/minuit2/src/FumiliStandardMaximumLikelihoodFCN.cxx b/math/minuit2/src/FumiliStandardMaximumLikelihoodFCN.cxx
index bada650d1ce..dd1022ad165 100644
--- a/math/minuit2/src/FumiliStandardMaximumLikelihoodFCN.cxx
+++ b/math/minuit2/src/FumiliStandardMaximumLikelihoodFCN.cxx
@@ -101,13 +101,13 @@ void FumiliStandardMaximumLikelihoodFCN::EvaluateAll( const std::vector<double>
for (int j = 0; j < npar; ++j) {
if ( std::fabs(mfg[j]) < minDouble ) {
- // std::cout << "SMALL values: grad = " << mfg[j] << " " << minDouble << " f(x) = " << fval
- // << " params " << j << " p0 = " << par[0] << " p1 = " << par[1] << std::endl;
+ // std::cout << "SMALL values: grad = " << mfg[j] << " " << minDouble << " f(x) = " << fval
+ // << " params " << j << " p0 = " << par[0] << " p1 = " << par[1] << std::endl;
if (mfg[j] < 0)
mfg[j] = -minDouble;
else
mfg[j] = minDouble;
- }
+ }
double dfj = invFval * mfg[j];
// to avoid summing infinite and nan later when calculating the Hessian
@@ -120,7 +120,7 @@ void FumiliStandardMaximumLikelihoodFCN::EvaluateAll( const std::vector<double>
grad[j] -= dfj;
// if ( ! ( dfj > 0) && ! ( dfj <= 0 ) )
- // std::cout << " nan : dfj = " << dfj << " fval = " << fval << " invF = " << invFval << " grad = " << mfg[j] << " par[j] = " << par[j] << std::endl;
+ // std::cout << " nan : dfj = " << dfj << " fval = " << fval << " invF = " << invFval << " grad = " << mfg[j] << " par[j] = " << par[j] << std::endl;
//std::cout << " x = " << currentPosition[0] << " par[j] = " << par[j] << " : dfj = " << dfj << " fval = " << fval << " invF = " << invFval << " grad = " << mfg[j] << " deriv = " << grad[j] << std::endl;
@@ -148,9 +148,9 @@ void FumiliStandardMaximumLikelihoodFCN::EvaluateAll( const std::vector<double>
h[idx] += dfj * dfk;
- // if ( ( ! ( h[idx] > 0) && ! ( h[idx] <= 0 ) ) )
- // std::cout << " nan : dfj = " << dfj << " fval = " << fval << " invF = " << invFval << " gradj = " << mfg[j]
- // << " dfk = " << dfk << " gradk = "<< mfg[k] << " hess_jk = " << h[idx] << " par[k] = " << par[k] << std::endl;
+ // if ( ( ! ( h[idx] > 0) && ! ( h[idx] <= 0 ) ) )
+ // std::cout << " nan : dfj = " << dfj << " fval = " << fval << " invF = " << invFval << " gradj = " << mfg[j]
+ // << " dfk = " << dfk << " gradk = "<< mfg[k] << " hess_jk = " << h[idx] << " par[k] = " << par[k] << std::endl;
}
} // end param loop
diff --git a/math/minuit2/src/MnLineSearch.cxx b/math/minuit2/src/MnLineSearch.cxx
index 777a0cbdbda..78ea04d066c 100644
--- a/math/minuit2/src/MnLineSearch.cxx
+++ b/math/minuit2/src/MnLineSearch.cxx
@@ -267,9 +267,9 @@ MnParabolaPoint MnLineSearch::operator()(const MnFcn& fcn, const MinimumParamete
if(fabs(p0.X() - slam) < toler9 ||
fabs(p1.X() - slam) < toler9 ||
fabs(p2.X() - slam) < toler9) {
- // std::cout<<"f1, f2, f3= "<<p0.Y()<<", "<<p1.Y()<<", "<<p2.Y()<<std::endl;
- // std::cout<<"x1, x2, x3= "<<p0.X()<<", "<<p1.X()<<", "<<p2.X()<<std::endl;
- // std::cout<<"x, f= "<<xvmin<<", "<<fvmin<<std::endl;
+ // std::cout<<"f1, f2, f3= "<<p0.Y()<<", "<<p1.Y()<<", "<<p2.Y()<<std::endl;
+ // std::cout<<"x1, x2, x3= "<<p0.X()<<", "<<p1.X()<<", "<<p2.X()<<std::endl;
+ // std::cout<<"x, f= "<<xvmin<<", "<<fvmin<<std::endl;
return MnParabolaPoint(xvmin, fvmin);
}
@@ -284,13 +284,13 @@ MnParabolaPoint MnLineSearch::operator()(const MnFcn& fcn, const MinimumParamete
// if latest point worse than all three previous, cut step
if(f3 > p0.Y() && f3 > p1.Y() && f3 > p2.Y()) {
if (debug) {
- std::cout<<"f3 worse than all three previous"<<std::endl;
+ std::cout<<"f3 worse than all three previous"<<std::endl;
}
if(slam > xvmin) overal = std::min(overal, slam-toler8);
- if(slam < xvmin) undral = std::max(undral, slam+toler8);
+ if(slam < xvmin) undral = std::max(undral, slam+toler8);
slam = 0.5*(slam + xvmin);
if (debug) {
- std::cout<<"new slam= "<<slam<<std::endl;
+ std::cout<<"new slam= "<<slam<<std::endl;
}
iterate = true;
niter++;
@@ -312,7 +312,7 @@ MnParabolaPoint MnLineSearch::operator()(const MnFcn& fcn, const MinimumParamete
xvmin = slam;
} else {
if(slam > xvmin) overal = std::min(overal, slam-toler8);
- if(slam < xvmin) undral = std::max(undral, slam+toler8);
+ if(slam < xvmin) undral = std::max(undral, slam+toler8);
}
niter++;
diff --git a/math/minuit2/src/MnPrint.cxx b/math/minuit2/src/MnPrint.cxx
index 6663a694e89..d433ca69d90 100644
--- a/math/minuit2/src/MnPrint.cxx
+++ b/math/minuit2/src/MnPrint.cxx
@@ -181,7 +181,7 @@ std::ostream& operator<<(std::ostream& os, const MnUserCovariance& matrix) {
for (unsigned int i = 0; i < n; i++) {
double di = matrix(i,i);
for (unsigned int j = 0; j < n; j++) {
- double dj = matrix(j,j);
+ double dj = matrix(j,j);
os.width(13); os << matrix(i,j)/sqrt(fabs(di*dj));
}
os << std::endl;
diff --git a/math/minuit2/src/MnSeedGenerator.cxx b/math/minuit2/src/MnSeedGenerator.cxx
index 2ed1e7b86b0..2d8a53b9e06 100644
--- a/math/minuit2/src/MnSeedGenerator.cxx
+++ b/math/minuit2/src/MnSeedGenerator.cxx
@@ -75,11 +75,11 @@ MinimumSeed MnSeedGenerator::operator()(const MnFcn& fcn, const GradientCalculat
MnAlgebraicSymMatrix mat(n);
double dcovar = 1.;
if(st.HasCovariance()) {
- for(unsigned int i = 0; i < n; i++)
+ for(unsigned int i = 0; i < n; i++)
for(unsigned int j = i; j < n; j++) mat(i,j) = st.IntCovariance()(i,j);
dcovar = 0.;
} else {
- for(unsigned int i = 0; i < n; i++)
+ for(unsigned int i = 0; i < n; i++)
mat(i,i) = (fabs(dgrad.G2()(i)) > prec.Eps2() ? 1./dgrad.G2()(i) : 1.);
}
MinimumError err(mat, dcovar);
@@ -170,11 +170,11 @@ MinimumSeed MnSeedGenerator::operator()(const MnFcn& fcn, const AnalyticalGradie
MnAlgebraicSymMatrix mat(n);
double dcovar = 1.;
if(st.HasCovariance()) {
- for(unsigned int i = 0; i < n; i++)
+ for(unsigned int i = 0; i < n; i++)
for(unsigned int j = i; j < n; j++) mat(i,j) = st.IntCovariance()(i,j);
dcovar = 0.;
} else {
- for(unsigned int i = 0; i < n; i++)
+ for(unsigned int i = 0; i < n; i++)
mat(i,i) = (fabs(dgrad.G2()(i)) > prec.Eps2() ? 1./dgrad.G2()(i) : 1.);
}
MinimumError err(mat, dcovar);
diff --git a/math/minuit2/src/MnUserTransformation.cxx b/math/minuit2/src/MnUserTransformation.cxx
index 4b26d616faa..6e2a304a1de 100644
--- a/math/minuit2/src/MnUserTransformation.cxx
+++ b/math/minuit2/src/MnUserTransformation.cxx
@@ -146,7 +146,7 @@ MnUserCovariance MnUserTransformation::Int2extCovariance(const MnAlgebraicVector
for(unsigned int j = i; j < vec.size(); j++) {
double dxdj = 1.;
if(fParameters[fExtOfInt[j]].HasLimits()) {
- // dxdj = 0.5*fabs((fParameters[fExtOfInt[j]].Upper() - fParameters[fExtOfInt[j]].Lower())*cos(vec(j)));
+ // dxdj = 0.5*fabs((fParameters[fExtOfInt[j]].Upper() - fParameters[fExtOfInt[j]].Lower())*cos(vec(j)));
dxdj = DInt2Ext(j, vec(j));
}
result(i,j) = dxdi*cov(i,j)*dxdj;
diff --git a/math/minuit2/src/NegativeG2LineSearch.cxx b/math/minuit2/src/NegativeG2LineSearch.cxx
index 4c0ca45e52a..8abb0b69fa2 100644
--- a/math/minuit2/src/NegativeG2LineSearch.cxx
+++ b/math/minuit2/src/NegativeG2LineSearch.cxx
@@ -103,7 +103,7 @@ MinimumState NegativeG2LineSearch::operator()(const MnFcn& fcn, const MinimumSta
} while(iter++ < 2*n && iterate);
MnAlgebraicSymMatrix mat(n);
- for(unsigned int i = 0; i < n; i++)
+ for(unsigned int i = 0; i < n; i++)
mat(i,i) = (fabs(dgrad.G2()(i)) > prec.Eps2() ? 1./dgrad.G2()(i) : 1.);
MinimumError err(mat, 1.);
diff --git a/math/minuit2/src/Numerical2PGradientCalculator.cxx b/math/minuit2/src/Numerical2PGradientCalculator.cxx
index 21e971d58d3..eeb8699273a 100644
--- a/math/minuit2/src/Numerical2PGradientCalculator.cxx
+++ b/math/minuit2/src/Numerical2PGradientCalculator.cxx
@@ -160,9 +160,9 @@ FunctionGradient Numerical2PGradientCalculator::operator()(const MinimumParamete
// std::cout<<" "<<step<<std::endl;
// std::cout<<"step: "<<step<<std::endl;
if(fabs((step-stepb4)/step) < StepTolerance()) {
- // std::cout<<"(step-stepb4)/step"<<std::endl;
- // std::cout<<"j= "<<j<<std::endl;
- // std::cout<<"step= "<<step<<std::endl;
+ // std::cout<<"(step-stepb4)/step"<<std::endl;
+ // std::cout<<"j= "<<j<<std::endl;
+ // std::cout<<"step= "<<step<<std::endl;
break;
}
gstep(i) = step;
@@ -190,10 +190,10 @@ FunctionGradient Numerical2PGradientCalculator::operator()(const MinimumParamete
#endif
if(fabs(grdb4-grd(i))/(fabs(grd(i))+dfmin/step) < GradTolerance()) {
- // std::cout<<"j= "<<j<<std::endl;
- // std::cout<<"step= "<<step<<std::endl;
- // std::cout<<"fs1, fs2: "<<fs1<<" "<<fs2<<std::endl;
- // std::cout<<"fs1-fs2: "<<fs1-fs2<<std::endl;
+ // std::cout<<"j= "<<j<<std::endl;
+ // std::cout<<"step= "<<step<<std::endl;
+ // std::cout<<"fs1, fs2: "<<fs1<<" "<<fs2<<std::endl;
+ // std::cout<<"fs1-fs2: "<<fs1-fs2<<std::endl;
break;
}
}
diff --git a/math/minuit2/src/SimplexSeedGenerator.cxx b/math/minuit2/src/SimplexSeedGenerator.cxx
index 04ff7c45be7..4db48623468 100644
--- a/math/minuit2/src/SimplexSeedGenerator.cxx
+++ b/math/minuit2/src/SimplexSeedGenerator.cxx
@@ -35,13 +35,13 @@ MinimumSeed SimplexSeedGenerator::operator()(const MnFcn& fcn, const GradientCal
FunctionGradient dgrad = igc(pa);
MnAlgebraicSymMatrix mat(n);
double dcovar = 1.;
- for(unsigned int i = 0; i < n; i++)
+ for(unsigned int i = 0; i < n; i++)
mat(i,i) = (fabs(dgrad.G2()(i)) > prec.Eps2() ? 1./dgrad.G2()(i) : 1.);
MinimumError err(mat, dcovar);
double edm = VariableMetricEDMEstimator().Estimate(dgrad, err);
MinimumState state(pa, err, dgrad, edm, fcn.NumOfCalls());
- return MinimumSeed(state, st.Trafo());
+ return MinimumSeed(state, st.Trafo());
}
MinimumSeed SimplexSeedGenerator::operator()(const MnFcn& fcn, const AnalyticalGradientCalculator& gc, const MnUserParameterState& st, const MnStrategy& stra) const {
diff --git a/math/minuit2/src/mndasum.cxx b/math/minuit2/src/mndasum.cxx
index 726685ada88..727d3afb867 100644
--- a/math/minuit2/src/mndasum.cxx
+++ b/math/minuit2/src/mndasum.cxx
@@ -9,7 +9,7 @@
/* dasum.f -- translated by f2c (version 20010320).
You must link the resulting object file with the libraries:
- -lf2c -lm (in that order)
+ -lf2c -lm (in that order)
*/
#include <math.h>
diff --git a/math/minuit2/src/mndaxpy.cxx b/math/minuit2/src/mndaxpy.cxx
index b30e18e6239..16e2723a39e 100644
--- a/math/minuit2/src/mndaxpy.cxx
+++ b/math/minuit2/src/mndaxpy.cxx
@@ -9,7 +9,7 @@
/* daxpy.f -- translated by f2c (version 20010320).
You must link the resulting object file with the libraries:
- -lf2c -lm (in that order)
+ -lf2c -lm (in that order)
*/
namespace ROOT {
diff --git a/math/minuit2/src/mnddot.cxx b/math/minuit2/src/mnddot.cxx
index 149d8b0092a..860f1e43f8e 100644
--- a/math/minuit2/src/mnddot.cxx
+++ b/math/minuit2/src/mnddot.cxx
@@ -9,7 +9,7 @@
/* ddot.f -- translated by f2c (version 20010320).
You must link the resulting object file with the libraries:
- -lf2c -lm (in that order)
+ -lf2c -lm (in that order)
*/
namespace ROOT {
diff --git a/math/minuit2/src/mndscal.cxx b/math/minuit2/src/mndscal.cxx
index e8aef9b75e6..0ef64770164 100644
--- a/math/minuit2/src/mndscal.cxx
+++ b/math/minuit2/src/mndscal.cxx
@@ -9,7 +9,7 @@
/* dscal.f -- translated by f2c (version 20010320).
You must link the resulting object file with the libraries:
- -lf2c -lm (in that order)
+ -lf2c -lm (in that order)
*/
namespace ROOT {
diff --git a/math/minuit2/src/mndspmv.cxx b/math/minuit2/src/mndspmv.cxx
index 203c4aa65be..f726181a83a 100644
--- a/math/minuit2/src/mndspmv.cxx
+++ b/math/minuit2/src/mndspmv.cxx
@@ -9,7 +9,7 @@
/* dspmv.f -- translated by f2c (version 20010320).
You must link the resulting object file with the libraries:
- -lf2c -lm (in that order)
+ -lf2c -lm (in that order)
*/
namespace ROOT {
diff --git a/math/minuit2/src/mndspr.cxx b/math/minuit2/src/mndspr.cxx
index 061db9130ff..a0d8a26bffd 100644
--- a/math/minuit2/src/mndspr.cxx
+++ b/math/minuit2/src/mndspr.cxx
@@ -9,7 +9,7 @@
/* dspr.f -- translated by f2c (version 20010320).
You must link the resulting object file with the libraries:
- -lf2c -lm (in that order)
+ -lf2c -lm (in that order)
*/
namespace ROOT {
@@ -127,7 +127,7 @@ int mndspr(const char* uplo, unsigned int n, double alpha,
info = 1;
}
// else if (n < 0) {
- // info = 2;
+ // info = 2;
// }
else if (incx == 0) {
info = 5;
diff --git a/math/minuit2/src/mnlsame.cxx b/math/minuit2/src/mnlsame.cxx
index f427a268e66..71bc98ba698 100644
--- a/math/minuit2/src/mnlsame.cxx
+++ b/math/minuit2/src/mnlsame.cxx
@@ -9,7 +9,7 @@
/* lsame.f -- translated by f2c (version 20010320).
You must link the resulting object file with the libraries:
- -lf2c -lm (in that order)
+ -lf2c -lm (in that order)
*/
#include <string.h>
diff --git a/math/minuit2/src/mntplot.cxx b/math/minuit2/src/mntplot.cxx
index 2a5f03f2e4e..1405165c39e 100644
--- a/math/minuit2/src/mntplot.cxx
+++ b/math/minuit2/src/mntplot.cxx
@@ -9,7 +9,7 @@
/* mnplot.F -- translated by f2c (version 20010320).
You must link the resulting object file with the libraries:
- -lf2c -lm (in that order)
+ -lf2c -lm (in that order)
*/
#include <math.h>
@@ -159,7 +159,7 @@ L350:
printf(" %s",(const char*)ctemp);
goto L400;
L380:
- // ctemp = cline;
+ // ctemp = cline;
memcpy(ctemp, cline, 120);
printf(" %14.7g ..%s",yprt,(const char*)ctemp);
linodd = 0;
diff --git a/math/minuit2/src/mnxerbla.cxx b/math/minuit2/src/mnxerbla.cxx
index c42a87aa304..2e11ee9345e 100644
--- a/math/minuit2/src/mnxerbla.cxx
+++ b/math/minuit2/src/mnxerbla.cxx
@@ -9,7 +9,7 @@
/* xerbla.f -- translated by f2c (version 20010320).
You must link the resulting object file with the libraries:
- -lf2c -lm (in that order)
+ -lf2c -lm (in that order)
*/
#include "Minuit2/MnConfig.h"
diff --git a/math/minuit2/test/MnSim/GaussFcn.h b/math/minuit2/test/MnSim/GaussFcn.h
index cef55344694..a778c607762 100644
--- a/math/minuit2/test/MnSim/GaussFcn.h
+++ b/math/minuit2/test/MnSim/GaussFcn.h
@@ -24,11 +24,11 @@ class GaussFcn : public FCNBase {
public:
GaussFcn(const std::vector<double>& meas,
- const std::vector<double>& pos,
- const std::vector<double>& mvar) : fMeasurements(meas),
- fPositions(pos),
- fMVariances(mvar),
- fErrorDef(1.) {}
+ const std::vector<double>& pos,
+ const std::vector<double>& mvar) : fMeasurements(meas),
+ fPositions(pos),
+ fMVariances(mvar),
+ fErrorDef(1.) {}
~GaussFcn() {}
diff --git a/math/minuit2/test/MnSim/GaussFcn2.h b/math/minuit2/test/MnSim/GaussFcn2.h
index bb9d2170794..111d7c3b098 100644
--- a/math/minuit2/test/MnSim/GaussFcn2.h
+++ b/math/minuit2/test/MnSim/GaussFcn2.h
@@ -24,11 +24,11 @@ class GaussFcn2 : public FCNBase {
public:
GaussFcn2(const std::vector<double>& meas,
- const std::vector<double>& pos,
- const std::vector<double>& mvar) : fMeasurements(meas),
- fPositions(pos),
- fMVariances(mvar),
- fMin(0.) {Init();}
+ const std::vector<double>& pos,
+ const std::vector<double>& mvar) : fMeasurements(meas),
+ fPositions(pos),
+ fMVariances(mvar),
+ fMin(0.) {Init();}
~GaussFcn2() {}
virtual void Init();
diff --git a/math/minuit2/test/MnSim/PaulTest4.cxx b/math/minuit2/test/MnSim/PaulTest4.cxx
index ccc898eaac8..6259769f2ee 100644
--- a/math/minuit2/test/MnSim/PaulTest4.cxx
+++ b/math/minuit2/test/MnSim/PaulTest4.cxx
@@ -50,10 +50,10 @@ class PowerLawChi2FCN : public FCNBase {
public:
PowerLawChi2FCN(const std::vector<double>& meas,
- const std::vector<double>& pos,
- const std::vector<double>& mvar) : fMeasurements(meas),
- fPositions(pos),
- fMVariances(mvar) {}
+ const std::vector<double>& pos,
+ const std::vector<double>& mvar) : fMeasurements(meas),
+ fPositions(pos),
+ fMVariances(mvar) {}
~PowerLawChi2FCN() {}
@@ -82,8 +82,8 @@ class PowerLawLogLikeFCN : public FCNBase {
public:
PowerLawLogLikeFCN(const std::vector<double>& meas,
- const std::vector<double>& pos) :
- fMeasurements(meas), fPositions(pos) {}
+ const std::vector<double>& pos) :
+ fMeasurements(meas), fPositions(pos) {}
~PowerLawLogLikeFCN() {}
diff --git a/math/minuit2/test/MnSim/ReneTest.cxx b/math/minuit2/test/MnSim/ReneTest.cxx
index 16ce645fc57..008fcd95655 100644
--- a/math/minuit2/test/MnSim/ReneTest.cxx
+++ b/math/minuit2/test/MnSim/ReneTest.cxx
@@ -80,7 +80,7 @@ public:
virtual double operator()(const std::vector<double>& par) const {
double mypar[6];
for(std::vector<double>::const_iterator ipar = par.begin();
- ipar != par.end(); ipar++)
+ ipar != par.end(); ipar++)
mypar[ipar-par.begin()] = par[ipar-par.begin()];
double fval = 0.;
int iflag = 4;
@@ -102,43 +102,43 @@ private:
int main() {
/*
double tmp[60] = {6., 1.,10.,12., 6.,13.,23.,22.,15.,21.,
- 23.,26.,36.,25.,27.,35.,40.,44.,66.,81.,
- 75.,57.,48.,45.,46.,41.,35.,36.,53.,32.,
- 40.,37.,38.,31.,36.,44.,42.,37.,32.,32.,
- 43.,44.,35.,33.,33.,39.,29.,41.,32.,44.,
- 26.,39.,29.,35.,32.,21.,21.,15.,25.,15.};
+ 23.,26.,36.,25.,27.,35.,40.,44.,66.,81.,
+ 75.,57.,48.,45.,46.,41.,35.,36.,53.,32.,
+ 40.,37.,38.,31.,36.,44.,42.,37.,32.,32.,
+ 43.,44.,35.,33.,33.,39.,29.,41.,32.,44.,
+ 26.,39.,29.,35.,32.,21.,21.,15.,25.,15.};
std::vector<double> measurements(tmp, tmp+60);
*/
/*
double tmp[120] = {2.,1.,1.,0.,1.,1.,0.,1.,3.,0.,0.,1.,0.,
- 1.,1.,0.,0.,1.,0.,0.,0.,0.,2.,1.,1.,2.,
- 2.,0.,2.,4.,2.,6.,2.,1.,4.,0.,3.,6.,16.,
- 30.,34.,18.,8.,2.,3.,4.,4.,5.,6.,3.,5.,
- 0.,1.,1.,7.,3.,2.,5.,1.,3.,5.,3.,2.,3.,
- 2.,2.,1.,1.,5.,2.,3.,7.,2.,7.,6.,5.,1.,
- 4.,5.,0.,6.,3.,4.,3.,3.,6.,8.,8.,3.,4.,
- 4.,8.,9.,7.,3.,4.,6.,2.,5.,10.,7.,6.,4.,
- 4.,7.,7.,5.,4.,12.,4.,6.,3.,7.,4.,3.,4.,
- 3,10.,8.,7.};
+ 1.,1.,0.,0.,1.,0.,0.,0.,0.,2.,1.,1.,2.,
+ 2.,0.,2.,4.,2.,6.,2.,1.,4.,0.,3.,6.,16.,
+ 30.,34.,18.,8.,2.,3.,4.,4.,5.,6.,3.,5.,
+ 0.,1.,1.,7.,3.,2.,5.,1.,3.,5.,3.,2.,3.,
+ 2.,2.,1.,1.,5.,2.,3.,7.,2.,7.,6.,5.,1.,
+ 4.,5.,0.,6.,3.,4.,3.,3.,6.,8.,8.,3.,4.,
+ 4.,8.,9.,7.,3.,4.,6.,2.,5.,10.,7.,6.,4.,
+ 4.,7.,7.,5.,4.,12.,4.,6.,3.,7.,4.,3.,4.,
+ 3,10.,8.,7.};
*/
double tmp[120] = {38.,36.,46.,52.,54.,52.,61.,52.,64.,77.,
- 60.,56.,78.,71.,81.,83.,89.,96.,118.,96.,
- 109.,111.,107.,107.,135.,156.,196.,137.,
- 160.,153.,185.,222.,251.,270.,329.,422.,
- 543.,832.,1390.,2835.,3462.,2030.,1130.,
- 657.,469.,411.,375.,295.,281.,281.,289.,
- 273.,297.,256.,274.,287.,280.,274.,286.,
- 279.,293.,314.,285.,322.,307.,313.,324.,
- 351.,314.,314.,301.,361.,332.,342.,338.,
- 396.,356.,344.,395.,416.,406.,411.,422.,
- 393.,393.,409.,455.,427.,448.,459.,403.,
- 441.,510.,501.,502.,482.,487.,506.,506.,
- 526.,517.,534.,509.,482.,591.,569.,518.,
- 609.,569.,598.,627.,617.,610.,662.,666.,
- 652.,671.,647.,650.,701.};
+ 60.,56.,78.,71.,81.,83.,89.,96.,118.,96.,
+ 109.,111.,107.,107.,135.,156.,196.,137.,
+ 160.,153.,185.,222.,251.,270.,329.,422.,
+ 543.,832.,1390.,2835.,3462.,2030.,1130.,
+ 657.,469.,411.,375.,295.,281.,281.,289.,
+ 273.,297.,256.,274.,287.,280.,274.,286.,
+ 279.,293.,314.,285.,322.,307.,313.,324.,
+ 351.,314.,314.,301.,361.,332.,342.,338.,
+ 396.,356.,344.,395.,416.,406.,411.,422.,
+ 393.,393.,409.,455.,427.,448.,459.,403.,
+ 441.,510.,501.,502.,482.,487.,506.,506.,
+ 526.,517.,534.,509.,482.,591.,569.,518.,
+ 609.,569.,598.,627.,617.,610.,662.,666.,
+ 652.,671.,647.,650.,701.};
std::vector<double> measurements(tmp, tmp+120);
-
+
ReneFcn fFCN(measurements);
MnUserParameters upar;
diff --git a/math/minuit2/test/testUnbinGausFit.cxx b/math/minuit2/test/testUnbinGausFit.cxx
index aeb05c77cb5..6ef7d398ff7 100644
--- a/math/minuit2/test/testUnbinGausFit.cxx
+++ b/math/minuit2/test/testUnbinGausFit.cxx
@@ -256,13 +256,13 @@ int testNdimFit() {
// generate the true parameters
// for (int j = 0; j < NGaus; ++j) {
-// double a = j+1;
+// double a = j+1;
// double mu = double(j)/NGaus;
// double s = 1.0 + double(j)/NGaus;
// truePar[3*j] = a;
// truePar[3*j+1] = mu;
// truePar[3*j+2] = s;
-// tot += a;
+// tot += a;
// }
truePar[0] = 0.2; // % second gaussian
truePar[1] = 0.05; // % third gaussian ampl
@@ -285,23 +285,23 @@ int testNdimFit() {
std::cout << " True amplitude gaussians " << a << " " << b << " " << c << std::endl;
for (Int_t i=0;i<NPoints;i++) {
for (int j = 0; j < N; ++j) {
- if (r.Rndm() < a ) {
- double mu = truePar[2];
- double s = truePar[3];
- x[j] = r.Gaus(mu,s);
- }
- else if (r.Rndm() < b ) {
- double mu = truePar[4];
- double s = truePar[5];
- x[j] = r.Gaus(mu,s);
- }
- else {
- double mu = truePar[6];
- double s = truePar[7];
- x[j] = r.Gaus(mu,s);
- }
+ if (r.Rndm() < a ) {
+ double mu = truePar[2];
+ double s = truePar[3];
+ x[j] = r.Gaus(mu,s);
+ }
+ else if (r.Rndm() < b ) {
+ double mu = truePar[4];
+ double s = truePar[5];
+ x[j] = r.Gaus(mu,s);
+ }
+ else {
+ double mu = truePar[6];
+ double s = truePar[7];
+ x[j] = r.Gaus(mu,s);
+ }
}
-
+
ev = i;
t1.Fill();
diff --git a/math/mlp/inc/TMultiLayerPerceptron.h b/math/mlp/inc/TMultiLayerPerceptron.h
index f4ab8172bcd..1e0f6e0b289 100644
--- a/math/mlp/inc/TMultiLayerPerceptron.h
+++ b/math/mlp/inc/TMultiLayerPerceptron.h
@@ -179,7 +179,7 @@ class TMultiLayerPerceptron : public TObject {
Int_t fReset; //! number of epochs between two resets of the search direction to the steepest descent - Default=50
Bool_t fTrainingOwner; //! internal flag whether one has to delete fTraining or not
Bool_t fTestOwner; //! internal flag whether one has to delete fTest or not
- ClassDef(TMultiLayerPerceptron, 4) // a Neural Network
+ ClassDef(TMultiLayerPerceptron, 4) // a Neural Network
};
#endif
diff --git a/math/physics/src/TLorentzVector.cxx b/math/physics/src/TLorentzVector.cxx
index 1499f8724b8..5e5d4ad9ae6 100644
--- a/math/physics/src/TLorentzVector.cxx
+++ b/math/physics/src/TLorentzVector.cxx
@@ -357,6 +357,6 @@ void TLorentzVector::Print(Option_t *) const
{
// Print the TLorentz vector components as (x,y,z,t) and (P,eta,phi,E) representations
Printf("(x,y,z,t)=(%f,%f,%f,%f) (P,eta,phi,E)=(%f,%f,%f,%f)",
- fP.x(),fP.y(),fP.z(),fE,
- P(),Eta(),Phi(),fE);
+ fP.x(),fP.y(),fP.z(),fE,
+ P(),Eta(),Phi(),fE);
}
diff --git a/math/physics/src/TRolke.cxx b/math/physics/src/TRolke.cxx
index ca93606483e..07f37ce9b7b 100644
--- a/math/physics/src/TRolke.cxx
+++ b/math/physics/src/TRolke.cxx
@@ -223,7 +223,7 @@ void TRolke::SetPoissonBkgBinomEff(Int_t x, Int_t y, Int_t z, Double_t tau, Int_
// tau : ratio parameter (read TRolke.cxx for details)
// m : number of MC events generated
SetModelParameters(
- x , // Int_t x,
+ x , // Int_t x,
y , // Int_t y,
z , // Int_t z,
0 , // Double_t bm,
@@ -383,7 +383,7 @@ bool TRolke::GetLimits(Double_t& low, Double_t& high)
if ((f_mid<1)||(f_mid>7)) {
std::cerr << "TRolke - Error: Model id "<< f_mid<<std::endl;
if (f_mid<1) {
- std::cerr << "TRolke - Please specify a model with e.g. 'SetGaussBkgGaussEff' (read the docs in Rolke.cxx )"<<std::endl;
+ std::cerr << "TRolke - Please specify a model with e.g. 'SetGaussBkgGaussEff' (read the docs in Rolke.cxx )"<<std::endl;
}
return false;
}
@@ -431,12 +431,12 @@ Double_t TRolke::GetBackground()
break;
case 6:
case 7:
- background = f_b;
+ background = f_b;
break;
default:
- std::cerr << "TRolke::GetBackground(): Model NR: " <<
- f_mid << " unknown"<<std::endl;
- return 0;
+ std::cerr << "TRolke::GetBackground(): Model NR: " <<
+ f_mid << " unknown"<<std::endl;
+ return 0;
}
return background;
}
@@ -633,7 +633,7 @@ Double_t TRolke::CalculateInterval(Int_t x, Int_t y, Int_t z, Double_t bm, Doubl
fNumWarningsDeprecated2++;
}
SetModelParameters(
- x,
+ x,
y,
z,
bm,
@@ -942,9 +942,9 @@ Double_t TRolke::Likelihood(Double_t mu, Int_t x, Int_t y, Int_t z, Double_t bm,
case 7:
return EvalLikeMod7(mu, x, em, sde, b, what);
default:
- std::cerr << "TRolke::Likelihood(...): Model NR: " <<
- f_mid << " unknown"<<std::endl;
- return 0;
+ std::cerr << "TRolke::Likelihood(...): Model NR: " <<
+ f_mid << " unknown"<<std::endl;
+ return 0;
}
return 0;
diff --git a/math/smatrix/doc/SMatrixClass.html b/math/smatrix/doc/SMatrixClass.html
index 2e8d0b8cc98..61408f72bcb 100644
--- a/math/smatrix/doc/SMatrixClass.html
+++ b/math/smatrix/doc/SMatrixClass.html
@@ -1 +1 @@
-// SMatrix example of usage
/**
\page SMatrixDoc SMatrix Class Properties
The template ROOT::Math::SMatrix class has 4 template parameters which define, at compile time, its properties. These are:
<ul>
<li> type of the contained elements, T, for example <em>float</em> or <em>double</em>;</li>
<li>number of rows;</li>
<li> number of columns;</li>
<li>representation type (\ref MatRep). This is a class describing the underlined storage model of the Matrix. Presently exists only two types of this class:
<ol>
<li>ROOT::Math::MatRepStd for a general nrows x ncols matrix. This class is itself a template on the contained type T, the number of rows and the number of columns.
Its data member is an array T[nrows*ncols] containing the matrix data. The data are stored in the row-major C convention.
For example, for a matrix, M, of size 3x3, the data \f$ \left[a_0,a_1,a_2,.......,a_7,a_8 \right] \f$ are stored in the following order:
\f[
M = \left( \begin{array}{ccc}
a_0 & a_1 & a_2 \\
a_3 & a_4 & a_5 \\
a_6 & a_7 & a_8 \end{array} \right)
\f] </li>
<li>ROOT::Math::MatRepSym for a symmetric matrix of size NxN. This class is a template on the contained type and on the symmetric matrix size, N.
It has as data member an array of type T of size N*(N+1)/2, containing the lower diagonal block of the matrix.
The order follows the lower diagonal block, still in a row-major convention.
For example for a symmetric 3x3 matrix the order of the 6 elements \f$ \left[a_0,a_1.....a_5 \right]\f$ is:
\f[
M = \left( \begin{array}{ccc}
a_0 & a_1 & a_3 \\
a_1 & a_2 & a_4 \\
a_3 & a_4 & a_5 \end{array} \right)
\f]
</li>
</ol>
</li>
</ul>
<h3>Creating a matrix</h3>
The following constructors are available to create a matrix:
<ul>
<li>Default constructor for a zero matrix (all elements equal to zero).</li>
<li>Constructor of an identity matrix.</li>
<li>Copy constructor (and assignment) for a matrix with the same representation, or from a different one when possible, for example from a symmetric to a general matrix. </li>
<li>Constructor (and assignment) from a matrix expression, like D = A*B + C. Due to the expression template technique, no temporary objects are created in this operation. In the case of an operation like A = A*B + C, a temporary object is needed and it is created automatically to store the intermediary result in order to preserve the validity of this operation. </li>
<li>Constructor from a generic STL-like iterator copying the data referred by the iterator, following its order.
It is both possible to specify the <em>begin</em> and <em>end</em> of the iterator or the <em>begin</em> and the size. In case of a symmetric matrix, it is required only the triangular block and the user can specify whether giving a block representing the lower (default case) or the upper diagonal part.</li>
<li>Constructor of a symmetric matrix NxN passing a ROOT::Math::SVector with dimension N*(N+1)/2 containing
the lower (or upper) block data elements.
</ul>
<p>
Here are some examples on how to create a matrix. We use <em>typedef's</em> in the following examples to avoid the full C++ names for the matrix classes.
Notice that for a general matrix the representation has the default value, ROOT::Math::MatRepStd, and it is not needed to be specified. Furtheremore, for a general square matrix, the number of column may be as well omitted.
</p>
<pre>
<em>// typedef definitions used in the following declarations</em>
typedef ROOT::Math::SMatrix<double,3> SMatrix33;
typedef ROOT::Math::SMatrix<double,2> SMatrix22;
typedef ROOT::Math::SMatrix<double,3,3,ROOT::Math::MatRepSym<double,3> > SMatrixSym3;
typedef ROOT::Math::SVector>double,2> SVector2;
typedef ROOT::Math::SVector>double,3> SVector3;
typedef ROOT::Math::SVector>double,6> SVector6;
SMatrix33 m0; <em>// create a zero 3x3 matrix</em>
<em>// create an 3x3 identity matrix </em>
SMatrix33 i = ROOT::Math::SMatrixIdentity();
double a[9] = {1,2,3,4,5,6,7,8,9}; <em>// input matrix data</em>
SMatrix33 m(a,9); <em>// create a matrix using the a[] data</em>
<em>// this will produce the 3x3 matrix
// ( 1 2 3
// 4 5 6
// 7 8 9 )</em>
</pre>
Example to create a symmetric matrix from an <em>std::vector</em>:
<pre>
std::vector<double> v(6);
for (int i = 0; i<6; ++i) v[i] = double(i+1);
SMatrixSym3 s(v.begin(),v.end())
<em>// this will produce the symmetric matrix
// ( 1 2 4
// 2 3 5
// 4 5 6 )</em>
<em>// create a a general matrix from a symmetric matrix. The opposite will not compile</em>
SMatrix33 m2 = s;
</pre>
Example to create a symmetric matrix from a ROOT::Math::SVector contining the lower/upper data block:
<pre>
ROOT::Math::SVectorr<double, 6> v(1,2,3,4,5,6);
SMatrixSym3 s1(v); // lower block (default)
// this will produce the symmetric matrix
// ( 1 2 4
// 2 3 5
// 4 5 6 )
SMatrixSym3 s2(v,false); // upper block
// this will produce the symmetric matrix
// ( 1 2 3
// 2 4 5
// 3 5 6 )
</pre>
<h3>Accessing and Setting Methods</h3>
The matrix elements can be set using the <em>operator()(irow,icol)</em>, where irow and icol are the row and column indexes or by using the iterator interface. Notice that the indexes start from zero and not from one as in FORTRAN.
All the matrix elements can be set also by using the ROOT::Math::SetElements function passing a generic iterator.
<br>
The elements can be accessed by these same methods and also by using the ROOT::Math::SMatrix::apply function. The <em>apply(i)</em> function has exactly the same behavior for general and symmetric matrices, in contrast to the iterator access methods which behave differently (it follows the data order).
<pre>
SMatrix33 m;
m(0,0) = 1; <em> // set the element in first row and first column</em>
*(m.<strong>begin</strong>()+1) = 2; <em>// set the second element (0,1)</em>
double d[9]={1,2,3,4,5,6,7,8,9};
m.SetElements(d,d+9); <em>// set the d[] values in m</em>
double x = m(2,1); <em>// return the element in third row and first column</em>
x = m.<strong>apply</strong>(7); <em>// return the 8-th element (row=2,col=1) </em>
x = *(m.<strong>begin</strong>()+7); <em>// return the 8-th element (row=2,col=1)</em>
<em>// symmetric matrices (note the difference in behavior between apply and the iterators)</em>
x = *(m.<strong>begin</strong>()+4) <em>// return the element (row=2,col=1). </em>
x = m.<strong>apply</strong>(7); <em>// returns again the (row=2,col=1) element</em>
</pre>
There are methods to place and/or retrieve ROOT::Math::SVector objects as rows or columns in (from) a matrix. In addition one can put (get) a sub-matrix as another ROOT::Math::SMatrix object in a matrix.
If the size of the the sub-vector or sub-matrix are larger than the matrix size a static assert ( a compilation error) is produced.
The non-const methods are:
<pre>
SMatrix33 m;
SVector2 v2(1,2);
<em>// place a vector of size 2 in the first row starting from element (0,1) : m(0,1) = v2[0]</em>
m.<strong>Place_in_row</strong>(v2,0,1);
<em>// place the vector in the second column from (0,1) : m(0,1) = v2[0] </em>
m.<strong>Place in_col</strong>(v2,0,1);
SMatrix22 m2;
<em>// place the sub-matrix m2 in m starting from the element (1,1) : m(1,1) = m2(0,0) </em>
m.<strong>Place_at</strong>(m2,1,1);
SVector3 v3(1,2,3);
<em>// set v3 as the diagonal elements of m : m(i,i) = v3[i] for i=0,1,2</em>
m.<strong>SetDiagonal</strong>(v3) </pre>
The const methods retrieving contents (getting slices of a matrix) are:
<pre>
a = {1,2,3,4,5,6,7,8,9};
SMatrix33 m(a,a+9);
SVector3 irow = m.<strong>Row</strong>(0); <em>// return as vector the first matrix row </em>
SVector3 jcol = m.<strong>Col</strong>(1); <em>// return as vector the second matrix column </em>
<em>// return a slice of the first row from element (0,1) : r2[0] = m(0,1); r2[1] = m(0,2)</em>
SVector2 r2 = m.<strong>SubRow</strong><SVector2> (0,1);
<em>// return a slice of the second column from element (0,1) : c2[0] = m(0,1); c2[1] = m(1,1);</em>
SVector2 c2 = m.<strong>SubCol</strong><SVector2> (1,0);
<em>// return a sub-matrix 2x2 with the upper left corner at the values (1,1)</em>
SMatrix22 subM = m.<strong>Sub</strong><SMatrix22> (1,1);
<em>// return the diagonal element in a SVector</em>
SVector3 diag = m.<strong>Diagonal</strong>();
<em>// return the upper(lower) block of the matrix m</em>
SVector6 vub = m.<strong>UpperBlock</strong>(); <em>// vub = [ 1, 2, 3, 5, 6, 9 ]</em>
SVector6 vlb = m.<strong>LowerBlock</strong>(); <em> // vlb = [ 1, 4, 5, 7, 8, 9 ] </em>
</pre>
<h3>Linear Algebra Functions</h3>
Only limited linear algebra functionality is available for SMatrix. It is possible for squared matrices NxN, to find the inverse or to calculate the determinant. Different inversion algorithms are used if the matrix is smaller than 6x6 or if it is symmetric.
In the case of a small matrix, a faster direct inversion is used. For a large (N > 6) symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine <a href="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f010/top.html">dinv</a>.
<pre>
<em>// Invert a NxN matrix. The inverted matrix replace the existing one and returns if the result is successful</em>
bool ret = m.<strong>Invert</strong>()
<em>// return the inverse matrix of m. If the inversion fails ifail is different than zero</em>
int ifail = 0;
mInv = m.<strong>Inverse</strong>(ifail);
</pre>
The determinant of a square matrix can be obtained as follows:
<pre>
double det;
<em>// calculate the determinant modyfing the matrix content. Returns if the calculation was successful</em>
bool ret = m.<strong>Det</strong>(det);
<em>// calculate the determinant using a temporary matrix but preserving the matrix content </em>
bool ret = n.<strong>Det2</strong>(det);
</pre>
<br>
For additional Matrix functionality see the \ref MatVecFunctions page
*/
\ No newline at end of file
+// SMatrix example of usage
/**
\page SMatrixDoc SMatrix Class Properties
The template ROOT::Math::SMatrix class has 4 template parameters which define, at compile time, its properties. These are:
<ul>
<li> type of the contained elements, T, for example <em>float</em> or <em>double</em>;</li>
<li>number of rows;</li>
<li> number of columns;</li>
<li>representation type (\ref MatRep). This is a class describing the underlined storage model of the Matrix. Presently exists only two types of this class:
<ol>
<li>ROOT::Math::MatRepStd for a general nrows x ncols matrix. This class is itself a template on the contained type T, the number of rows and the number of columns.
Its data member is an array T[nrows*ncols] containing the matrix data. The data are stored in the row-major C convention.
For example, for a matrix, M, of size 3x3, the data \f$ \left[a_0,a_1,a_2,.......,a_7,a_8 \right] \f$ are stored in the following order:
\f[
M = \left( \begin{array}{ccc}
a_0 & a_1 & a_2 \\
a_3 & a_4 & a_5 \\
a_6 & a_7 & a_8 \end{array} \right)
\f] </li>
<li>ROOT::Math::MatRepSym for a symmetric matrix of size NxN. This class is a template on the contained type and on the symmetric matrix size, N.
It has as data member an array of type T of size N*(N+1)/2, containing the lower diagonal block of the matrix.
The order follows the lower diagonal block, still in a row-major convention.
For example for a symmetric 3x3 matrix the order of the 6 elements \f$ \left[a_0,a_1.....a_5 \right]\f$ is:
\f[
M = \left( \begin{array}{ccc}
a_0 & a_1 & a_3 \\
a_1 & a_2 & a_4 \\
a_3 & a_4 & a_5 \end{array} \right)
\f]
</li>
</ol>
</li>
</ul>
<h3>Creating a matrix</h3>
The following constructors are available to create a matrix:
<ul>
<li>Default constructor for a zero matrix (all elements equal to zero).</li>
<li>Constructor of an identity matrix.</li>
<li>Copy constructor (and assignment) for a matrix with the same representation, or from a different one when possible, for example from a symmetric to a general matrix. </li>
<li>Constructor (and assignment) from a matrix expression, like D = A*B + C. Due to the expression template technique, no temporary objects are created in this operation. In the case of an operation like A = A*B + C, a temporary object is needed and it is created automatically to store the intermediary result in order to preserve the validity of this operation. </li>
<li>Constructor from a generic STL-like iterator copying the data referred by the iterator, following its order.
It is both possible to specify the <em>begin</em> and <em>end</em> of the iterator or the <em>begin</em> and the size. In case of a symmetric matrix, it is required only the triangular block and the user can specify whether giving a block representing the lower (default case) or the upper diagonal part.</li>
<li>Constructor of a symmetric matrix NxN passing a ROOT::Math::SVector with dimension N*(N+1)/2 containing
the lower (or upper) block data elements.
</ul>
<p>
Here are some examples on how to create a matrix. We use <em>typedef's</em> in the following examples to avoid the full C++ names for the matrix classes.
Notice that for a general matrix the representation has the default value, ROOT::Math::MatRepStd, and it is not needed to be specified. Furtheremore, for a general square matrix, the number of column may be as well omitted.
</p>
<pre>
<em>// typedef definitions used in the following declarations</em>
typedef ROOT::Math::SMatrix<double,3> SMatrix33;
typedef ROOT::Math::SMatrix<double,2> SMatrix22;
typedef ROOT::Math::SMatrix<double,3,3,ROOT::Math::MatRepSym<double,3> > SMatrixSym3;
typedef ROOT::Math::SVector>double,2> SVector2;
typedef ROOT::Math::SVector>double,3> SVector3;
typedef ROOT::Math::SVector>double,6> SVector6;
SMatrix33 m0; <em>// create a zero 3x3 matrix</em>
<em>// create an 3x3 identity matrix </em>
SMatrix33 i = ROOT::Math::SMatrixIdentity();
double a[9] = {1,2,3,4,5,6,7,8,9}; <em>// input matrix data</em>
SMatrix33 m(a,9); <em>// create a matrix using the a[] data</em>
<em>// this will produce the 3x3 matrix
// ( 1 2 3
// 4 5 6
// 7 8 9 )</em>
</pre>
Example to create a symmetric matrix from an <em>std::vector</em>:
<pre>
std::vector<double> v(6);
for (int i = 0; i<6; ++i) v[i] = double(i+1);
SMatrixSym3 s(v.begin(),v.end())
<em>// this will produce the symmetric matrix
// ( 1 2 4
// 2 3 5
// 4 5 6 )</em>
<em>// create a a general matrix from a symmetric matrix. The opposite will not compile</em>
SMatrix33 m2 = s;
</pre>
Example to create a symmetric matrix from a ROOT::Math::SVector contining the lower/upper data block:
<pre>
ROOT::Math::SVectorr<double, 6> v(1,2,3,4,5,6);
SMatrixSym3 s1(v); // lower block (default)
// this will produce the symmetric matrix
// ( 1 2 4
// 2 3 5
// 4 5 6 )
SMatrixSym3 s2(v,false); // upper block
// this will produce the symmetric matrix
// ( 1 2 3
// 2 4 5
// 3 5 6 )
</pre>
<h3>Accessing and Setting Methods</h3>
The matrix elements can be set using the <em>operator()(irow,icol)</em>, where irow and icol are the row and column indexes or by using the iterator interface. Notice that the indexes start from zero and not from one as in FORTRAN.
All the matrix elements can be set also by using the ROOT::Math::SetElements function passing a generic iterator.
<br>
The elements can be accessed by these same methods and also by using the ROOT::Math::SMatrix::apply function. The <em>apply(i)</em> function has exactly the same behavior for general and symmetric matrices, in contrast to the iterator access methods which behave differently (it follows the data order).
<pre>
SMatrix33 m;
m(0,0) = 1; <em> // set the element in first row and first column</em>
*(m.<strong>begin</strong>()+1) = 2; <em>// set the second element (0,1)</em>
double d[9]={1,2,3,4,5,6,7,8,9};
m.SetElements(d,d+9); <em>// set the d[] values in m</em>
double x = m(2,1); <em>// return the element in third row and first column</em>
x = m.<strong>apply</strong>(7); <em>// return the 8-th element (row=2,col=1) </em>
x = *(m.<strong>begin</strong>()+7); <em>// return the 8-th element (row=2,col=1)</em>
<em>// symmetric matrices (note the difference in behavior between apply and the iterators)</em>
x = *(m.<strong>begin</strong>()+4) <em>// return the element (row=2,col=1). </em>
x = m.<strong>apply</strong>(7); <em>// returns again the (row=2,col=1) element</em>
</pre>
There are methods to place and/or retrieve ROOT::Math::SVector objects as rows or columns in (from) a matrix. In addition one can put (get) a sub-matrix as another ROOT::Math::SMatrix object in a matrix.
If the size of the the sub-vector or sub-matrix are larger than the matrix size a static assert ( a compilation error) is produced.
The non-const methods are:
<pre>
SMatrix33 m;
SVector2 v2(1,2);
<em>// place a vector of size 2 in the first row starting from element (0,1) : m(0,1) = v2[0]</em>
m.<strong>Place_in_row</strong>(v2,0,1);
<em>// place the vector in the second column from (0,1) : m(0,1) = v2[0] </em>
m.<strong>Place in_col</strong>(v2,0,1);
SMatrix22 m2;
<em>// place the sub-matrix m2 in m starting from the element (1,1) : m(1,1) = m2(0,0) </em>
m.<strong>Place_at</strong>(m2,1,1);
SVector3 v3(1,2,3);
<em>// set v3 as the diagonal elements of m : m(i,i) = v3[i] for i=0,1,2</em>
m.<strong>SetDiagonal</strong>(v3) </pre>
The const methods retrieving contents (getting slices of a matrix) are:
<pre>
a = {1,2,3,4,5,6,7,8,9};
SMatrix33 m(a,a+9);
SVector3 irow = m.<strong>Row</strong>(0); <em>// return as vector the first matrix row </em>
SVector3 jcol = m.<strong>Col</strong>(1); <em>// return as vector the second matrix column </em>
<em>// return a slice of the first row from element (0,1) : r2[0] = m(0,1); r2[1] = m(0,2)</em>
SVector2 r2 = m.<strong>SubRow</strong><SVector2> (0,1);
<em>// return a slice of the second column from element (0,1) : c2[0] = m(0,1); c2[1] = m(1,1);</em>
SVector2 c2 = m.<strong>SubCol</strong><SVector2> (1,0);
<em>// return a sub-matrix 2x2 with the upper left corner at the values (1,1)</em>
SMatrix22 subM = m.<strong>Sub</strong><SMatrix22> (1,1);
<em>// return the diagonal element in a SVector</em>
SVector3 diag = m.<strong>Diagonal</strong>();
<em>// return the upper(lower) block of the matrix m</em>
SVector6 vub = m.<strong>UpperBlock</strong>(); <em>// vub = [ 1, 2, 3, 5, 6, 9 ]</em>
SVector6 vlb = m.<strong>LowerBlock</strong>(); <em> // vlb = [ 1, 4, 5, 7, 8, 9 ] </em>
</pre>
<h3>Linear Algebra Functions</h3>
Only limited linear algebra functionality is available for SMatrix. It is possible for squared matrices NxN, to find the inverse or to calculate the determinant. Different inversion algorithms are used if the matrix is smaller than 6x6 or if it is symmetric.
In the case of a small matrix, a faster direct inversion is used. For a large (N > 6) symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine <a href="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f010/top.html">dinv</a>.
<pre>
<em>// Invert a NxN matrix. The inverted matrix replace the existing one and returns if the result is successful</em>
bool ret = m.<strong>Invert</strong>()
<em>// return the inverse matrix of m. If the inversion fails ifail is different than zero</em>
int ifail = 0;
mInv = m.<strong>Inverse</strong>(ifail);
</pre>
The determinant of a square matrix can be obtained as follows:
<pre>
double det;
<em>// calculate the determinant modyfing the matrix content. Returns if the calculation was successful</em>
bool ret = m.<strong>Det</strong>(det);
<em>// calculate the determinant using a temporary matrix but preserving the matrix content </em>
bool ret = n.<strong>Det2</strong>(det);
</pre>
<br>
For additional Matrix functionality see the \ref MatVecFunctions page
*/
\ No newline at end of file
diff --git a/math/smatrix/inc/Math/BinaryOpPolicy.h b/math/smatrix/inc/Math/BinaryOpPolicy.h
index ea75a755d8e..f3e04c89094 100644
--- a/math/smatrix/inc/Math/BinaryOpPolicy.h
+++ b/math/smatrix/inc/Math/BinaryOpPolicy.h
@@ -33,8 +33,8 @@ namespace ROOT {
struct MultPolicy
{
enum {
- N1 = R1::kRows,
- N2 = R2::kCols
+ N1 = R1::kRows,
+ N2 = R2::kCols
};
typedef MatRepStd<T, N1, N2> RepType;
};
@@ -46,8 +46,8 @@ namespace ROOT {
struct AddPolicy
{
enum {
- N1 = R1::kRows,
- N2 = R1::kCols
+ N1 = R1::kRows,
+ N2 = R1::kCols
};
typedef MatRepStd<typename R1::value_type, N1, N2 > RepType;
};
@@ -65,8 +65,8 @@ namespace ROOT {
struct TranspPolicy
{
enum {
- N1 = R::kRows,
- N2 = R::kCols
+ N1 = R::kRows,
+ N2 = R::kCols
};
typedef MatRepStd<T, N2, N1> RepType;
};
diff --git a/math/smatrix/inc/Math/CholeskyDecomp.h b/math/smatrix/inc/Math/CholeskyDecomp.h
index 2828a5a5ba4..41d95e4edc9 100644
--- a/math/smatrix/inc/Math/CholeskyDecomp.h
+++ b/math/smatrix/inc/Math/CholeskyDecomp.h
@@ -11,17 +11,17 @@
*
* @author Manuel Schiller
* @date Aug 29 2008
- * initial release inside LHCb
+ * initial release inside LHCb
* @date May 7 2009
- * factored code to provide a nice Cholesky decomposition class, along
- * with separate methods for solving a single linear system and to
- * obtain the inverse matrix from the decomposition
+ * factored code to provide a nice Cholesky decomposition class, along
+ * with separate methods for solving a single linear system and to
+ * obtain the inverse matrix from the decomposition
* @date July 15th 2013
- * provide a version of that class which works if the dimension of the
- * problem is only known at run time
+ * provide a version of that class which works if the dimension of the
+ * problem is only known at run time
* @date September 30th 2013
- * provide routines to access the result of the decomposition L and its
- * inverse
+ * provide routines to access the result of the decomposition L and its
+ * inverse
*/
#include <cmath>
@@ -180,21 +180,21 @@ public:
*/
template<class M> bool getL(M& m) const
{
- if (!fOk) return false;
- for (unsigned i = 0; i < N; ++i) {
- // zero upper half of matrix
- for (unsigned j = i + 1; j < N; ++j)
- m(i, j) = F(0);
- // copy the rest
- for (unsigned j = 0; j <= i; ++j)
- m(i, j) = fL[i * (i + 1) / 2 + j];
- // adjust the diagonal - we save 1/L(i, i) in that position, so
- // convert to what caller expects
- m(i, i) = F(1) / m(i, i);
- }
- return true;
+ if (!fOk) return false;
+ for (unsigned i = 0; i < N; ++i) {
+ // zero upper half of matrix
+ for (unsigned j = i + 1; j < N; ++j)
+ m(i, j) = F(0);
+ // copy the rest
+ for (unsigned j = 0; j <= i; ++j)
+ m(i, j) = fL[i * (i + 1) / 2 + j];
+ // adjust the diagonal - we save 1/L(i, i) in that position, so
+ // convert to what caller expects
+ m(i, i) = F(1) / m(i, i);
+ }
+ return true;
}
-
+
/** @brief obtain the decomposed matrix L
*
* @returns if the decomposition was successful
@@ -205,15 +205,15 @@ public:
*/
template<typename G> bool getL(G* m) const
{
- if (!fOk) return false;
- // copy L
- for (unsigned i = 0; i < (N * (N + 1)) / 2; ++i)
- m[i] = fL[i];
- // adjust diagonal - we save 1/L(i, i) in that position, so convert to
- // what caller expects
- for (unsigned i = 0; i < N; ++i)
- m[(i * (i + 1)) / 2 + i] = F(1) / fL[(i * (i + 1)) / 2 + i];
- return true;
+ if (!fOk) return false;
+ // copy L
+ for (unsigned i = 0; i < (N * (N + 1)) / 2; ++i)
+ m[i] = fL[i];
+ // adjust diagonal - we save 1/L(i, i) in that position, so convert to
+ // what caller expects
+ for (unsigned i = 0; i < N; ++i)
+ m[(i * (i + 1)) / 2 + i] = F(1) / fL[(i * (i + 1)) / 2 + i];
+ return true;
}
/** @brief obtain the inverse of the decomposed matrix L
@@ -224,25 +224,25 @@ public:
*/
template<class M> bool getLi(M& m) const
{
- if (!fOk) return false;
- for (unsigned i = 0; i < N; ++i) {
- // zero lower half of matrix
- for (unsigned j = i + 1; j < N; ++j)
- m(j, i) = F(0);
- // copy the rest
- for (unsigned j = 0; j <= i; ++j)
- m(j, i) = fL[i * (i + 1) / 2 + j];
- }
- // invert the off-diagonal part of what we just copied
- for (unsigned i = 1; i < N; ++i) {
- for (unsigned j = 0; j < i; ++j) {
- typename M::value_type tmp = F(0);
- for (unsigned k = i; k-- > j;)
- tmp -= m(k, i) * m(j, k);
- m(j, i) = tmp * m(i, i);
- }
- }
- return true;
+ if (!fOk) return false;
+ for (unsigned i = 0; i < N; ++i) {
+ // zero lower half of matrix
+ for (unsigned j = i + 1; j < N; ++j)
+ m(j, i) = F(0);
+ // copy the rest
+ for (unsigned j = 0; j <= i; ++j)
+ m(j, i) = fL[i * (i + 1) / 2 + j];
+ }
+ // invert the off-diagonal part of what we just copied
+ for (unsigned i = 1; i < N; ++i) {
+ for (unsigned j = 0; j < i; ++j) {
+ typename M::value_type tmp = F(0);
+ for (unsigned k = i; k-- > j;)
+ tmp -= m(k, i) * m(j, k);
+ m(j, i) = tmp * m(i, i);
+ }
+ }
+ return true;
}
/** @brief obtain the inverse of the decomposed matrix L
@@ -255,22 +255,22 @@ public:
*/
template<typename G> bool getLi(G* m) const
{
- if (!fOk) return false;
- // copy L
- for (unsigned i = 0; i < (N * (N + 1)) / 2; ++i)
- m[i] = fL[i];
- // invert the off-diagonal part of what we just copied
- G* base1 = &m[1];
- for (unsigned i = 1; i < N; base1 += ++i) {
- for (unsigned j = 0; j < i; ++j) {
- G tmp = F(0);
- const G *base2 = &m[(i * (i - 1)) / 2];
- for (unsigned k = i; k-- > j; base2 -= k)
- tmp -= base1[k] * base2[j];
- base1[j] = tmp * base1[i];
- }
- }
- return true;
+ if (!fOk) return false;
+ // copy L
+ for (unsigned i = 0; i < (N * (N + 1)) / 2; ++i)
+ m[i] = fL[i];
+ // invert the off-diagonal part of what we just copied
+ G* base1 = &m[1];
+ for (unsigned i = 1; i < N; base1 += ++i) {
+ for (unsigned j = 0; j < i; ++j) {
+ G tmp = F(0);
+ const G *base2 = &m[(i * (i - 1)) / 2];
+ for (unsigned k = i; k-- > j; base2 -= k)
+ tmp -= base1[k] * base2[j];
+ base1[j] = tmp * base1[i];
+ }
+ }
+ return true;
}
};
@@ -418,19 +418,19 @@ public:
*/
template<class M> bool getL(M& m) const
{
- if (!fOk) return false;
- for (unsigned i = 0; i < fN; ++i) {
- // zero upper half of matrix
- for (unsigned j = i + 1; j < fN; ++j)
- m(i, j) = F(0);
- // copy the rest
- for (unsigned j = 0; j <= i; ++j)
- m(i, j) = fL[i * (i + 1) / 2 + j];
- // adjust the diagonal - we save 1/L(i, i) in that position, so
- // convert to what caller expects
- m(i, i) = F(1) / m(i, i);
- }
- return true;
+ if (!fOk) return false;
+ for (unsigned i = 0; i < fN; ++i) {
+ // zero upper half of matrix
+ for (unsigned j = i + 1; j < fN; ++j)
+ m(i, j) = F(0);
+ // copy the rest
+ for (unsigned j = 0; j <= i; ++j)
+ m(i, j) = fL[i * (i + 1) / 2 + j];
+ // adjust the diagonal - we save 1/L(i, i) in that position, so
+ // convert to what caller expects
+ m(i, i) = F(1) / m(i, i);
+ }
+ return true;
}
/** @brief obtain the decomposed matrix L
@@ -446,11 +446,11 @@ public:
if (!fOk) return false;
// copy L
for (unsigned i = 0; i < (fN * (fN + 1)) / 2; ++i)
- m[i] = fL[i];
+ m[i] = fL[i];
// adjust diagonal - we save 1/L(i, i) in that position, so convert to
// what caller expects
for (unsigned i = 0; i < fN; ++i)
- m[(i * (i + 1)) / 2 + i] = F(1) / fL[(i * (i + 1)) / 2 + i];
+ m[(i * (i + 1)) / 2 + i] = F(1) / fL[(i * (i + 1)) / 2 + i];
return true;
}
@@ -462,25 +462,25 @@ public:
*/
template<class M> bool getLi(M& m) const
{
- if (!fOk) return false;
- for (unsigned i = 0; i < fN; ++i) {
- // zero lower half of matrix
- for (unsigned j = i + 1; j < fN; ++j)
- m(j, i) = F(0);
- // copy the rest
- for (unsigned j = 0; j <= i; ++j)
- m(j, i) = fL[i * (i + 1) / 2 + j];
- }
- // invert the off-diagonal part of what we just copied
- for (unsigned i = 1; i < fN; ++i) {
- for (unsigned j = 0; j < i; ++j) {
- typename M::value_type tmp = F(0);
- for (unsigned k = i; k-- > j;)
- tmp -= m(k, i) * m(j, k);
- m(j, i) = tmp * m(i, i);
- }
- }
- return true;
+ if (!fOk) return false;
+ for (unsigned i = 0; i < fN; ++i) {
+ // zero lower half of matrix
+ for (unsigned j = i + 1; j < fN; ++j)
+ m(j, i) = F(0);
+ // copy the rest
+ for (unsigned j = 0; j <= i; ++j)
+ m(j, i) = fL[i * (i + 1) / 2 + j];
+ }
+ // invert the off-diagonal part of what we just copied
+ for (unsigned i = 1; i < fN; ++i) {
+ for (unsigned j = 0; j < i; ++j) {
+ typename M::value_type tmp = F(0);
+ for (unsigned k = i; k-- > j;)
+ tmp -= m(k, i) * m(j, k);
+ m(j, i) = tmp * m(i, i);
+ }
+ }
+ return true;
}
/** @brief obtain the inverse of the decomposed matrix L
@@ -494,21 +494,21 @@ public:
template<typename G> bool getLi(G* m) const
{
if (!fOk) return false;
- // copy L
- for (unsigned i = 0; i < (fN * (fN + 1)) / 2; ++i)
- m[i] = fL[i];
- // invert the off-diagonal part of what we just copied
- G* base1 = &m[1];
- for (unsigned i = 1; i < fN; base1 += ++i) {
- for (unsigned j = 0; j < i; ++j) {
- G tmp = F(0);
- const G *base2 = &m[(i * (i - 1)) / 2];
- for (unsigned k = i; k-- > j; base2 -= k)
- tmp -= base1[k] * base2[j];
- base1[j] = tmp * base1[i];
- }
- }
- return true;
+ // copy L
+ for (unsigned i = 0; i < (fN * (fN + 1)) / 2; ++i)
+ m[i] = fL[i];
+ // invert the off-diagonal part of what we just copied
+ G* base1 = &m[1];
+ for (unsigned i = 1; i < fN; base1 += ++i) {
+ for (unsigned j = 0; j < i; ++j) {
+ G tmp = F(0);
+ const G *base2 = &m[(i * (i - 1)) / 2];
+ for (unsigned k = i; k-- > j; base2 -= k)
+ tmp -= base1[k] * base2[j];
+ base1[j] = tmp * base1[i];
+ }
+ }
+ return true;
}
};
@@ -549,7 +549,7 @@ namespace CholeskyDecompHelpers {
// cache starting address of rows of L for speed reasons
F *base1 = &dst[0];
for (unsigned i = 0; i < N; base1 += ++i) {
- F tmpdiag = F(0.0); // for element on diagonale
+ F tmpdiag = F(0.0); // for element on diagonale
// calculate off-diagonal elements
F *base2 = &dst[0];
for (unsigned j = 0; j < i; base2 += ++j) {
diff --git a/math/smatrix/inc/Math/Dfact.h b/math/smatrix/inc/Math/Dfact.h
index 5b6f976cc25..d052eda5157 100644
--- a/math/smatrix/inc/Math/Dfact.h
+++ b/math/smatrix/inc/Math/Dfact.h
@@ -77,77 +77,77 @@ static bool Dfact(MatRepStd<T,n,idim>& rhs, T& det) {
// fact.inc
- nxch = 0;
- det = 1.;
- for (j = 1; j <= n; ++j) {
- const unsigned int ji = j * idim;
- const unsigned int jj = j + ji;
-
- k = j;
- p = std::abs(rhs[jj + arrayOffset]);
-
- if (j != n) {
- for (i = j + 1; i <= n; ++i) {
- q = std::abs(rhs[i + ji + arrayOffset]);
- if (q > p) {
- k = i;
- p = q;
- }
- } // for i
- if (k != j) {
- for (l = 1; l <= n; ++l) {
- const unsigned int li = l*idim;
- const unsigned int jli = j + li;
- const unsigned int kli = k + li;
- tf = rhs[jli + arrayOffset];
- rhs[jli + arrayOffset] = rhs[kli + arrayOffset];
- rhs[kli + arrayOffset] = tf;
- } // for l
- ++nxch;
- } // if k != j
- } // if j!=n
-
- if (p <= 0.) {
- det = 0;
- return false;
- }
-
- det *= rhs[jj + arrayOffset];
+ nxch = 0;
+ det = 1.;
+ for (j = 1; j <= n; ++j) {
+ const unsigned int ji = j * idim;
+ const unsigned int jj = j + ji;
+
+ k = j;
+ p = std::abs(rhs[jj + arrayOffset]);
+
+ if (j != n) {
+ for (i = j + 1; i <= n; ++i) {
+ q = std::abs(rhs[i + ji + arrayOffset]);
+ if (q > p) {
+ k = i;
+ p = q;
+ }
+ } // for i
+ if (k != j) {
+ for (l = 1; l <= n; ++l) {
+ const unsigned int li = l*idim;
+ const unsigned int jli = j + li;
+ const unsigned int kli = k + li;
+ tf = rhs[jli + arrayOffset];
+ rhs[jli + arrayOffset] = rhs[kli + arrayOffset];
+ rhs[kli + arrayOffset] = tf;
+ } // for l
+ ++nxch;
+ } // if k != j
+ } // if j!=n
+
+ if (p <= 0.) {
+ det = 0;
+ return false;
+ }
+
+ det *= rhs[jj + arrayOffset];
#ifdef XXX
- t = std::abs(det);
- if (t < 1e-19 || t > 1e19) {
- det = 0;
- return false;
- }
+ t = std::abs(det);
+ if (t < 1e-19 || t > 1e19) {
+ det = 0;
+ return false;
+ }
#endif
- // using 1.0f removes a warning on Windows (1.0f is still the same as 1.0)
- rhs[jj + arrayOffset] = 1.0f / rhs[jj + arrayOffset];
- if (j == n) {
- continue;
- }
-
- const unsigned int jm1 = j - 1;
- const unsigned int jpi = (j + 1) * idim;
- const unsigned int jjpi = j + jpi;
-
- for (k = j + 1; k <= n; ++k) {
- const unsigned int ki = k * idim;
- const unsigned int jki = j + ki;
- const unsigned int kji = k + jpi;
- if (j != 1) {
- for (i = 1; i <= jm1; ++i) {
- const unsigned int ii = i * idim;
- rhs[jki + arrayOffset] -= rhs[i + ki + arrayOffset] * rhs[j + ii + arrayOffset];
- rhs[kji + arrayOffset] -= rhs[i + jpi + arrayOffset] * rhs[k + ii + arrayOffset];
- } // for i
+ // using 1.0f removes a warning on Windows (1.0f is still the same as 1.0)
+ rhs[jj + arrayOffset] = 1.0f / rhs[jj + arrayOffset];
+ if (j == n) {
+ continue;
}
- rhs[jki + arrayOffset] *= rhs[jj + arrayOffset];
- rhs[kji + arrayOffset] -= rhs[jjpi + arrayOffset] * rhs[k + ji + arrayOffset];
- } // for k
- } // for j
- if (nxch % 2 != 0) {
- det = -(det);
+ const unsigned int jm1 = j - 1;
+ const unsigned int jpi = (j + 1) * idim;
+ const unsigned int jjpi = j + jpi;
+
+ for (k = j + 1; k <= n; ++k) {
+ const unsigned int ki = k * idim;
+ const unsigned int jki = j + ki;
+ const unsigned int kji = k + jpi;
+ if (j != 1) {
+ for (i = 1; i <= jm1; ++i) {
+ const unsigned int ii = i * idim;
+ rhs[jki + arrayOffset] -= rhs[i + ki + arrayOffset] * rhs[j + ii + arrayOffset];
+ rhs[kji + arrayOffset] -= rhs[i + jpi + arrayOffset] * rhs[k + ii + arrayOffset];
+ } // for i
+ }
+ rhs[jki + arrayOffset] *= rhs[jj + arrayOffset];
+ rhs[kji + arrayOffset] -= rhs[jjpi + arrayOffset] * rhs[k + ji + arrayOffset];
+ } // for k
+ } // for j
+
+ if (nxch % 2 != 0) {
+ det = -(det);
}
return true;
} // end of Dfact
diff --git a/math/smatrix/inc/Math/Dfactir.h b/math/smatrix/inc/Math/Dfactir.h
index 5de3fce624e..7abcde95298 100644
--- a/math/smatrix/inc/Math/Dfactir.h
+++ b/math/smatrix/inc/Math/Dfactir.h
@@ -55,95 +55,95 @@ bool Dfactir(Matrix& rhs, typename Matrix::value_type& det, unsigned int* ir)
/* Initialized data */
- typename Matrix::value_type* a = rhs.Array();
-
- /* Local variables */
- unsigned int nxch, i, j, k, l;
- typename Matrix::value_type p, q, tf;
-
- /* Parameter adjustments */
- a -= idim + 1;
- --ir;
-
- /* Function Body */
-
- // fact.inc
- nxch = 0;
- det = 1.;
- for (j = 1; j <= n; ++j) {
- const unsigned int ji = j * idim;
- const unsigned int jj = j + ji;
-
- k = j;
- p = std::abs(a[jj]);
-
- if (j != n) {
- for (i = j + 1; i <= n; ++i) {
- q = std::abs(a[i + ji]);
- if (q > p) {
- k = i;
- p = q;
- }
- } // for i
-
- if (k != j) {
- for (l = 1; l <= n; ++l) {
- const unsigned int li = l*idim;
- const unsigned int jli = j + li;
- const unsigned int kli = k + li;
- tf = a[jli];
- a[jli] = a[kli];
- a[kli] = tf;
- } // for l
- ++nxch;
- ir[nxch] = (j << 12) + k;
- } // if k != j
- } // if j!=n
-
- if (p <= 0.) {
- det = 0;
- return false;
- }
-
- det *= a[jj];
+ typename Matrix::value_type* a = rhs.Array();
+
+ /* Local variables */
+ unsigned int nxch, i, j, k, l;
+ typename Matrix::value_type p, q, tf;
+
+ /* Parameter adjustments */
+ a -= idim + 1;
+ --ir;
+
+ /* Function Body */
+
+ // fact.inc
+ nxch = 0;
+ det = 1.;
+ for (j = 1; j <= n; ++j) {
+ const unsigned int ji = j * idim;
+ const unsigned int jj = j + ji;
+
+ k = j;
+ p = std::abs(a[jj]);
+
+ if (j != n) {
+ for (i = j + 1; i <= n; ++i) {
+ q = std::abs(a[i + ji]);
+ if (q > p) {
+ k = i;
+ p = q;
+ }
+ } // for i
+
+ if (k != j) {
+ for (l = 1; l <= n; ++l) {
+ const unsigned int li = l*idim;
+ const unsigned int jli = j + li;
+ const unsigned int kli = k + li;
+ tf = a[jli];
+ a[jli] = a[kli];
+ a[kli] = tf;
+ } // for l
+ ++nxch;
+ ir[nxch] = (j << 12) + k;
+ } // if k != j
+ } // if j!=n
+
+ if (p <= 0.) {
+ det = 0;
+ return false;
+ }
+
+ det *= a[jj];
#ifdef XXX
- t = std::abs(det);
- if (t < 1e-19 || t > 1e19) {
- det = 0;
- return false;
- }
+ t = std::abs(det);
+ if (t < 1e-19 || t > 1e19) {
+ det = 0;
+ return false;
+ }
#endif
- a[jj] = 1. / a[jj];
- if (j == n) {
- continue;
- }
-
- const unsigned int jm1 = j - 1;
- const unsigned int jpi = (j + 1) * idim;
- const unsigned int jjpi = j + jpi;
-
- for (k = j + 1; k <= n; ++k) {
- const unsigned int ki = k * idim;
- const unsigned int jki = j + ki;
- const unsigned int kji = k + jpi;
- if (j != 1) {
- for (i = 1; i <= jm1; ++i) {
- const unsigned int ii = i * idim;
- a[jki] -= a[i + ki] * a[j + ii];
- a[kji] -= a[i + jpi] * a[k + ii];
- } // for i
+ a[jj] = 1. / a[jj];
+ if (j == n) {
+ continue;
}
- a[jki] *= a[jj];
- a[kji] -= a[jjpi] * a[k + ji];
- } // for k
- } // for j
- if (nxch % 2 != 0) {
- det = -(det);
- }
- ir[n] = nxch;
- return true;
+ const unsigned int jm1 = j - 1;
+ const unsigned int jpi = (j + 1) * idim;
+ const unsigned int jjpi = j + jpi;
+
+ for (k = j + 1; k <= n; ++k) {
+ const unsigned int ki = k * idim;
+ const unsigned int jki = j + ki;
+ const unsigned int kji = k + jpi;
+ if (j != 1) {
+ for (i = 1; i <= jm1; ++i) {
+ const unsigned int ii = i * idim;
+ a[jki] -= a[i + ki] * a[j + ii];
+ a[kji] -= a[i + jpi] * a[k + ii];
+ } // for i
+ }
+ a[jki] *= a[jj];
+ a[kji] -= a[jjpi] * a[k + ji];
+ } // for k
+ } // for j
+
+ if (nxch % 2 != 0) {
+ det = -(det);
+ }
+ ir[n] = nxch;
+ return true;
} // end of Dfact
diff --git a/math/smatrix/inc/Math/Dfinv.h b/math/smatrix/inc/Math/Dfinv.h
index 38856669dee..aaccc108d13 100644
--- a/math/smatrix/inc/Math/Dfinv.h
+++ b/math/smatrix/inc/Math/Dfinv.h
@@ -69,71 +69,71 @@ bool Dfinv(Matrix& rhs, unsigned int* ir) {
a[idim + 2] = -a[(idim << 1) + 2] * (a[idim + 1] * a[idim + 2]);
a[(idim << 1) + 1] = -a[(idim << 1) + 1];
- if (n != 2) {
- for (i = 3; i <= n; ++i) {
- const unsigned int ii = i * idim;
- const unsigned int iii = i + ii;
- const unsigned int imi = ii - idim;
- const unsigned int iimi = i + imi;
- im2 = i - 2;
- for (j = 1; j <= im2; ++j) {
- const unsigned int ji = j * idim;
- const unsigned int jii = j + ii;
- s31 = 0.;
- for (k = j; k <= im2; ++k) {
- s31 += a[k + ji] * a[i + k * idim];
- a[jii] += a[j + (k + 1) * idim] * a[k + 1 + ii];
- } // for k
- a[i + ji] = -a[iii] * (a[i - 1 + ji] * a[iimi] + s31);
- a[jii] *= -1;
+ if (n != 2) {
+ for (i = 3; i <= n; ++i) {
+ const unsigned int ii = i * idim;
+ const unsigned int iii = i + ii;
+ const unsigned int imi = ii - idim;
+ const unsigned int iimi = i + imi;
+ im2 = i - 2;
+ for (j = 1; j <= im2; ++j) {
+ const unsigned int ji = j * idim;
+ const unsigned int jii = j + ii;
+ s31 = 0.;
+ for (k = j; k <= im2; ++k) {
+ s31 += a[k + ji] * a[i + k * idim];
+ a[jii] += a[j + (k + 1) * idim] * a[k + 1 + ii];
+ } // for k
+ a[i + ji] = -a[iii] * (a[i - 1 + ji] * a[iimi] + s31);
+ a[jii] *= -1;
+ } // for j
+ a[iimi] = -a[iii] * (a[i - 1 + imi] * a[iimi]);
+ a[i - 1 + ii] *= -1;
+ } // for i
+ } // if n!=2
+
+ nm1 = n - 1;
+ for (i = 1; i <= nm1; ++i) {
+ const unsigned int ii = i * idim;
+ nmi = n - i;
+ for (j = 1; j <= i; ++j) {
+ const unsigned int ji = j * idim;
+ const unsigned int iji = i + ji;
+ for (k = 1; k <= nmi; ++k) {
+ a[iji] += a[i + k + ji] * a[i + (i + k) * idim];
+ } // for k
} // for j
- a[iimi] = -a[iii] * (a[i - 1 + imi] * a[iimi]);
- a[i - 1 + ii] *= -1;
- } // for i
- } // if n!=2
-
- nm1 = n - 1;
- for (i = 1; i <= nm1; ++i) {
- const unsigned int ii = i * idim;
- nmi = n - i;
- for (j = 1; j <= i; ++j) {
- const unsigned int ji = j * idim;
- const unsigned int iji = i + ji;
- for (k = 1; k <= nmi; ++k) {
- a[iji] += a[i + k + ji] * a[i + (i + k) * idim];
- } // for k
- } // for j
- for (j = 1; j <= nmi; ++j) {
+ for (j = 1; j <= nmi; ++j) {
+ const unsigned int ji = j * idim;
+ s34 = 0.;
+ for (k = j; k <= nmi; ++k) {
+ s34 += a[i + k + ii + ji] * a[i + (i + k) * idim];
+ } // for k
+ a[i + ii + ji] = s34;
+ } // for j
+ } // for i
+
+ nxch = ir[n];
+ if (nxch == 0) {
+ return true;
+ }
+
+ for (m = 1; m <= nxch; ++m) {
+ k = nxch - m + 1;
+ ij = ir[k];
+ i = ij / 4096;
+ j = ij % 4096;
+ const unsigned int ii = i * idim;
const unsigned int ji = j * idim;
- s34 = 0.;
- for (k = j; k <= nmi; ++k) {
- s34 += a[i + k + ii + ji] * a[i + (i + k) * idim];
+ for (k = 1; k <= n; ++k) {
+ ti = a[k + ii];
+ a[k + ii] = a[k + ji];
+ a[k + ji] = ti;
} // for k
- a[i + ii + ji] = s34;
- } // for j
- } // for i
-
- nxch = ir[n];
- if (nxch == 0) {
- return true;
- }
-
- for (m = 1; m <= nxch; ++m) {
- k = nxch - m + 1;
- ij = ir[k];
- i = ij / 4096;
- j = ij % 4096;
- const unsigned int ii = i * idim;
- const unsigned int ji = j * idim;
- for (k = 1; k <= n; ++k) {
- ti = a[k + ii];
- a[k + ii] = a[k + ji];
- a[k + ji] = ti;
- } // for k
- } // for m
-
- return true;
+ } // for m
+
+ return true;
} // Dfinv
diff --git a/math/smatrix/inc/Math/Dinv.h b/math/smatrix/inc/Math/Dinv.h
index 113300f77c5..e8e85988d9e 100644
--- a/math/smatrix/inc/Math/Dinv.h
+++ b/math/smatrix/inc/Math/Dinv.h
@@ -81,17 +81,17 @@ public:
/* Initialized data */
unsigned int work[n+1] = {0};
-
+
typename MatrixRep::value_type det(0.0);
-
- if (DfactMatrix(rhs,det,work) != 0) {
- std::cerr << "Dfact_matrix failed!!" << std::endl;
- return false;
- }
-
- int ifail = DfinvMatrix(rhs,work);
- if (ifail == 0) return true;
- return false;
+
+ if (DfactMatrix(rhs,det,work) != 0) {
+ std::cerr << "Dfact_matrix failed!!" << std::endl;
+ return false;
+ }
+
+ int ifail = DfinvMatrix(rhs,work);
+ if (ifail == 0) return true;
+ return false;
} // Dinv
diff --git a/math/smatrix/inc/Math/Dsfact.h b/math/smatrix/inc/Math/Dsfact.h
index 9b3b0b8fc4b..6c3b8d59b93 100644
--- a/math/smatrix/inc/Math/Dsfact.h
+++ b/math/smatrix/inc/Math/Dsfact.h
@@ -105,7 +105,7 @@ static bool Dsfact(MatRepStd<T,n,idim>& rhs, T& det) {
const unsigned int lj = l + jpi;
for (i = 1; i <= j; ++i) {
- rhs[lj + arrayOffset] -= rhs[l + i * idim + arrayOffset] * rhs[i + jpi + arrayOffset];
+ rhs[lj + arrayOffset] -= rhs[l + i * idim + arrayOffset] * rhs[i + jpi + arrayOffset];
} // for i
} // for l
} // for j
diff --git a/math/smatrix/inc/Math/Expression.h b/math/smatrix/inc/Math/Expression.h
index 84e8aa495cd..c93a7743723 100644
--- a/math/smatrix/inc/Math/Expression.h
+++ b/math/smatrix/inc/Math/Expression.h
@@ -134,7 +134,7 @@ private:
template <class T, unsigned int D, unsigned int D2> class MatRepStd;
template <class ExprType, class T, unsigned int D, unsigned int D2 = 1,
- class R1=MatRepStd<T,D,D2> >
+ class R1=MatRepStd<T,D,D2> >
class Expr {
public:
typedef T value_type;
@@ -185,18 +185,18 @@ public:
os.setf(std::ios::right,std::ios::adjustfield);
os << "[ ";
for (unsigned int i=0; i < D; ++i) {
- unsigned int d2 = D2; // to avoid some annoying warnings in case of vectors (D2 = 0)
- for (unsigned int j=0; j < D2; ++j) {
- os << std::setw(12) << this->operator() (i,j);
- if ((!((j+1)%12)) && (j < d2-1))
+ unsigned int d2 = D2; // to avoid some annoying warnings in case of vectors (D2 = 0)
+ for (unsigned int j=0; j < D2; ++j) {
+ os << std::setw(12) << this->operator() (i,j);
+ if ((!((j+1)%12)) && (j < d2-1))
os << std::endl << " ...";
- }
- if (i != D - 1)
- os << std::endl << " ";
+ }
+ if (i != D - 1)
+ os << std::endl << " ";
}
- os << " ]";
-
- return os;
+ os << " ]";
+
+ return os;
}
private:
diff --git a/math/smatrix/inc/Math/Functions.h b/math/smatrix/inc/Math/Functions.h
index 92dcfba28bb..a08fbe411b7 100644
--- a/math/smatrix/inc/Math/Functions.h
+++ b/math/smatrix/inc/Math/Functions.h
@@ -323,11 +323,11 @@ inline T Lmag(const VecExpr<A,T,4>& rhs) {
template <class T>
inline SVector<T,3> Cross(const SVector<T,3>& lhs, const SVector<T,3>& rhs) {
return SVector<T,3>(lhs.apply(1)*rhs.apply(2) -
- lhs.apply(2)*rhs.apply(1),
- lhs.apply(2)*rhs.apply(0) -
- lhs.apply(0)*rhs.apply(2),
- lhs.apply(0)*rhs.apply(1) -
- lhs.apply(1)*rhs.apply(0));
+ lhs.apply(2)*rhs.apply(1),
+ lhs.apply(2)*rhs.apply(0) -
+ lhs.apply(0)*rhs.apply(2),
+ lhs.apply(0)*rhs.apply(1) -
+ lhs.apply(1)*rhs.apply(0));
}
//==============================================================================
@@ -336,11 +336,11 @@ inline SVector<T,3> Cross(const SVector<T,3>& lhs, const SVector<T,3>& rhs) {
template <class A, class T>
inline SVector<T,3> Cross(const VecExpr<A,T,3>& lhs, const SVector<T,3>& rhs) {
return SVector<T,3>(lhs.apply(1)*rhs.apply(2) -
- lhs.apply(2)*rhs.apply(1),
- lhs.apply(2)*rhs.apply(0) -
- lhs.apply(0)*rhs.apply(2),
- lhs.apply(0)*rhs.apply(1) -
- lhs.apply(1)*rhs.apply(0));
+ lhs.apply(2)*rhs.apply(1),
+ lhs.apply(2)*rhs.apply(0) -
+ lhs.apply(0)*rhs.apply(2),
+ lhs.apply(0)*rhs.apply(1) -
+ lhs.apply(1)*rhs.apply(0));
}
//==============================================================================
@@ -349,11 +349,11 @@ inline SVector<T,3> Cross(const VecExpr<A,T,3>& lhs, const SVector<T,3>& rhs) {
template <class T, class A>
inline SVector<T,3> Cross(const SVector<T,3>& lhs, const VecExpr<A,T,3>& rhs) {
return SVector<T,3>(lhs.apply(1)*rhs.apply(2) -
- lhs.apply(2)*rhs.apply(1),
- lhs.apply(2)*rhs.apply(0) -
- lhs.apply(0)*rhs.apply(2),
- lhs.apply(0)*rhs.apply(1) -
- lhs.apply(1)*rhs.apply(0));
+ lhs.apply(2)*rhs.apply(1),
+ lhs.apply(2)*rhs.apply(0) -
+ lhs.apply(0)*rhs.apply(2),
+ lhs.apply(0)*rhs.apply(1) -
+ lhs.apply(1)*rhs.apply(0));
}
//==============================================================================
@@ -362,11 +362,11 @@ inline SVector<T,3> Cross(const SVector<T,3>& lhs, const VecExpr<A,T,3>& rhs) {
template <class A, class B, class T>
inline SVector<T,3> Cross(const VecExpr<A,T,3>& lhs, const VecExpr<B,T,3>& rhs) {
return SVector<T,3>(lhs.apply(1)*rhs.apply(2) -
- lhs.apply(2)*rhs.apply(1),
- lhs.apply(2)*rhs.apply(0) -
- lhs.apply(0)*rhs.apply(2),
- lhs.apply(0)*rhs.apply(1) -
- lhs.apply(1)*rhs.apply(0));
+ lhs.apply(2)*rhs.apply(1),
+ lhs.apply(2)*rhs.apply(0) -
+ lhs.apply(0)*rhs.apply(2),
+ lhs.apply(0)*rhs.apply(1) -
+ lhs.apply(1)*rhs.apply(0));
}
diff --git a/math/smatrix/inc/Math/HelperOps.h b/math/smatrix/inc/Math/HelperOps.h
index f6142022e89..3511c4bb18d 100644
--- a/math/smatrix/inc/Math/HelperOps.h
+++ b/math/smatrix/inc/Math/HelperOps.h
@@ -77,7 +77,7 @@ namespace Math {
}
}
-
+
};
/**
@@ -361,7 +361,7 @@ namespace Math {
struct PlaceMatrix
{
static void Evaluate(SMatrix<T,D1,D2,R1>& lhs, const SMatrix<T,D3,D4,R2>& rhs,
- unsigned int row, unsigned int col) {
+ unsigned int row, unsigned int col) {
assert(row+D3 <= D1 && col+D4 <= D2);
const unsigned int offset = row*D2+col;
@@ -428,7 +428,7 @@ namespace Math {
for(unsigned int i=0; i<D3; ++i) {
for(unsigned int j=0; j<=i; ++j)
lhs.fRep(row+i,col+j) = rhs(i,j);
- }
+ }
}
}; // struct PlaceMatrix
@@ -461,7 +461,7 @@ namespace Math {
struct RetrieveMatrix
{
static void Evaluate(SMatrix<T,D1,D2,R1>& lhs, const SMatrix<T,D3,D4,R2>& rhs,
- unsigned int row, unsigned int col) {
+ unsigned int row, unsigned int col) {
STATIC_CHECK( D1 <= D3,Smatrix_nrows_too_small);
STATIC_CHECK( D2 <= D4,Smatrix_ncols_too_small);
@@ -502,7 +502,7 @@ namespace Math {
for(unsigned int i=0; i<D1; ++i) {
for(unsigned int j=0; j<=i; ++j)
- lhs(i,j) = rhs(i+row,j+col );
+ lhs(i,j) = rhs(i+row,j+col );
}
}
@@ -528,7 +528,7 @@ namespace Math {
// we assume iterator is well bounded within matrix
lhs.fRep[i*D2+j] = *itr++;
}
-
+
}
else { // upper
for (unsigned int i = 0; i < D1; ++i)
@@ -538,7 +538,7 @@ namespace Math {
else
return;
}
-
+
}
}
// case of filling the full matrix
@@ -548,7 +548,7 @@ namespace Math {
std::copy(begin, end, lhs.fRep.Array() );
}
}
-
+
}; // struct AssignItr
/**
diff --git a/math/smatrix/inc/Math/MatrixFunctions.h b/math/smatrix/inc/Math/MatrixFunctions.h
index e098444f783..166320e35dc 100644
--- a/math/smatrix/inc/Math/MatrixFunctions.h
+++ b/math/smatrix/inc/Math/MatrixFunctions.h
@@ -90,7 +90,7 @@ template <unsigned int I>
struct meta_row_dot {
template <class A, class B>
static inline typename A::value_type f(const A& lhs, const B& rhs,
- const unsigned int offset) {
+ const unsigned int offset) {
return lhs.apply(offset+I) * rhs.apply(I) + meta_row_dot<I-1>::f(lhs,rhs,offset);
}
};
@@ -103,7 +103,7 @@ template <>
struct meta_row_dot<0> {
template <class A, class B>
static inline typename A::value_type f(const A& lhs, const B& rhs,
- const unsigned int offset) {
+ const unsigned int offset) {
return lhs.apply(offset) * rhs.apply(0);
}
};
@@ -149,7 +149,7 @@ template <unsigned int I>
struct meta_col_dot {
template <class Matrix, class Vector>
static inline typename Matrix::value_type f(const Matrix& lhs, const Vector& rhs,
- const unsigned int offset) {
+ const unsigned int offset) {
return lhs.apply(Matrix::kCols*I+offset) * rhs.apply(I) +
meta_col_dot<I-1>::f(lhs,rhs,offset);
}
@@ -163,7 +163,7 @@ template <>
struct meta_col_dot<0> {
template <class Matrix, class Vector>
static inline typename Matrix::value_type f(const Matrix& lhs, const Vector& rhs,
- const unsigned int offset) {
+ const unsigned int offset) {
return lhs.apply(offset) * rhs.apply(0);
}
};
@@ -311,7 +311,7 @@ struct meta_matrix_dot {
static inline typename MatrixA::value_type g(const MatrixA& lhs,
const MatrixB& rhs,
unsigned int i,
- unsigned int j) {
+ unsigned int j) {
return lhs(i, I) * rhs(I , j) +
meta_matrix_dot<I-1>::g(lhs,rhs,i,j);
}
diff --git a/math/smatrix/inc/Math/MatrixRepresentationsStatic.h b/math/smatrix/inc/Math/MatrixRepresentationsStatic.h
index 0977a174605..7095e5110a3 100644
--- a/math/smatrix/inc/Math/MatrixRepresentationsStatic.h
+++ b/math/smatrix/inc/Math/MatrixRepresentationsStatic.h
@@ -114,8 +114,8 @@ namespace Math {
// template<unigned int D>
// struct Creator {
// static const RowOffsets<D> & Offsets() {
-// static RowOffsets<D> off;
-// return off;
+// static RowOffsets<D> off;
+// return off;
// }
/**
@@ -160,78 +160,78 @@ static const int fOff9x9[] = {0, 1, 3, 6, 10, 15, 21, 28, 36, 1, 2, 4, 7, 11, 16
static const int fOff10x10[] = {0, 1, 3, 6, 10, 15, 21, 28, 36, 45, 1, 2, 4, 7, 11, 16, 22, 29, 37, 46, 3, 4, 5, 8, 12, 17, 23, 30, 38, 47, 6, 7, 8, 9, 13, 18, 24, 31, 39, 48, 10, 11, 12, 13, 14, 19, 25, 32, 40, 49, 15, 16, 17, 18, 19, 20, 26, 33, 41, 50, 21, 22, 23, 24, 25, 26, 27, 34, 42, 51, 28, 29, 30, 31, 32, 33, 34, 35, 43, 52, 36, 37, 38, 39, 40, 41, 42, 43, 44, 53, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54};
template<>
- struct RowOffsets<1> {
- RowOffsets() {}
- int operator()(unsigned int , unsigned int ) const { return 0; } // Just one element
- int apply(unsigned int ) const { return 0; }
- };
+ struct RowOffsets<1> {
+ RowOffsets() {}
+ int operator()(unsigned int , unsigned int ) const { return 0; } // Just one element
+ int apply(unsigned int ) const { return 0; }
+ };
template<>
- struct RowOffsets<2> {
- RowOffsets() {}
- int operator()(unsigned int i, unsigned int j) const { return i+j; /*fOff2x2[i*2+j];*/ }
- int apply(unsigned int i) const { return fOff2x2[i]; }
- };
+ struct RowOffsets<2> {
+ RowOffsets() {}
+ int operator()(unsigned int i, unsigned int j) const { return i+j; /*fOff2x2[i*2+j];*/ }
+ int apply(unsigned int i) const { return fOff2x2[i]; }
+ };
template<>
- struct RowOffsets<3> {
- RowOffsets() {}
- int operator()(unsigned int i, unsigned int j) const { return fOff3x3[i*3+j]; }
- int apply(unsigned int i) const { return fOff3x3[i]; }
- };
+ struct RowOffsets<3> {
+ RowOffsets() {}
+ int operator()(unsigned int i, unsigned int j) const { return fOff3x3[i*3+j]; }
+ int apply(unsigned int i) const { return fOff3x3[i]; }
+ };
template<>
- struct RowOffsets<4> {
- RowOffsets() {}
- int operator()(unsigned int i, unsigned int j) const { return fOff4x4[i*4+j]; }
- int apply(unsigned int i) const { return fOff4x4[i]; }
- };
-
- template<>
- struct RowOffsets<5> {
- inline RowOffsets() {}
- inline int operator()(unsigned int i, unsigned int j) const { return fOff5x5[i*5+j]; }
-// int operator()(unsigned int i, unsigned int j) const {
-// if(j <= i) return (i * (i + 1)) / 2 + j;
-// else return (j * (j + 1)) / 2 + i;
-// }
- inline int apply(unsigned int i) const { return fOff5x5[i]; }
- };
+ struct RowOffsets<4> {
+ RowOffsets() {}
+ int operator()(unsigned int i, unsigned int j) const { return fOff4x4[i*4+j]; }
+ int apply(unsigned int i) const { return fOff4x4[i]; }
+ };
+
+ template<>
+ struct RowOffsets<5> {
+ inline RowOffsets() {}
+ inline int operator()(unsigned int i, unsigned int j) const { return fOff5x5[i*5+j]; }
+// int operator()(unsigned int i, unsigned int j) const {
+// if(j <= i) return (i * (i + 1)) / 2 + j;
+// else return (j * (j + 1)) / 2 + i;
+// }
+ inline int apply(unsigned int i) const { return fOff5x5[i]; }
+ };
template<>
- struct RowOffsets<6> {
- RowOffsets() {}
- int operator()(unsigned int i, unsigned int j) const { return fOff6x6[i*6+j]; }
- int apply(unsigned int i) const { return fOff6x6[i]; }
- };
+ struct RowOffsets<6> {
+ RowOffsets() {}
+ int operator()(unsigned int i, unsigned int j) const { return fOff6x6[i*6+j]; }
+ int apply(unsigned int i) const { return fOff6x6[i]; }
+ };
template<>
- struct RowOffsets<7> {
- RowOffsets() {}
- int operator()(unsigned int i, unsigned int j) const { return fOff7x7[i*7+j]; }
- int apply(unsigned int i) const { return fOff7x7[i]; }
- };
+ struct RowOffsets<7> {
+ RowOffsets() {}
+ int operator()(unsigned int i, unsigned int j) const { return fOff7x7[i*7+j]; }
+ int apply(unsigned int i) const { return fOff7x7[i]; }
+ };
template<>
- struct RowOffsets<8> {
- RowOffsets() {}
- int operator()(unsigned int i, unsigned int j) const { return fOff8x8[i*8+j]; }
- int apply(unsigned int i) const { return fOff8x8[i]; }
- };
+ struct RowOffsets<8> {
+ RowOffsets() {}
+ int operator()(unsigned int i, unsigned int j) const { return fOff8x8[i*8+j]; }
+ int apply(unsigned int i) const { return fOff8x8[i]; }
+ };
template<>
- struct RowOffsets<9> {
- RowOffsets() {}
- int operator()(unsigned int i, unsigned int j) const { return fOff9x9[i*9+j]; }
- int apply(unsigned int i) const { return fOff9x9[i]; }
- };
+ struct RowOffsets<9> {
+ RowOffsets() {}
+ int operator()(unsigned int i, unsigned int j) const { return fOff9x9[i*9+j]; }
+ int apply(unsigned int i) const { return fOff9x9[i]; }
+ };
template<>
- struct RowOffsets<10> {
- RowOffsets() {}
- int operator()(unsigned int i, unsigned int j) const { return fOff10x10[i*10+j]; }
- int apply(unsigned int i) const { return fOff10x10[i]; }
- };
+ struct RowOffsets<10> {
+ RowOffsets() {}
+ int operator()(unsigned int i, unsigned int j) const { return fOff10x10[i*10+j]; }
+ int apply(unsigned int i) const { return fOff10x10[i]; }
+ };
//_________________________________________________________________________________
/**
diff --git a/math/smatrix/test/TestTimer.h b/math/smatrix/test/TestTimer.h
index 7544169f93c..fe1121e6e0f 100644
--- a/math/smatrix/test/TestTimer.h
+++ b/math/smatrix/test/TestTimer.h
@@ -1,65 +1,65 @@
#ifndef TESTTIMER_H
#define TESTTIMER_H
-// simple class to measure time
+// simple class to measure time
#include "TStopwatch.h"
-namespace ROOT {
+namespace ROOT {
- namespace Math{
+ namespace Math{
- namespace test {
+ namespace test {
#ifdef REPORT_TIME
- void reportTime( std::string s, double time);
+ void reportTime( std::string s, double time);
#endif
- void printTime(TStopwatch & time, std::string s) {
- int pr = std::cout.precision(8);
- std::cout << s << "\t" << " time = " << time.RealTime() << "\t(sec)\t"
- // << time.CpuTime()
- << std::endl;
- std::cout.precision(pr);
- }
+ void printTime(TStopwatch & time, std::string s) {
+ int pr = std::cout.precision(8);
+ std::cout << s << "\t" << " time = " << time.RealTime() << "\t(sec)\t"
+ // << time.CpuTime()
+ << std::endl;
+ std::cout.precision(pr);
+ }
+
+ class Timer {
- class Timer {
+ public:
- public:
+ Timer(const std::string & s = "") : fName(s), fTime(0)
+ {
+ fWatch.Start();
+ }
+ Timer(double & t, const std::string & s = "") : fName(s), fTime(&t)
+ {
+ fWatch.Start();
+ }
- Timer(const std::string & s = "") : fName(s), fTime(0)
- {
- fWatch.Start();
- }
- Timer(double & t, const std::string & s = "") : fName(s), fTime(&t)
- {
- fWatch.Start();
- }
-
- ~Timer() {
- fWatch.Stop();
- printTime(fWatch,fName);
+ ~Timer() {
+ fWatch.Stop();
+ printTime(fWatch,fName);
#ifdef REPORT_TIME
- // report time
- reportTime(fName, fWatch.RealTime() );
+ // report time
+ reportTime(fName, fWatch.RealTime() );
#endif
- if (fTime) *fTime += fWatch.RealTime();
- }
-
-
- private:
-
- std::string fName;
- double * fTime;
- TStopwatch fWatch;
-
- };
- }
-
- }
+ if (fTime) *fTime += fWatch.RealTime();
+ }
+
+
+ private:
+
+ std::string fName;
+ double * fTime;
+ TStopwatch fWatch;
+
+ };
+ }
+
+ }
}
#endif
diff --git a/math/smatrix/test/matrix_op.h b/math/smatrix/test/matrix_op.h
index 23a680a4e6d..ab53d0a649f 100644
--- a/math/smatrix/test/matrix_op.h
+++ b/math/smatrix/test/matrix_op.h
@@ -1,4 +1,4 @@
-#ifndef MATRIX_OP_H
+#ifndef MATRIX_OP_H
#define MATRIX_OP_H
#include "TestTimer.h"
@@ -13,244 +13,244 @@
using namespace ROOT::Math;
-std::vector<float> gV;
+std::vector<float> gV;
-void initValues() {
- gV.reserve(10*NLOOP);
- TRandom3 r;
- std::cout << "init smearing vector ";
- for (int l = 0; l < 10*NLOOP; l++)
- {
- gV.push_back( r.Rndm() );
- }
- std::cout << " with size " << gV.size() << std::endl;
+void initValues() {
+ gV.reserve(10*NLOOP);
+ TRandom3 r;
+ std::cout << "init smearing vector ";
+ for (int l = 0; l < 10*NLOOP; l++)
+ {
+ gV.push_back( r.Rndm() );
+ }
+ std::cout << " with size " << gV.size() << std::endl;
}
// vector assignment
-template<class V>
-void testVeq(const V & v, double & time, V & result) {
- V vtmp = v;
- test::Timer t(time,"V=V ");
- for (int l = 0; l < 10*NLOOP; l++)
- {
+template<class V>
+void testVeq(const V & v, double & time, V & result) {
+ V vtmp = v;
+ test::Timer t(time,"V=V ");
+ for (int l = 0; l < 10*NLOOP; l++)
+ {
vtmp[0] = gV[l];
- result = vtmp;
- }
+ result = vtmp;
+ }
}
// matrix assignmnent
-template<class M>
-void testMeq(const M & m, double & time, M & result) {
- M mtmp = m;
- test::Timer t(time,"M=M ");
- for (int l = 0; l < NLOOP; l++)
- {
+template<class M>
+void testMeq(const M & m, double & time, M & result) {
+ M mtmp = m;
+ test::Timer t(time,"M=M ");
+ for (int l = 0; l < NLOOP; l++)
+ {
mtmp(0,0) = gV[l];
- result = mtmp;
- }
+ result = mtmp;
+ }
}
-// vector sum
-template<class V>
-void testVad(const V & v1, const V & v2, double & time, V & result) {
- V vtmp = v2;
- test::Timer t(time,"V+V ");
- for (int l = 0; l < 10*NLOOP; l++)
- {
- vtmp[0] = gV[l];
- result = v1 + vtmp;
- }
+// vector sum
+template<class V>
+void testVad(const V & v1, const V & v2, double & time, V & result) {
+ V vtmp = v2;
+ test::Timer t(time,"V+V ");
+ for (int l = 0; l < 10*NLOOP; l++)
+ {
+ vtmp[0] = gV[l];
+ result = v1 + vtmp;
+ }
}
-// matrix sum
-template<class M>
-void testMad(const M & m1, const M & m2, double & time, M & result) {
- M mtmp = m2;
- test::Timer t(time,"M+M ");;
- for (int l = 0; l < NLOOP; l++)
- {
- mtmp(0,0) = gV[l];
- result = m1; result += mtmp;
+// matrix sum
+template<class M>
+void testMad(const M & m1, const M & m2, double & time, M & result) {
+ M mtmp = m2;
+ test::Timer t(time,"M+M ");;
+ for (int l = 0; l < NLOOP; l++)
+ {
+ mtmp(0,0) = gV[l];
+ result = m1; result += mtmp;
//M tmp = m1 + mtmp;
- //result = tmp;
- }
+ //result = tmp;
+ }
}
// vector * constant
-template<class V>
-void testVscale(const V & v1, double a, double & time, V & result) {
- V vtmp = v1;
- test::Timer t(time,"a*V ");;
- for (int l = 0; l < NLOOP; l++)
- {
+template<class V>
+void testVscale(const V & v1, double a, double & time, V & result) {
+ V vtmp = v1;
+ test::Timer t(time,"a*V ");;
+ for (int l = 0; l < NLOOP; l++)
+ {
vtmp[0] = gV[l];
- result = a * vtmp; // v1 * a does not exist in ROOT
- }
+ result = a * vtmp; // v1 * a does not exist in ROOT
+ }
}
// matrix * constant
-template<class M>
-void testMscale(const M & m1, double a, double & time, M & result) {
- M mtmp = m1;
- test::Timer t(time,"a*M ");;
- for (int l = 0; l < NLOOP; l++)
- {
+template<class M>
+void testMscale(const M & m1, double a, double & time, M & result) {
+ M mtmp = m1;
+ test::Timer t(time,"a*M ");;
+ for (int l = 0; l < NLOOP; l++)
+ {
mtmp(0,0) = gV[l];
- //result = mtmp * a;
+ //result = mtmp * a;
result = mtmp; result *= a;
- }
+ }
}
// simple Matrix vector op
-template<class M, class V>
-void testMV(const M & mat, const V & v, double & time, V & result) {
- V vtmp = v;
- test::Timer t(time,"M*V ");
- for (int l = 0; l < NLOOP; l++)
- {
+template<class M, class V>
+void testMV(const M & mat, const V & v, double & time, V & result) {
+ V vtmp = v;
+ test::Timer t(time,"M*V ");
+ for (int l = 0; l < NLOOP; l++)
+ {
vtmp[0] = gV[l];
- result = mat * vtmp;
- }
+ result = mat * vtmp;
+ }
}
// general matrix vector op
-template<class M, class V>
-void testGMV(const M & mat, const V & v1, const V & v2, double & time, V & result) {
- V vtmp = v1;
- test::Timer t(time,"M*V+");
- for (int l = 0; l < NLOOP; l++)
- {
+template<class M, class V>
+void testGMV(const M & mat, const V & v1, const V & v2, double & time, V & result) {
+ V vtmp = v1;
+ test::Timer t(time,"M*V+");
+ for (int l = 0; l < NLOOP; l++)
+ {
vtmp[0] = gV[l];
- result = mat * vtmp + v2;
- }
+ result = mat * vtmp + v2;
+ }
}
-// general matrix matrix op
-template<class A, class B, class C>
-void testMM(const A & a, const B & b, const C & c, double & time, C & result) {
- B btmp = b;
- test::Timer t(time,"M*M ");
- for (int l = 0; l < NLOOP; l++)
- {
+// general matrix matrix op
+template<class A, class B, class C>
+void testMM(const A & a, const B & b, const C & c, double & time, C & result) {
+ B btmp = b;
+ test::Timer t(time,"M*M ");
+ for (int l = 0; l < NLOOP; l++)
+ {
btmp(0,0) = gV[l];
result = a * btmp + c;
- }
+ }
}
-// specialized functions (depending on the package)
+// specialized functions (depending on the package)
//smatrix
-template<class V>
-double testDot_S(const V & v1, const V & v2, double & time) {
- V vtmp = v2;
- test::Timer t(time,"dot ");
- double result=0;
- for (int l = 0; l < 10*NLOOP; l++)
- {
+template<class V>
+double testDot_S(const V & v1, const V & v2, double & time) {
+ V vtmp = v2;
+ test::Timer t(time,"dot ");
+ double result=0;
+ for (int l = 0; l < 10*NLOOP; l++)
+ {
vtmp[0] = gV[l];
- result = Dot(v1,vtmp);
- }
- return result;
+ result = Dot(v1,vtmp);
+ }
+ return result;
}
-// double testDot_S(const std::vector<V*> & w1, const std::vector<V*> & w2, double & time) {
+// double testDot_S(const std::vector<V*> & w1, const std::vector<V*> & w2, double & time) {
// test::Timer t(time,"dot ");
-// double result=0;
-// for (int l = 0; l < NLOOP; l++)
+// double result=0;
+// for (int l = 0; l < NLOOP; l++)
// {
-// V & v1 = *w1[l];
-// V & v2 = *w2[l];
-// result = Dot(v1,v2);
+// V & v1 = *w1[l];
+// V & v2 = *w2[l];
+// result = Dot(v1,v2);
// }
-// return result;
+// return result;
// }
-template<class M, class V>
-double testInnerProd_S(const M & a, const V & v, double & time) {
- V vtmp = v;
- test::Timer t(time,"prod");
- double result=0;
- for (int l = 0; l < NLOOP; l++)
- {
+template<class M, class V>
+double testInnerProd_S(const M & a, const V & v, double & time) {
+ V vtmp = v;
+ test::Timer t(time,"prod");
+ double result=0;
+ for (int l = 0; l < NLOOP; l++)
+ {
vtmp[0] = gV[l];
- result = Similarity(vtmp,a);
- }
- return result;
+ result = Similarity(vtmp,a);
+ }
+ return result;
}
//inversion
-template<class M>
+template<class M>
void testInv_S( const M & m, double & time, M& result){
- M mtmp = m;
- test::Timer t(time,"inv ");
- int ifail = 0;
- for (int l = 0; l < NLOOP; l++)
- {
- mtmp(0,0) = gV[l];
+ M mtmp = m;
+ test::Timer t(time,"inv ");
+ int ifail = 0;
+ for (int l = 0; l < NLOOP; l++)
+ {
+ mtmp(0,0) = gV[l];
//result = mtmp.InverseFast(ifail);
result = mtmp.Inverse(ifail);
// assert(ifail == 0);
- }
+ }
}
// general matrix matrix op
-template<class A, class B, class C>
-void testATBA_S(const A & a, const B & b, double & time, C & result) {
- B btmp = b;
- test::Timer t(time,"At*M*A");
- for (int l = 0; l < NLOOP; l++)
- {
- //result = Transpose(a) * b * a;
- //result = a * b * Transpose(a);
- //result = a * b * a;
+template<class A, class B, class C>
+void testATBA_S(const A & a, const B & b, double & time, C & result) {
+ B btmp = b;
+ test::Timer t(time,"At*M*A");
+ for (int l = 0; l < NLOOP; l++)
+ {
+ //result = Transpose(a) * b * a;
+ //result = a * b * Transpose(a);
+ //result = a * b * a;
btmp(0,0) = gV[l];
// A at = Transpose(a);
C tmp = btmp * Transpose(a);
- result = a * tmp;
- }
+ result = a * tmp;
+ }
}
// general matrix matrix op
-template<class A, class B, class C>
-void testATBA_S2(const A & a, const B & b, double & time, C & result) {
- B btmp = b;
-
- test::Timer t(time,"At*M*A");
- for (int l = 0; l < NLOOP; l++)
- {
- //result = Transpose(a) * b * a;
- //result = a * b * Transpose(a);
- //result = a * b * a;
+template<class A, class B, class C>
+void testATBA_S2(const A & a, const B & b, double & time, C & result) {
+ B btmp = b;
+
+ test::Timer t(time,"At*M*A");
+ for (int l = 0; l < NLOOP; l++)
+ {
+ //result = Transpose(a) * b * a;
+ //result = a * b * Transpose(a);
+ //result = a * b * a;
btmp(0,0) = gV[l];
result = SimilarityT(a,b);
- //result = a * result;
- }
-}
-
-template<class A, class C>
-void testMT_S(const A & a, double & time, C & result) {
- A atmp = a;
- test::Timer t(time,"Transp");
- for (int l = 0; l < NLOOP; l++)
- {
- //result = Transpose(a) * b * a;
- //result = a * b * Transpose(a);
- //result = a * b * a;
+ //result = a * result;
+ }
+}
+
+template<class A, class C>
+void testMT_S(const A & a, double & time, C & result) {
+ A atmp = a;
+ test::Timer t(time,"Transp");
+ for (int l = 0; l < NLOOP; l++)
+ {
+ //result = Transpose(a) * b * a;
+ //result = a * b * Transpose(a);
+ //result = a * b * a;
atmp(0,0) = gV[l];
result = Transpose(atmp);
- }
+ }
}
/////////////////////////////////////
@@ -258,315 +258,315 @@ void testMT_S(const A & a, double & time, C & result) {
//////////////////////////////////
// simple Matrix vector op
-template<class M, class V>
+template<class M, class V>
void testMV_T(const M & mat, const V & v, double & time, V & result) {
- V vtmp = v;
- test::Timer t(time,"M*V ");
- for (int l = 0; l < NLOOP; l++)
- {
+ V vtmp = v;
+ test::Timer t(time,"M*V ");
+ for (int l = 0; l < NLOOP; l++)
+ {
vtmp[0] = gV[l];
Add(result,0.0,mat,vtmp);
- }
-}
-
+ }
+}
+
// general matrix vector op
-template<class M, class V>
+template<class M, class V>
void testGMV_T(const M & mat, const V & v1, const V & v2, double & time, V & result) {
- V vtmp = v1;
- test::Timer t(time,"M*V+");
- for (int l = 0; l < NLOOP; l++)
- {
+ V vtmp = v1;
+ test::Timer t(time,"M*V+");
+ for (int l = 0; l < NLOOP; l++)
+ {
vtmp[0] = gV[l];
memcpy(result.GetMatrixArray(),v2.GetMatrixArray(),v2.GetNoElements()*sizeof(Double_t));
Add(result,1.0,mat,vtmp);
- }
+ }
}
// general matrix matrix op
-template<class A, class B, class C>
+template<class A, class B, class C>
void testMM_T(const A & a, const B & b, const C & c, double & time, C & result) {
- B btmp = b;
- test::Timer t(time,"M*M ");
- for (int l = 0; l < NLOOP; l++)
- {
+ B btmp = b;
+ test::Timer t(time,"M*M ");
+ for (int l = 0; l < NLOOP; l++)
+ {
btmp(0,0) = gV[l];
result.Mult(a,btmp);
result += c;
- }
-}
+ }
+}
// matrix sum
-template<class M>
+template<class M>
void testMad_T(const M & m1, const M & m2, double & time, M & result) {
- M mtmp = m2;
- test::Timer t(time,"M+M ");
- for (int l = 0; l < NLOOP; l++)
- {
+ M mtmp = m2;
+ test::Timer t(time,"M+M ");
+ for (int l = 0; l < NLOOP; l++)
+ {
mtmp(0,0) = gV[l];
result.Plus(m1,mtmp);
- }
+ }
}
-template<class A, class B, class C>
+template<class A, class B, class C>
void testATBA_T(const A & a, const B & b, double & time, C & result) {
- B btmp = b;
- test::Timer t(time,"At*M*A");
- C tmp = a;
- for (int l = 0; l < NLOOP; l++)
- {
- btmp(0,0) = gV[l];
+ B btmp = b;
+ test::Timer t(time,"At*M*A");
+ C tmp = a;
+ for (int l = 0; l < NLOOP; l++)
+ {
+ btmp(0,0) = gV[l];
tmp.Mult(a,btmp);
result.MultT(tmp,a);
- }
+ }
}
-template<class V>
-double testDot_T(const V & v1, const V & v2, double & time) {
- V vtmp = v2;
- test::Timer t(time,"dot ");
- double result=0;
- for (int l = 0; l < 10*NLOOP; l++)
- {
+template<class V>
+double testDot_T(const V & v1, const V & v2, double & time) {
+ V vtmp = v2;
+ test::Timer t(time,"dot ");
+ double result=0;
+ for (int l = 0; l < 10*NLOOP; l++)
+ {
vtmp[0] = gV[l];
result = Dot(v1,vtmp);
- }
- return result;
-}
-
-template<class M, class V>
-double testInnerProd_T(const M & a, const V & v, double & time) {
- V vtmp = v;
- test::Timer t(time,"prod");
- double result=0;
- for (int l = 0; l < NLOOP; l++) {
- vtmp[0] = gV[l];
- result = a.Similarity(vtmp);
- }
- return result;
-}
-
-//inversion
-template<class M>
-void testInv_T(const M & m, double & time, M& result){
- M mtmp = m;
- test::Timer t(time,"inv ");
- for (int l = 0; l < NLOOP; l++)
- {
- mtmp(0,0) = gV[l];
+ }
+ return result;
+}
+
+template<class M, class V>
+double testInnerProd_T(const M & a, const V & v, double & time) {
+ V vtmp = v;
+ test::Timer t(time,"prod");
+ double result=0;
+ for (int l = 0; l < NLOOP; l++) {
+ vtmp[0] = gV[l];
+ result = a.Similarity(vtmp);
+ }
+ return result;
+}
+
+//inversion
+template<class M>
+void testInv_T(const M & m, double & time, M& result){
+ M mtmp = m;
+ test::Timer t(time,"inv ");
+ for (int l = 0; l < NLOOP; l++)
+ {
+ mtmp(0,0) = gV[l];
memcpy(result.GetMatrixArray(),mtmp.GetMatrixArray(),mtmp.GetNoElements()*sizeof(Double_t));
- result.InvertFast();
- }
+ result.InvertFast();
+ }
}
-template<class M>
-void testInv_T2(const M & m, double & time, M& result){
- M mtmp = m;
- test::Timer t(time,"inv2");
- for (int l = 0; l < NLOOP; l++)
- {
+template<class M>
+void testInv_T2(const M & m, double & time, M& result){
+ M mtmp = m;
+ test::Timer t(time,"inv2");
+ for (int l = 0; l < NLOOP; l++)
+ {
memcpy(result.GetMatrixArray(),mtmp.GetMatrixArray(),mtmp.GetNoElements()*sizeof(Double_t));
- result.InvertFast();
- }
+ result.InvertFast();
+ }
}
// vector sum
-template<class V>
+template<class V>
void testVad_T(const V & v1, const V & v2, double & time, V & result) {
- V vtmp = v2;
- test::Timer t(time,"V+V ");;
- for (int l = 0; l < 10*NLOOP; l++)
- {
+ V vtmp = v2;
+ test::Timer t(time,"V+V ");;
+ for (int l = 0; l < 10*NLOOP; l++)
+ {
vtmp[0] = gV[l];
result.Add(v1,vtmp);
- }
+ }
}
// vector * constant
-template<class V>
+template<class V>
void testVscale_T(const V & v1, double a, double & time, V & result) {
- V vtmp = v1;
- test::Timer t(time,"a*V ");;
- for (int l = 0; l < NLOOP; l++)
- {
+ V vtmp = v1;
+ test::Timer t(time,"a*V ");;
+ for (int l = 0; l < NLOOP; l++)
+ {
// result = a * v1;
result.Zero();
vtmp[0] = gV[l];
Add(result,a,vtmp);
- }
+ }
}
// general matrix matrix op
-template<class A, class B, class C>
-void testATBA_T2(const A & a, const B & b, double & time, C & result) {
- B btmp = b;
- test::Timer t(time,"At*M*A");
- for (int l = 0; l < NLOOP; l++)
- {
- btmp(0,0) = gV[l];
+template<class A, class B, class C>
+void testATBA_T2(const A & a, const B & b, double & time, C & result) {
+ B btmp = b;
+ test::Timer t(time,"At*M*A");
+ for (int l = 0; l < NLOOP; l++)
+ {
+ btmp(0,0) = gV[l];
memcpy(result.GetMatrixArray(),btmp.GetMatrixArray(),btmp.GetNoElements()*sizeof(Double_t));
- result.Similarity(a);
- }
+ result.Similarity(a);
+ }
}
// matrix * constant
template<class M>
void testMscale_T(const M & m1, double a, double & time, M & result) {
- M mtmp = m1;
- test::Timer t(time,"a*M ");;
- for (int l = 0; l < NLOOP; l++)
- {
+ M mtmp = m1;
+ test::Timer t(time,"a*M ");;
+ for (int l = 0; l < NLOOP; l++)
+ {
//result = a * m1;
result.Zero();
mtmp(0,0) = gV[l];
Add(result,a,mtmp);
- }
+ }
}
-template<class A, class C>
-void testMT_T(const A & a, double & time, C & result) {
- A atmp = a;
- test::Timer t(time,"Transp");
- for (int l = 0; l < NLOOP; l++)
- {
+template<class A, class C>
+void testMT_T(const A & a, double & time, C & result) {
+ A atmp = a;
+ test::Timer t(time,"Transp");
+ for (int l = 0; l < NLOOP; l++)
+ {
atmp(0,0) = gV[l];
result.Transpose(atmp);
- }
+ }
}
-////////////////////////////////////////////
+////////////////////////////////////////////
// for clhep
////////////////////////////////////////////
//smatrix
-template<class V>
-double testDot_C(const V & v1, const V & v2, double & time) {
- V vtmp = v2;
- test::Timer t(time,"dot ");
- double result=0;
- for (int l = 0; l < 10*NLOOP; l++)
- {
+template<class V>
+double testDot_C(const V & v1, const V & v2, double & time) {
+ V vtmp = v2;
+ test::Timer t(time,"dot ");
+ double result=0;
+ for (int l = 0; l < 10*NLOOP; l++)
+ {
vtmp[0] = gV[l];
- result = dot(v1,vtmp);
- }
- return result;
-}
-
-template<class M, class V>
-double testInnerProd_C(const M & a, const V & v, double & time) {
- V vtmp = v;
- test::Timer t(time,"prod");
- double result=0;
- for (int l = 0; l < NLOOP; l++)
- {
+ result = dot(v1,vtmp);
+ }
+ return result;
+}
+
+template<class M, class V>
+double testInnerProd_C(const M & a, const V & v, double & time) {
+ V vtmp = v;
+ test::Timer t(time,"prod");
+ double result=0;
+ for (int l = 0; l < NLOOP; l++)
+ {
vtmp[0] = gV[l];
- V tmp = a*vtmp;
+ V tmp = a*vtmp;
result = dot(vtmp,tmp);
- }
- return result;
+ }
+ return result;
}
// matrix assignmnent(index starts from 1)
-template<class M>
-void testMeq_C(const M & m, double & time, M & result) {
- M mtmp = m;
- test::Timer t(time,"M=M ");
- for (int l = 0; l < NLOOP; l++)
- {
+template<class M>
+void testMeq_C(const M & m, double & time, M & result) {
+ M mtmp = m;
+ test::Timer t(time,"M=M ");
+ for (int l = 0; l < NLOOP; l++)
+ {
mtmp(1,1) = gV[l];
- result = mtmp;
- }
+ result = mtmp;
+ }
}
-// matrix sum
-template<class M>
-void testMad_C(const M & m1, const M & m2, double & time, M & result) {
- M mtmp = m2;
- test::Timer t(time,"M+M ");;
- for (int l = 0; l < NLOOP; l++)
- {
- mtmp(1,1) = gV[l];
- result = m1; result += mtmp;
- }
+// matrix sum
+template<class M>
+void testMad_C(const M & m1, const M & m2, double & time, M & result) {
+ M mtmp = m2;
+ test::Timer t(time,"M+M ");;
+ for (int l = 0; l < NLOOP; l++)
+ {
+ mtmp(1,1) = gV[l];
+ result = m1; result += mtmp;
+ }
}
// matrix * constant
-template<class M>
-void testMscale_C(const M & m1, double a, double & time, M & result) {
- M mtmp = m1;
- test::Timer t(time,"a*M ");;
- for (int l = 0; l < NLOOP; l++)
- {
+template<class M>
+void testMscale_C(const M & m1, double a, double & time, M & result) {
+ M mtmp = m1;
+ test::Timer t(time,"a*M ");;
+ for (int l = 0; l < NLOOP; l++)
+ {
mtmp(1,1) = gV[l];
- result = mtmp * a;
- }
+ result = mtmp * a;
+ }
}
// clhep matrix matrix op (index starts from 1)
-template<class A, class B, class C>
-void testMM_C(const A & a, const B & b, const C & c, double & time, C & result) {
- B btmp = b;
- test::Timer t(time,"M*M ");
- for (int l = 0; l < NLOOP; l++)
- {
+template<class A, class B, class C>
+void testMM_C(const A & a, const B & b, const C & c, double & time, C & result) {
+ B btmp = b;
+ test::Timer t(time,"M*M ");
+ for (int l = 0; l < NLOOP; l++)
+ {
btmp(1,1) = gV[l];
result = a * btmp + c;
- }
+ }
}
//inversion
-template<class M>
-void testInv_C( const M & a, double & time, M& result){
- M mtmp = a;
- test::Timer t(time,"inv ");
- int ifail = 0;
- for (int l = 0; l < NLOOP; l++)
- {
- mtmp(1,1) = gV[l];
- result = mtmp.inverse(ifail);
- if (ifail) {std::cout <<"error inverting" << mtmp << std::endl; return; }
- }
+template<class M>
+void testInv_C( const M & a, double & time, M& result){
+ M mtmp = a;
+ test::Timer t(time,"inv ");
+ int ifail = 0;
+ for (int l = 0; l < NLOOP; l++)
+ {
+ mtmp(1,1) = gV[l];
+ result = mtmp.inverse(ifail);
+ if (ifail) {std::cout <<"error inverting" << mtmp << std::endl; return; }
+ }
}
// general matrix matrix op
-template<class A, class B, class C>
-void testATBA_C(const A & a, const B & b, double & time, C & result) {
- B btmp = b;
- test::Timer t(time,"At*M*A");
- for (int l = 0; l < NLOOP; l++)
- {
+template<class A, class B, class C>
+void testATBA_C(const A & a, const B & b, double & time, C & result) {
+ B btmp = b;
+ test::Timer t(time,"At*M*A");
+ for (int l = 0; l < NLOOP; l++)
+ {
btmp(1,1) = gV[l];
- //result = a.T() * b * a;
- result = a * btmp * a.T();
- }
+ //result = a.T() * b * a;
+ result = a * btmp * a.T();
+ }
}
-template<class A, class B, class C>
-void testATBA_C2(const A & a, const B & b, double & time, C & result) {
- B btmp = b;
- test::Timer t(time,"At*M*A");
- for (int l = 0; l < NLOOP; l++)
- {
- btmp(1,1) = gV[l];
- result = btmp.similarity(a);
- }
+template<class A, class B, class C>
+void testATBA_C2(const A & a, const B & b, double & time, C & result) {
+ B btmp = b;
+ test::Timer t(time,"At*M*A");
+ for (int l = 0; l < NLOOP; l++)
+ {
+ btmp(1,1) = gV[l];
+ result = btmp.similarity(a);
+ }
}
-template<class A, class C>
-void testMT_C(const A & a, double & time, C & result) {
- A atmp = a;
- test::Timer t(time,"Transp");
- for (int l = 0; l < NLOOP; l++)
- {
+template<class A, class C>
+void testMT_C(const A & a, double & time, C & result) {
+ A atmp = a;
+ test::Timer t(time,"Transp");
+ for (int l = 0; l < NLOOP; l++)
+ {
atmp(1,1) = gV[l];
result = atmp.T();
- }
+ }
}
diff --git a/math/smatrix/test/matrix_util.h b/math/smatrix/test/matrix_util.h
index 9e5bf51acc6..12ad7481d9c 100644
--- a/math/smatrix/test/matrix_util.h
+++ b/math/smatrix/test/matrix_util.h
@@ -21,11 +21,11 @@ void fillRandomSym(TRandom & r, M & m, unsigned int first, unsigned int start =
for(unsigned int i = start; i < first+start; ++i) {
for(unsigned int j = i; j < first+start; ++j) {
if ( i != j ) {
- m(i,j) = r.Rndm() + offset;
- m(j,i) = m(i,j);
+ m(i,j) = r.Rndm() + offset;
+ m(j,i) = m(i,j);
}
- else // add extra offset to make no singular when inverting
- m(i,i) = r.Rndm() + 3*offset;
+ else // add extra offset to make no singular when inverting
+ m(i,i) = r.Rndm() + 3*offset;
}
}
}
diff --git a/math/smatrix/test/testInversion.cxx b/math/smatrix/test/testInversion.cxx
index fc711b0b8b9..641c2ea2f00 100644
--- a/math/smatrix/test/testInversion.cxx
+++ b/math/smatrix/test/testInversion.cxx
@@ -50,7 +50,7 @@ namespace test {
{
fWatch.Start();
}
-
+
~Timer() {
fWatch.Stop();
printTime(fWatch,fName);
@@ -63,11 +63,11 @@ namespace test {
private:
-
+
std::string fName;
double * fTime;
TStopwatch fWatch;
-
+
};
}
@@ -243,7 +243,7 @@ double invert( const std::vector<M* > & matlist, double & time,std::string s) {
test::Timer t(time,s);
int nloop = matlist.size();
double sum = 0;
- for (int l = 0; l < nloop; l++)
+ for (int l = 0; l < nloop; l++)
{
const M & m = *(matlist[l]);
bool ok = TestInverter<M,T>::Inv(m,result);
@@ -265,14 +265,14 @@ double invert2( const std::vector<M* > & matlist, double & time,std::string s)
// copy vector of matrices
int nloop = matlist.size();
std::vector<M *> vmat(nloop);
- for (int l = 0; l < nloop; l++)
+ for (int l = 0; l < nloop; l++)
{
vmat[l] = new M( *matlist[l] );
}
test::Timer t(time,s);
double sum = 0;
- for (int l = 0; l < nloop; l++)
+ for (int l = 0; l < nloop; l++)
{
M & m = *(vmat[l]);
bool ok = TestInverter<M,T>::Inv2(m);
diff --git a/math/smatrix/test/testOperations.cxx b/math/smatrix/test/testOperations.cxx
index f294fa1157d..b6006a46987 100644
--- a/math/smatrix/test/testOperations.cxx
+++ b/math/smatrix/test/testOperations.cxx
@@ -135,7 +135,7 @@ int test_smatrix_op() {
-
+
MnVectorN v1; testMV(A,v,t_mv,v1);
//if (k == 0) v1.Print(std::cout);
MnVectorN v2; testGMV(A,v,v1,t_gmv,v2);
@@ -242,7 +242,7 @@ int test_smatrix_sym_op() {
#endif
w.Start();
-
+
MnVectorN v1; testMV(A,v,t_mv,v1);
MnVectorN v2; testGMV(A,v,v1,t_gmv,v2);
MnMatrixNN C0; testMM(A,B,C,t_mm,C0);
@@ -346,7 +346,7 @@ int test_tmatrix_op() {
}
#endif
w.Start();
-
+
MnVector v1(NDIM1); testMV_T(A,v,t_mv,v1);
//if (k == 0) v1.Print();
@@ -457,7 +457,7 @@ int test_tmatrix_sym_op() {
#endif
w.Start();
-
+
MnVector v1(N); testMV_T(A,v,t_mv,v1);
MnVector v2(N); testGMV_T(A,v,v1,t_gmv,v2);
MnMatrix C0(N,N); testMM_T(A,B,C,t_mm,C0);
@@ -555,7 +555,7 @@ int test_hepmatrix_op() {
std::cout << " p = " << p << std::endl;
}
#endif
-
+
w.Start();
MnVector v1(NDIM1); testMV(A,v,t_mv,v1);
@@ -659,7 +659,7 @@ int test_hepmatrix_sym_op() {
#endif
w.Start();
-
+
MnVector v1(N); testMV(A,v,t_mv,v1);
MnVector v2(N); testGMV(A,v,v1,t_gmv,v2);
MnMatrix C0(N,N); testMM_C(A,B,C,t_mm,C0);
diff --git a/math/smatrix/test/testSMatrix.cxx b/math/smatrix/test/testSMatrix.cxx
index d1450431d2a..ac35be4b47a 100644
--- a/math/smatrix/test/testSMatrix.cxx
+++ b/math/smatrix/test/testSMatrix.cxx
@@ -1024,14 +1024,14 @@ int test18() {
int iret =0;
// data for a 7x7 sym matrix to invert
SMatrix<double,7,7,MatRepSym<double,7> > S;
- for (int i = 0; i < 7; ++i) {
- for (int j = 0; j <= i; ++j) {
- if (i == j)
- S(i,j) = 10*double(std::rand())/(RAND_MAX); // generate between 0,10
- else
- S(i,j) = 2*double(std::rand())/(RAND_MAX)-1; // generate between -1,1
- }
- }
+ for (int i = 0; i < 7; ++i) {
+ for (int j = 0; j <= i; ++j) {
+ if (i == j)
+ S(i,j) = 10*double(std::rand())/(RAND_MAX); // generate between 0,10
+ else
+ S(i,j) = 2*double(std::rand())/(RAND_MAX)-1; // generate between -1,1
+ }
+ }
int ifail = 0;
SMatrix<double,7,7,MatRepSym<double,7> > Sinv = S.Inverse(ifail);
iret |= compare(ifail,0,"sym7x7 inversion");
@@ -1048,14 +1048,14 @@ int test18() {
// now test inversion of general
SMatrix<double,7> M;
- for (int i = 0; i < 7; ++i) {
- for (int j = 0; j < 7; ++j) {
- if (i == j)
- M(i,j) = 10*double(std::rand())/(RAND_MAX); // generate between 0,10
- else
- M(i,j) = 2*double(std::rand())/(RAND_MAX)-1; // generate between -1,1
- }
- }
+ for (int i = 0; i < 7; ++i) {
+ for (int j = 0; j < 7; ++j) {
+ if (i == j)
+ M(i,j) = 10*double(std::rand())/(RAND_MAX); // generate between 0,10
+ else
+ M(i,j) = 2*double(std::rand())/(RAND_MAX)-1; // generate between -1,1
+ }
+ }
ifail = 0;
SMatrix<double,7 > Minv = M.Inverse(ifail);
iret |= compare(ifail,0,"7x7 inversion");
@@ -1080,12 +1080,12 @@ int test19() {
// data for a 7x7 sym matrix to invert
SMatrix<float,7,7,MatRepSym<float,7> > S;
for (int i = 0; i < 7; ++i) {
- for (int j = 0; j <= i; ++j) {
- if (i == j)
- S(i,j) = 10*float(std::rand())/(RAND_MAX); // generate between 0,10
- else
- S(i,j) = 2*float(std::rand())/(RAND_MAX)-1; // generate between -1,1
- }
+ for (int j = 0; j <= i; ++j) {
+ if (i == j)
+ S(i,j) = 10*float(std::rand())/(RAND_MAX); // generate between 0,10
+ else
+ S(i,j) = 2*float(std::rand())/(RAND_MAX)-1; // generate between -1,1
+ }
}
int ifail = 0;
SMatrix<float,7,7,MatRepSym<float,7> > Sinv = S.Inverse(ifail);
@@ -1106,14 +1106,14 @@ int test19() {
// now test inversion of general
SMatrix<float,7> M;
- for (int i = 0; i < 7; ++i) {
- for (int j = 0; j < 7; ++j) {
- if (i == j)
- M(i,j) = 10*float(std::rand())/(RAND_MAX); // generate between 0,10
- else
- M(i,j) = 2*float(std::rand())/(RAND_MAX)-1; // generate between -1,1
- }
- }
+ for (int i = 0; i < 7; ++i) {
+ for (int j = 0; j < 7; ++j) {
+ if (i == j)
+ M(i,j) = 10*float(std::rand())/(RAND_MAX); // generate between 0,10
+ else
+ M(i,j) = 2*float(std::rand())/(RAND_MAX)-1; // generate between -1,1
+ }
+ }
ifail = 0;
SMatrix<float,7 > Minv = M.Inverse(ifail);
iret |= compare(ifail,0,"7x7 inversion");
diff --git a/math/unuran/doc/index.txt b/math/unuran/doc/index.txt
index 52e1fa245d0..aa3977852e9 100644
--- a/math/unuran/doc/index.txt
+++ b/math/unuran/doc/index.txt
@@ -67,7 +67,7 @@ The distribution can be initialized from a TF1 or from a vector of probabilities
<pre>
// create distribution from a vector of probabilities
double pv[NSize] = {0.1,0.2,.......};
- TUnuranDiscrDist dist(pv, pv+NSize);
+ TUnuranDiscrDist dist(pv, pv+NSize);
// the recommended method for discrete distribution is
unr.Init(dist, "method=dgt");
// sample N times (generate N random numbers)
diff --git a/math/vc/examples/smatrix/TestTimer.h b/math/vc/examples/smatrix/TestTimer.h
index 7544169f93c..fe1121e6e0f 100644
--- a/math/vc/examples/smatrix/TestTimer.h
+++ b/math/vc/examples/smatrix/TestTimer.h
@@ -1,65 +1,65 @@
#ifndef TESTTIMER_H
#define TESTTIMER_H
-// simple class to measure time
+// simple class to measure time
#include "TStopwatch.h"
-namespace ROOT {
+namespace ROOT {
- namespace Math{
+ namespace Math{
- namespace test {
+ namespace test {
#ifdef REPORT_TIME
- void reportTime( std::string s, double time);
+ void reportTime( std::string s, double time);
#endif
- void printTime(TStopwatch & time, std::string s) {
- int pr = std::cout.precision(8);
- std::cout << s << "\t" << " time = " << time.RealTime() << "\t(sec)\t"
- // << time.CpuTime()
- << std::endl;
- std::cout.precision(pr);
- }
+ void printTime(TStopwatch & time, std::string s) {
+ int pr = std::cout.precision(8);
+ std::cout << s << "\t" << " time = " << time.RealTime() << "\t(sec)\t"
+ // << time.CpuTime()
+ << std::endl;
+ std::cout.precision(pr);
+ }
+
+ class Timer {
- class Timer {
+ public:
- public:
+ Timer(const std::string & s = "") : fName(s), fTime(0)
+ {
+ fWatch.Start();
+ }
+ Timer(double & t, const std::string & s = "") : fName(s), fTime(&t)
+ {
+ fWatch.Start();
+ }
- Timer(const std::string & s = "") : fName(s), fTime(0)
- {
- fWatch.Start();
- }
- Timer(double & t, const std::string & s = "") : fName(s), fTime(&t)
- {
- fWatch.Start();
- }
-
- ~Timer() {
- fWatch.Stop();
- printTime(fWatch,fName);
+ ~Timer() {
+ fWatch.Stop();
+ printTime(fWatch,fName);
#ifdef REPORT_TIME
- // report time
- reportTime(fName, fWatch.RealTime() );
+ // report time
+ reportTime(fName, fWatch.RealTime() );
#endif
- if (fTime) *fTime += fWatch.RealTime();
- }
-
-
- private:
-
- std::string fName;
- double * fTime;
- TStopwatch fWatch;
-
- };
- }
-
- }
+ if (fTime) *fTime += fWatch.RealTime();
+ }
+
+
+ private:
+
+ std::string fName;
+ double * fTime;
+ TStopwatch fWatch;
+
+ };
+ }
+
+ }
}
#endif
diff --git a/math/vc/examples/smatrix/matrix_op_vec.h b/math/vc/examples/smatrix/matrix_op_vec.h
index b6e2fcf6bb1..f6422cd1dbb 100644
--- a/math/vc/examples/smatrix/matrix_op_vec.h
+++ b/math/vc/examples/smatrix/matrix_op_vec.h
@@ -16,14 +16,14 @@ using namespace ROOT::Math;
std::vector<float> gV;
void initValues() {
- gV.reserve(10*NLOOP);
- TRandom3 r;
- std::cout << "init smearing vector ";
- for (int l = 0; l < 10*NLOOP; l++)
- {
- gV.push_back( r.Rndm() );
- }
- std::cout << " with size " << gV.size() << std::endl;
+ gV.reserve(10*NLOOP);
+ TRandom3 r;
+ std::cout << "init smearing vector ";
+ for (int l = 0; l < 10*NLOOP; l++)
+ {
+ gV.push_back( r.Rndm() );
+ }
+ std::cout << " with size " << gV.size() << std::endl;
}
@@ -45,7 +45,7 @@ void testVeq(const V * v, double & time, V * result) {
Stype tmp = 0.0;
test::Timer t(time,"V=V ");
for (int l = 0; l < 10*NLOOP; l++) {
- for (int k = 0; k < NLIST; k++) {
+ for (int k = 0; k < NLIST; k++) {
result[k] = v[k];
}
tmp += SumOfElements(result[NLIST-1]);
@@ -59,7 +59,7 @@ void testMeq(const M * m, double & time, M * result) {
Stype tmp = 0.0;
test::Timer t(time,"M=M ");
for (int l = 0; l < NLOOP; l++) {
- for (int k = 0; k < NLIST; k++) {
+ for (int k = 0; k < NLIST; k++) {
result[k] = m[k];
}
tmp += SumOfElements(result[NLIST-1]);
@@ -74,8 +74,8 @@ template<class V>
void testVad(const V * v1, const V * v2, double & time, V * result) {
Stype tmp = 0.0;
test::Timer t(time,"V+V ");
- for (int l = 0; l < 10*NLOOP; l++) {
- for (int k = 0; k < NLIST; k++) {
+ for (int l = 0; l < 10*NLOOP; l++) {
+ for (int k = 0; k < NLIST; k++) {
result[k] = v1[k] + v2[k];
}
tmp += SumOfElements(result[NLIST-1]);
@@ -88,8 +88,8 @@ template<class M>
void testMad(const M * m1, const M * m2, double & time, M * result) {
Stype tmp = 0.0;
test::Timer t(time,"M+M ");;
- for (int l = 0; l < NLOOP; l++) {
- for (int k = 0; k < NLIST; k++) {
+ for (int l = 0; l < NLOOP; l++) {
+ for (int k = 0; k < NLIST; k++) {
result[k] = m1[k];
result[k] += m2[k];
}
@@ -103,8 +103,8 @@ template<class V, class T>
void testVscale(const V * v, T a, double & time, V * result) {
Stype tmp = 0.0;
test::Timer t(time,"a*V ");;
- for (int l = 0; l < NLOOP; l++) {
- for (int k = 0; k < NLIST; k++) {
+ for (int l = 0; l < NLOOP; l++) {
+ for (int k = 0; k < NLIST; k++) {
result[k] = a * v[k]; // v1 * a does not exist in ROOT
}
tmp += SumOfElements(result[NLIST-1]);
@@ -118,8 +118,8 @@ template<class M, class T>
void testMscale(const M * m1, T a, double & time, M * result) {
Stype tmp = 0.0;
test::Timer t(time,"a*M ");;
- for (int l = 0; l < NLOOP; l++) {
- for (int k = 0; k < NLIST; k++) {
+ for (int l = 0; l < NLOOP; l++) {
+ for (int k = 0; k < NLIST; k++) {
result[k] = m1[k]; result[k] *= a;
}
tmp += SumOfElements(result[NLIST-1]);
@@ -133,8 +133,8 @@ template<class M, class V>
void testMV(const M * mat, const V * v, double & time, V * result) {
Stype tmp = 0.0;
test::Timer t(time,"M*V ");
- for (int l = 0; l < NLOOP; l++) {
- for (int k = 0; k < NLIST; k++) {
+ for (int l = 0; l < NLOOP; l++) {
+ for (int k = 0; k < NLIST; k++) {
result[k] = mat[k] * v[k];
}
tmp += SumOfElements(result[NLIST-1]);
@@ -148,7 +148,7 @@ void testGMV(const M * mat, const V * v1, const V *v2, double & time, V * result
Stype tmp = 0.0;
test::Timer t(time,"M*V+");
for (int l = 0; l < NLOOP; l++) {
- for (int k = 0; k < NLIST; k++) {
+ for (int k = 0; k < NLIST; k++) {
result[k] = mat[k] * v1[k] + v2[k];
}
tmp += SumOfElements(result[NLIST-1]);
@@ -163,7 +163,7 @@ void testMM(const A * a, const B * b, const C * c, double & time, C * result) {
Stype tmp = 0.0;
test::Timer t(time,"M*M ");
for (int l = 0; l < NLOOP; l++) {
- for (int k = 0; k < NLIST; k++) {
+ for (int k = 0; k < NLIST; k++) {
result[k] = a[k] * b[k] + c[k];
}
tmp += SumOfElements(result[NLIST-1]);
@@ -180,8 +180,8 @@ template<class V, class T>
void testDot_S(const V * v1, const V * v2, T * result, double & time) {
Stype tmp = 0.0;
test::Timer t(time,"dot ");
- for (int l = 0; l < 10*NLOOP; l++) {
- for (int k = 0; k < NLIST; k++) {
+ for (int l = 0; l < 10*NLOOP; l++) {
+ for (int k = 0; k < NLIST; k++) {
result[k] = Dot(v1[k],v2[k]);
}
tmp += result[NLIST-1];
@@ -193,7 +193,7 @@ void testDot_S(const V * v1, const V * v2, T * result, double & time) {
// double testDot_S(const std::vector<V*> & w1, const std::vector<V*> & w2, double & time) {
// test::Timer t(time,"dot ");
// double result=0;
-// for (int l = 0; l < NLOOP; l++)
+// for (int l = 0; l < NLOOP; l++)
// {
// V & v1 = *w1[l];
// V & v2 = *w2[l];
@@ -206,8 +206,8 @@ template<class M, class V, class T>
void testInnerProd_S(const M * a, const V * v, T * result, double & time) {
Stype tmp = 0.0;
test::Timer t(time,"prod");
- for (int l = 0; l < 10*NLOOP; l++) {
- for (int k = 0; k < NLIST; k++) {
+ for (int l = 0; l < 10*NLOOP; l++) {
+ for (int k = 0; k < NLIST; k++) {
result[k] = Similarity(v[k],a[k]);
}
tmp += result[NLIST-1];
@@ -222,8 +222,8 @@ void testInv_S( const M * m, double & time, M * result){
test::Timer t(time,"inv ");
int ierr = 0;
int ifail = 0;
- for (int l = 0; l < NLOOP; l++) {
- for (int k = 0; k < NLIST; k++) {
+ for (int l = 0; l < NLOOP; l++) {
+ for (int k = 0; k < NLIST; k++) {
result[k] = m[k].Inverse(ifail);
ierr += ifail;
//result = mtmp.Inverse(ifail);
@@ -241,8 +241,8 @@ void testInvFast_S( const M * m, double & time, M * result){
test::Timer t(time,"invF");
int ierr = 0;
int ifail = 0;
- for (int l = 0; l < NLOOP; l++) {
- for (int k = 0; k < NLIST; k++) {
+ for (int l = 0; l < NLOOP; l++) {
+ for (int k = 0; k < NLIST; k++) {
result[k] = m[k].InverseFast(ifail);
ierr += ifail;
//result = mtmp.Inverse(ifail);
@@ -260,8 +260,8 @@ void testInvChol_S( const M * m, double & time, M * result){
test::Timer t(time,"invC");
int ierr = 0;
int ifail = 0;
- for (int l = 0; l < NLOOP; l++) {
- for (int k = 0; k < NLIST; k++) {
+ for (int l = 0; l < NLOOP; l++) {
+ for (int k = 0; k < NLIST; k++) {
result[k] = m[k].InverseChol(ifail);
ierr += ifail;
//result = mtmp.Inverse(ifail);
@@ -280,7 +280,7 @@ void testATBA_S(const A * a, const B * b, double & time, C * result) {
Stype tmp = 0.0;
test::Timer t(time,"At*M*A");
for (int l = 0; l < NLOOP; l++) {
- for (int k = 0; k < NLIST; k++) {
+ for (int k = 0; k < NLIST; k++) {
C tmp = b[k] * Transpose(a[k]);
result[k] = a[k] * tmp;
}
@@ -295,7 +295,7 @@ void testATBA_S2(const A * a, const B * b, double & time, C * result) {
Stype tmp = 0.0;
test::Timer t(time,"At*M*A");
for (int l = 0; l < NLOOP; l++) {
- for (int k = 0; k < NLIST; k++) {
+ for (int k = 0; k < NLIST; k++) {
//result = Transpose(a) * b * a;
//result = a * b * Transpose(a);
//result = a * b * a;
@@ -312,7 +312,7 @@ void testMT_S(const A * a, double & time, C * result) {
Stype tmp = 0.0;
test::Timer t(time,"Transp");
for (int l = 0; l < NLOOP; l++) {
- for (int k = 0; k < NLIST; k++) {
+ for (int k = 0; k < NLIST; k++) {
//result = Transpose(a) * b * a;
//result = a * b * Transpose(a);
//result = a * b * a;
@@ -395,7 +395,7 @@ double testDot_T(const V & v1, const V & v2, double & time) {
V vtmp = v2;
test::Timer t(time,"dot ");
double result=0;
- for (int l = 0; l < 10*NLOOP; l++)
+ for (int l = 0; l < 10*NLOOP; l++)
{
vtmp[0] = gV[l];
result = Dot(v1,vtmp);
@@ -420,7 +420,7 @@ template<class M>
void testInv_T(const M & m, double & time, M& result){
M mtmp = m;
test::Timer t(time,"inv ");
- for (int l = 0; l < NLOOP; l++)
+ for (int l = 0; l < NLOOP; l++)
{
mtmp(0,0) = gV[l];
memcpy(result.GetMatrixArray(),mtmp.GetMatrixArray(),mtmp.GetNoElements()*sizeof(Double_t));
@@ -432,7 +432,7 @@ template<class M>
void testInv_T2(const M & m, double & time, M& result){
M mtmp = m;
test::Timer t(time,"inv2");
- for (int l = 0; l < NLOOP; l++)
+ for (int l = 0; l < NLOOP; l++)
{
memcpy(result.GetMatrixArray(),mtmp.GetMatrixArray(),mtmp.GetNoElements()*sizeof(Double_t));
result.InvertFast();
@@ -471,7 +471,7 @@ template<class A, class B, class C>
void testATBA_T2(const A & a, const B & b, double & time, C & result) {
B btmp = b;
test::Timer t(time,"At*M*A");
- for (int l = 0; l < NLOOP; l++)
+ for (int l = 0; l < NLOOP; l++)
{
btmp(0,0) = gV[l];
memcpy(result.GetMatrixArray(),btmp.GetMatrixArray(),btmp.GetNoElements()*sizeof(Double_t));
@@ -497,7 +497,7 @@ template<class A, class C>
void testMT_T(const A & a, double & time, C & result) {
A atmp = a;
test::Timer t(time,"Transp");
- for (int l = 0; l < NLOOP; l++)
+ for (int l = 0; l < NLOOP; l++)
{
atmp(0,0) = gV[l];
result.Transpose(atmp);
@@ -514,7 +514,7 @@ double testDot_C(const V & v1, const V & v2, double & time) {
V vtmp = v2;
test::Timer t(time,"dot ");
double result=0;
- for (int l = 0; l < 10*NLOOP; l++)
+ for (int l = 0; l < 10*NLOOP; l++)
{
vtmp[0] = gV[l];
result = dot(v1,vtmp);
@@ -527,7 +527,7 @@ double testInnerProd_C(const M & a, const V & v, double & time) {
V vtmp = v;
test::Timer t(time,"prod");
double result=0;
- for (int l = 0; l < NLOOP; l++)
+ for (int l = 0; l < NLOOP; l++)
{
vtmp[0] = gV[l];
V tmp = a*vtmp;
@@ -542,7 +542,7 @@ template<class M>
void testMeq_C(const M & m, double & time, M & result) {
M mtmp = m;
test::Timer t(time,"M=M ");
- for (int l = 0; l < NLOOP; l++)
+ for (int l = 0; l < NLOOP; l++)
{
mtmp(1,1) = gV[l];
result = mtmp;
@@ -554,7 +554,7 @@ template<class M>
void testMad_C(const M & m1, const M & m2, double & time, M & result) {
M mtmp = m2;
test::Timer t(time,"M+M ");;
- for (int l = 0; l < NLOOP; l++)
+ for (int l = 0; l < NLOOP; l++)
{
mtmp(1,1) = gV[l];
result = m1; result += mtmp;
@@ -567,7 +567,7 @@ template<class M>
void testMscale_C(const M & m1, double a, double & time, M & result) {
M mtmp = m1;
test::Timer t(time,"a*M ");;
- for (int l = 0; l < NLOOP; l++)
+ for (int l = 0; l < NLOOP; l++)
{
mtmp(1,1) = gV[l];
result = mtmp * a;
@@ -580,7 +580,7 @@ template<class A, class B, class C>
void testMM_C(const A & a, const B & b, const C & c, double & time, C & result) {
B btmp = b;
test::Timer t(time,"M*M ");
- for (int l = 0; l < NLOOP; l++)
+ for (int l = 0; l < NLOOP; l++)
{
btmp(1,1) = gV[l];
result = a * btmp + c;
@@ -594,7 +594,7 @@ void testInv_C( const M & a, double & time, M& result){
M mtmp = a;
test::Timer t(time,"inv ");
int ifail = 0;
- for (int l = 0; l < NLOOP; l++)
+ for (int l = 0; l < NLOOP; l++)
{
mtmp(1,1) = gV[l];
result = mtmp.inverse(ifail);
@@ -607,7 +607,7 @@ template<class A, class B, class C>
void testATBA_C(const A & a, const B & b, double & time, C & result) {
B btmp = b;
test::Timer t(time,"At*M*A");
- for (int l = 0; l < NLOOP; l++)
+ for (int l = 0; l < NLOOP; l++)
{
btmp(1,1) = gV[l];
//result = a.T() * b * a;
@@ -620,7 +620,7 @@ template<class A, class B, class C>
void testATBA_C2(const A & a, const B & b, double & time, C & result) {
B btmp = b;
test::Timer t(time,"At*M*A");
- for (int l = 0; l < NLOOP; l++)
+ for (int l = 0; l < NLOOP; l++)
{
btmp(1,1) = gV[l];
result = btmp.similarity(a);
@@ -632,7 +632,7 @@ template<class A, class C>
void testMT_C(const A & a, double & time, C & result) {
A atmp = a;
test::Timer t(time,"Transp");
- for (int l = 0; l < NLOOP; l++)
+ for (int l = 0; l < NLOOP; l++)
{
atmp(1,1) = gV[l];
result = atmp.T();
diff --git a/math/vc/examples/smatrix/matrix_util.h b/math/vc/examples/smatrix/matrix_util.h
index 2bb6a60f074..a1c8f1b96af 100644
--- a/math/vc/examples/smatrix/matrix_util.h
+++ b/math/vc/examples/smatrix/matrix_util.h
@@ -23,11 +23,11 @@ void fillRandomSym(TRandom & r, M & m, unsigned int first, unsigned int start =
for(unsigned int i = start; i < first+start; ++i) {
for(unsigned int j = i; j < first+start; ++j) {
if ( i != j ) {
- m(i,j) = r.Rndm() + offset;
- m(j,i) = m(i,j);
- }
- else // add extra offset to make no singular when inverting
- m(i,i) = r.Rndm() + 3*offset;
+ m(i,j) = r.Rndm() + offset;
+ m(j,i) = m(i,j);
+ }
+ else // add extra offset to make no singular when inverting
+ m(i,i) = r.Rndm() + 3*offset;
}
}
}
diff --git a/math/vc/examples/smatrix/testOperations.cxx b/math/vc/examples/smatrix/testOperations.cxx
index ac957fed9b4..38b70382c3a 100644
--- a/math/vc/examples/smatrix/testOperations.cxx
+++ b/math/vc/examples/smatrix/testOperations.cxx
@@ -152,7 +152,7 @@ int test_smatrix_op() {
-
+
MnVectorN v1[NLIST]; testMV(A,v,t_mv,v1);
//if (k == 0) v1.Print(std::cout);
MnVectorN v2[NLIST]; testGMV(A,v,v1,t_gmv,v2);
@@ -265,7 +265,7 @@ int test_smatrix_sym_op() {
#endif
w.Start();
-
+
MnVectorN v1[NLIST]; testMV(A,v,t_mv,v1);
MnVectorN v2[NLIST]; testGMV(A,v,v1,t_gmv,v2);
MnMatrixNN C0[NLIST]; testMM(A,B,C,t_mm,C0);
@@ -375,7 +375,7 @@ int test_tmatrix_op() {
}
#endif
w.Start();
-
+
MnVector v1(ND1); testMV_T(A,v,t_mv,v1);
//if (k == 0) v1.Print();
@@ -490,7 +490,7 @@ int test_tmatrix_sym_op() {
#endif
w.Start();
-
+
MnVector v1(N); testMV_T(A,v,t_mv,v1);
MnVector v2(N); testGMV_T(A,v,v1,t_gmv,v2);
MnMatrix C0(N,N); testMM_T(A,B,C,t_mm,C0);
@@ -590,7 +590,7 @@ int test_hepmatrix_op() {
std::cout << " p = " << p << std::endl;
}
#endif
-
+
w.Start();
MnVector v1(ND1); testMV(A,v,t_mv,v1);
@@ -694,7 +694,7 @@ int test_hepmatrix_sym_op() {
#endif
w.Start();
-
+
MnVector v1(N); testMV(A,v,t_mv,v1);
MnVector v2(N); testGMV(A,v,v1,t_gmv,v2);
MnMatrix C0(N,N); testMM_C(A,B,C,t_mm,C0);
diff --git a/math/vc/examples/tsc.h b/math/vc/examples/tsc.h
index 0cde95e4cf8..b9526ccffa8 100644
--- a/math/vc/examples/tsc.h
+++ b/math/vc/examples/tsc.h
@@ -43,7 +43,7 @@ class TimeStampCounter
inline void TimeStampCounter::Start()
{
#ifdef _MSC_VER
- unsigned int tmp;
+ unsigned int tmp;
m_start.a = __rdtscp(&tmp);
#else
asm volatile("rdtscp" : "=a"(m_start.b[0]), "=d"(m_start.b[1]) :: "ecx" );
@@ -53,7 +53,7 @@ inline void TimeStampCounter::Start()
inline void TimeStampCounter::Stop()
{
#ifdef _MSC_VER
- unsigned int tmp;
+ unsigned int tmp;
m_end.a = __rdtscp(&tmp);
#else
asm volatile("rdtscp" : "=a"(m_end.b[0]), "=d"(m_end.b[1]) :: "ecx" );
diff --git a/math/vc/include/Vc/common/memory.h b/math/vc/include/Vc/common/memory.h
index 49cc9418767..fade13490f2 100644
--- a/math/vc/include/Vc/common/memory.h
+++ b/math/vc/include/Vc/common/memory.h
@@ -133,10 +133,10 @@ template<typename V, size_t Size1, size_t Size2> class Memory : public VectorAli
#elif defined(VC_CLANG)
__attribute__((aligned(__alignof(VectorAlignedBaseT<V>))))
#elif defined(VC_MSVC)
- VectorAlignedBaseT<V> _force_alignment;
+ VectorAlignedBaseT<V> _force_alignment;
// __declspec(align(#)) accepts only numbers not __alignof nor just VectorAlignment
- // by putting VectorAlignedBaseT<V> here _force_alignment is aligned correctly.
- // the downside is that there's a lot of padding before m_mem (32 Bytes with SSE) :(
+ // by putting VectorAlignedBaseT<V> here _force_alignment is aligned correctly.
+ // the downside is that there's a lot of padding before m_mem (32 Bytes with SSE) :(
#endif
EntryType m_mem[Size1][PaddedSize2];
public:
@@ -271,10 +271,10 @@ template<typename V, size_t Size1, size_t Size2> class Memory : public VectorAli
#elif defined(VC_CLANG)
__attribute__((aligned(__alignof(VectorAlignedBaseT<V>))))
#elif defined(VC_MSVC)
- VectorAlignedBaseT<V> _force_alignment;
+ VectorAlignedBaseT<V> _force_alignment;
// __declspec(align(#)) accepts only numbers not __alignof nor just VectorAlignment
- // by putting VectorAlignedBaseT<V> here _force_alignment is aligned correctly.
- // the downside is that there's a lot of padding before m_mem (32 Bytes with SSE) :(
+ // by putting VectorAlignedBaseT<V> here _force_alignment is aligned correctly.
+ // the downside is that there's a lot of padding before m_mem (32 Bytes with SSE) :(
#endif
EntryType m_mem[PaddedSize];
public:
diff --git a/math/vc/include/Vc/sse/mask.h b/math/vc/include/Vc/sse/mask.h
index 6ba25a72873..5876b7de8f8 100644
--- a/math/vc/include/Vc/sse/mask.h
+++ b/math/vc/include/Vc/sse/mask.h
@@ -451,7 +451,7 @@ class Float8Mask
Vc_ALWAYS_INLINE Vc_PURE int count() const {
#ifdef VC_IMPL_POPCNT
- return _mm_popcnt_u32(toInt());
+ return _mm_popcnt_u32(toInt());
#else
//X int tmp1 = _mm_movemask_ps(k[0]);
//X int tmp2 = _mm_movemask_ps(k[1]);
diff --git a/math/vc/include/Vc/sse/vectorhelper.tcc b/math/vc/include/Vc/sse/vectorhelper.tcc
index 10c5afddf1c..dca162ff38f 100644
--- a/math/vc/include/Vc/sse/vectorhelper.tcc
+++ b/math/vc/include/Vc/sse/vectorhelper.tcc
@@ -362,7 +362,7 @@ template<typename T> Vc_ALWAYS_INLINE void VectorHelper<_M128I>::store(T *mem, c
}
template<> inline Vc_PURE M256 SortHelper<M256, 8>::sort(const M256 &_x)
{
- M256 x = _x;
+ M256 x = _x;
typedef SortHelper<_M128, 4> H;
_M128 a, b, l, h;
diff --git a/math/vc/tests/math.cpp b/math/vc/tests/math.cpp
index bb267e2b7a9..1ba9fa8ccb1 100644
--- a/math/vc/tests/math.cpp
+++ b/math/vc/tests/math.cpp
@@ -533,7 +533,7 @@ template<typename V> void testAtan2()/*{{{*/
COMPARE(Vc::atan2(-inf, V(T(-3.))), -Pi_2);
#ifndef _WIN32 // the Microsoft implementation of atan2 fails this test
const V Pi_4 = T(Vc_buildDouble(1, 0x921fb54442d18ull, -1));
- // If y is positive infinity (negative infinity) and x is negative infinity, +3*pi/4 (-3*pi/4) is returned.
+ // If y is positive infinity (negative infinity) and x is negative infinity, +3*pi/4 (-3*pi/4) is returned.
COMPARE(Vc::atan2(+inf, -inf), T(+3.) * Pi_4);
COMPARE(Vc::atan2(-inf, -inf), T(-3.) * Pi_4);
// If y is positive infinity (negative infinity) and x is positive infinity, +pi/4 (-pi/4) is returned.
diff --git a/math/vc/tests/store.cpp b/math/vc/tests/store.cpp
index fb1a426933a..aeb37923745 100644
--- a/math/vc/tests/store.cpp
+++ b/math/vc/tests/store.cpp
@@ -126,7 +126,7 @@ template<typename Vec> void maskedStore()
const int count = 256 * 1024 / sizeof(T);
const int outerCount = count / Vec::Size;
Vc::Memory<Vec> array(count);
- array.setZero();
+ array.setZero();
const T nullValue = 0;
const T setValue = 170;
const Vec x(setValue);
diff --git a/math/vdt/include/vdt/asin.h b/math/vdt/include/vdt/asin.h
index fcb3a975509..21290f8e93b 100644
--- a/math/vdt/include/vdt/asin.h
+++ b/math/vdt/include/vdt/asin.h
@@ -58,57 +58,57 @@ const double QX4asin = 1.395105614657485689735E2;
const double QX5asin = -4.918853881490881290097E1;
inline double getRX(const double x){
- double rx = RX1asin;
- rx*= x;
- rx+= RX2asin;
- rx*= x;
- rx+= RX3asin;
- rx*= x;
- rx+= RX4asin;
- rx*= x;
- rx+= RX5asin;
- return rx;
+ double rx = RX1asin;
+ rx*= x;
+ rx+= RX2asin;
+ rx*= x;
+ rx+= RX3asin;
+ rx*= x;
+ rx+= RX4asin;
+ rx*= x;
+ rx+= RX5asin;
+ return rx;
}
inline double getSX(const double x){
- double sx = x;
- sx+= SX1asin;
- sx*= x;
- sx+= SX2asin;
- sx*= x;
- sx+= SX3asin;
- sx*= x;
- sx+= SX4asin;
- return sx;
+ double sx = x;
+ sx+= SX1asin;
+ sx*= x;
+ sx+= SX2asin;
+ sx*= x;
+ sx+= SX3asin;
+ sx*= x;
+ sx+= SX4asin;
+ return sx;
}
inline double getPX(const double x){
- double px = PX1asin;
- px*= x;
- px+= PX2asin;
- px*= x;
- px+= PX3asin;
- px*= x;
- px+= PX4asin;
- px*= x;
- px+= PX5asin;
- px*= x;
- px+= PX6asin;
- return px;
+ double px = PX1asin;
+ px*= x;
+ px+= PX2asin;
+ px*= x;
+ px+= PX3asin;
+ px*= x;
+ px+= PX4asin;
+ px*= x;
+ px+= PX5asin;
+ px*= x;
+ px+= PX6asin;
+ return px;
}
inline double getQX(const double x){
- double qx = x;
- qx+= QX1asin;
- qx*= x;
- qx+= QX2asin;
- qx*= x;
- qx+= QX3asin;
- qx*= x;
- qx+= QX4asin;
- qx*= x;
- qx+= QX5asin;
- return qx;
- }
+ double qx = x;
+ qx+= QX1asin;
+ qx*= x;
+ qx+= QX2asin;
+ qx*= x;
+ qx+= QX3asin;
+ qx*= x;
+ qx+= QX4asin;
+ qx*= x;
+ qx+= QX5asin;
+ return qx;
+ }
}
}
@@ -117,38 +117,38 @@ namespace vdt{
// asin double precision --------------------------------------------------------
/// Double Precision asin
-inline double fast_asin(double x){
-
- const uint64_t sign_mask = details::getSignMask(x);
- x = std::fabs(x);
- const double a = x;
-
-
- double zz = 1.0 - a;
- double px = details::getRX(zz);
- double qx = details::getSX(zz);
-
- const double p = zz * px/qx;
-
- zz = std::sqrt(zz+zz);
- double z = details::PIO4 - zz;
- zz = zz * p - details::MOREBITS;
- z -= zz;
- z += details::PIO4;
-
- if( a < 0.625 ){
- zz = a * a;
- px = details::getPX(zz);
- qx = details::getQX(zz);
- z = zz*px/qx;
- z = a * z + a;
- }
-
-
- // Linear approx, not sooo needed but seable. Price is cheap though
- double res = a < 1e-8? a : z ;
- // Restore Sign
- return details::dpORuint64(res,sign_mask);
+inline double fast_asin(double x){
+
+ const uint64_t sign_mask = details::getSignMask(x);
+ x = std::fabs(x);
+ const double a = x;
+
+
+ double zz = 1.0 - a;
+ double px = details::getRX(zz);
+ double qx = details::getSX(zz);
+
+ const double p = zz * px/qx;
+
+ zz = std::sqrt(zz+zz);
+ double z = details::PIO4 - zz;
+ zz = zz * p - details::MOREBITS;
+ z -= zz;
+ z += details::PIO4;
+
+ if( a < 0.625 ){
+ zz = a * a;
+ px = details::getPX(zz);
+ qx = details::getQX(zz);
+ z = zz*px/qx;
+ z = a * z + a;
+ }
+
+
+ // Linear approx, not sooo needed but seable. Price is cheap though
+ double res = a < 1e-8? a : z ;
+ // Restore Sign
+ return details::dpORuint64(res,sign_mask);
}
diff --git a/math/vdt/include/vdt/atan.h b/math/vdt/include/vdt/atan.h
index b9a04a8326f..54540353d27 100644
--- a/math/vdt/include/vdt/atan.h
+++ b/math/vdt/include/vdt/atan.h
@@ -37,45 +37,45 @@ const double MOREBITSO2 = MOREBITS * 0.5;
inline double get_atan_px(const double x2){
- const double PX1atan = -8.750608600031904122785E-1;
- const double PX2atan = -1.615753718733365076637E1;
- const double PX3atan = -7.500855792314704667340E1;
- const double PX4atan = -1.228866684490136173410E2;
- const double PX5atan = -6.485021904942025371773E1;
-
- double px = PX1atan;
- px *= x2;
- px += PX2atan;
- px *= x2;
- px += PX3atan;
- px *= x2;
- px += PX4atan;
- px *= x2;
- px += PX5atan;
-
- return px;
+ const double PX1atan = -8.750608600031904122785E-1;
+ const double PX2atan = -1.615753718733365076637E1;
+ const double PX3atan = -7.500855792314704667340E1;
+ const double PX4atan = -1.228866684490136173410E2;
+ const double PX5atan = -6.485021904942025371773E1;
+
+ double px = PX1atan;
+ px *= x2;
+ px += PX2atan;
+ px *= x2;
+ px += PX3atan;
+ px *= x2;
+ px += PX4atan;
+ px *= x2;
+ px += PX5atan;
+
+ return px;
}
inline double get_atan_qx(const double x2){
- const double QX1atan = 2.485846490142306297962E1;
- const double QX2atan = 1.650270098316988542046E2;
- const double QX3atan = 4.328810604912902668951E2;
- const double QX4atan = 4.853903996359136964868E2;
- const double QX5atan = 1.945506571482613964425E2;
-
- double qx=x2;
- qx += QX1atan;
- qx *=x2;
- qx += QX2atan;
- qx *=x2;
- qx += QX3atan;
- qx *=x2;
- qx += QX4atan;
- qx *=x2;
- qx += QX5atan;
-
- return qx;
+ const double QX1atan = 2.485846490142306297962E1;
+ const double QX2atan = 1.650270098316988542046E2;
+ const double QX3atan = 4.328810604912902668951E2;
+ const double QX4atan = 4.853903996359136964868E2;
+ const double QX5atan = 1.945506571482613964425E2;
+
+ double qx=x2;
+ qx += QX1atan;
+ qx *=x2;
+ qx += QX2atan;
+ qx *=x2;
+ qx += QX3atan;
+ qx *=x2;
+ qx += QX4atan;
+ qx *=x2;
+ qx += QX5atan;
+
+ return qx;
}
}
@@ -85,75 +85,75 @@ inline double get_atan_qx(const double x2){
/// Fast Atan implementation double precision
inline double fast_atan(double x){
- /* make argument positive and save the sign */
- const uint64_t sign_mask = details::getSignMask(x);
- x=std::fabs(x);
+ /* make argument positive and save the sign */
+ const uint64_t sign_mask = details::getSignMask(x);
+ x=std::fabs(x);
- /* range reduction */
- const double originalx=x;
+ /* range reduction */
+ const double originalx=x;
- double y = details::PIO4;
- double factor = details::MOREBITSO2;
- x = (x-1.0) / (x+1.0);
+ double y = details::PIO4;
+ double factor = details::MOREBITSO2;
+ x = (x-1.0) / (x+1.0);
- if( originalx > details::T3PO8 ) {
- y = details::PIO2;
- factor = details::MOREBITS;
- x = -1.0 / originalx ;
- }
- if ( originalx <= 0.66 ) {
- y = 0.;
- factor = 0.;
- x = originalx;
- }
+ if( originalx > details::T3PO8 ) {
+ y = details::PIO2;
+ factor = details::MOREBITS;
+ x = -1.0 / originalx ;
+ }
+ if ( originalx <= 0.66 ) {
+ y = 0.;
+ factor = 0.;
+ x = originalx;
+ }
- const double x2 = x * x;
+ const double x2 = x * x;
- const double px = details::get_atan_px(x2);
- const double qx = details::get_atan_qx(x2);
+ const double px = details::get_atan_px(x2);
+ const double qx = details::get_atan_qx(x2);
- //double res = y +x * x2 * px / qx + x +factor;
+ //double res = y +x * x2 * px / qx + x +factor;
- const double poq=px / qx;
+ const double poq=px / qx;
- double res = x * x2 * poq + x;
- res+=y;
+ double res = x * x2 * poq + x;
+ res+=y;
- res+=factor;
+ res+=factor;
- return details::dpORuint64(res,sign_mask);
+ return details::dpORuint64(res,sign_mask);
}
//------------------------------------------------------------------------------
/// Fast Atan implementation single precision
inline float fast_atanf( float xx ) {
- const uint32_t sign_mask = details::getSignMask(xx);
+ const uint32_t sign_mask = details::getSignMask(xx);
- float x= std::fabs(xx);
- const float x0=x;
- float y=0.0f;
+ float x= std::fabs(xx);
+ const float x0=x;
+ float y=0.0f;
- /* range reduction */
- if( x0 > 0.4142135623730950f ){ // * tan pi/8
- x = (x0-1.0f)/(x0+1.0f);
- y = details::PIO4F;
- }
- if( x0 > 2.414213562373095f ){ // tan 3pi/8
- x = -( 1.0f/x0 );
- y = details::PIO2F;
- }
+ /* range reduction */
+ if( x0 > 0.4142135623730950f ){ // * tan pi/8
+ x = (x0-1.0f)/(x0+1.0f);
+ y = details::PIO4F;
+ }
+ if( x0 > 2.414213562373095f ){ // tan 3pi/8
+ x = -( 1.0f/x0 );
+ y = details::PIO2F;
+ }
- const float x2 = x * x;
- y +=
- ((( 8.05374449538e-2f * x2
- - 1.38776856032E-1f) * x2
- + 1.99777106478E-1f) * x2
- - 3.33329491539E-1f) * x2 * x
- + x;
+ const float x2 = x * x;
+ y +=
+ ((( 8.05374449538e-2f * x2
+ - 1.38776856032E-1f) * x2
+ + 1.99777106478E-1f) * x2
+ - 3.33329491539E-1f) * x2 * x
+ + x;
- return details::spORuint32(y,sign_mask);
+ return details::spORuint32(y,sign_mask);
}
//------------------------------------------------------------------------------
diff --git a/math/vdt/include/vdt/exp.h b/math/vdt/include/vdt/exp.h
index dadd0db729f..25719e0ccd7 100644
--- a/math/vdt/include/vdt/exp.h
+++ b/math/vdt/include/vdt/exp.h
@@ -116,7 +116,7 @@ inline double fast_exp(double initial_x){
/// Exponential Function single precision
inline float fast_expf(float initial_x) {
-
+
float x = initial_x;
float z = details::fpfloor( details::LOG2EF * x +0.5f ); /* floor() truncates toward -infinity. */
diff --git a/math/vdt/include/vdt/log.h b/math/vdt/include/vdt/log.h
index 34bff7f9df5..ffd5e728427 100644
--- a/math/vdt/include/vdt/log.h
+++ b/math/vdt/include/vdt/log.h
@@ -41,46 +41,46 @@ const double LOG_LOWER_LIMIT = 0;
const double SQRTH = 0.70710678118654752440;
inline double get_log_px(const double x){
- const double PX1log = 1.01875663804580931796E-4;
- const double PX2log = 4.97494994976747001425E-1;
- const double PX3log = 4.70579119878881725854E0;
- const double PX4log = 1.44989225341610930846E1;
- const double PX5log = 1.79368678507819816313E1;
- const double PX6log = 7.70838733755885391666E0;
-
- double px = PX1log;
- px *= x;
- px += PX2log;
- px *= x;
- px += PX3log;
- px *= x;
- px += PX4log;
- px *= x;
- px += PX5log;
- px *= x;
- px += PX6log;
- return px;
+ const double PX1log = 1.01875663804580931796E-4;
+ const double PX2log = 4.97494994976747001425E-1;
+ const double PX3log = 4.70579119878881725854E0;
+ const double PX4log = 1.44989225341610930846E1;
+ const double PX5log = 1.79368678507819816313E1;
+ const double PX6log = 7.70838733755885391666E0;
+
+ double px = PX1log;
+ px *= x;
+ px += PX2log;
+ px *= x;
+ px += PX3log;
+ px *= x;
+ px += PX4log;
+ px *= x;
+ px += PX5log;
+ px *= x;
+ px += PX6log;
+ return px;
}
inline double get_log_qx(const double x){
- const double QX1log = 1.12873587189167450590E1;
- const double QX2log = 4.52279145837532221105E1;
- const double QX3log = 8.29875266912776603211E1;
- const double QX4log = 7.11544750618563894466E1;
- const double QX5log = 2.31251620126765340583E1;
-
- double qx = x;
- qx += QX1log;
- qx *=x;
- qx += QX2log;
- qx *=x;
- qx += QX3log;
- qx *=x;
- qx += QX4log;
- qx *=x;
- qx += QX5log;
- return qx;
+ const double QX1log = 1.12873587189167450590E1;
+ const double QX2log = 4.52279145837532221105E1;
+ const double QX3log = 8.29875266912776603211E1;
+ const double QX4log = 7.11544750618563894466E1;
+ const double QX5log = 2.31251620126765340583E1;
+
+ double qx = x;
+ qx += QX1log;
+ qx *=x;
+ qx += QX2log;
+ qx *=x;
+ qx += QX3log;
+ qx *=x;
+ qx += QX4log;
+ qx *=x;
+ qx += QX5log;
+ return qx;
}
}
@@ -88,40 +88,40 @@ inline double get_log_qx(const double x){
// Log double precision --------------------------------------------------------
inline double fast_log(double x){
- const double original_x = x;
+ const double original_x = x;
- /* separate mantissa from exponent */
- double fe;
- x = details::getMantExponent(x,fe);
+ /* separate mantissa from exponent */
+ double fe;
+ x = details::getMantExponent(x,fe);
- // blending
- x > details::SQRTH? fe+=1. : x+=x ;
- x -= 1.0;
+ // blending
+ x > details::SQRTH? fe+=1. : x+=x ;
+ x -= 1.0;
- /* rational form */
- double px = details::get_log_px(x);
+ /* rational form */
+ double px = details::get_log_px(x);
- //for the final formula
- const double x2 = x*x;
- px *= x;
- px *= x2;
+ //for the final formula
+ const double x2 = x*x;
+ px *= x;
+ px *= x2;
- const double qx = details::get_log_qx(x);
+ const double qx = details::get_log_qx(x);
- double res = px / qx ;
+ double res = px / qx ;
- res -= fe * 2.121944400546905827679e-4;
- res -= 0.5 * x2 ;
+ res -= fe * 2.121944400546905827679e-4;
+ res -= 0.5 * x2 ;
- res = x + res;
- res += fe * 0.693359375;
+ res = x + res;
+ res += fe * 0.693359375;
- if (original_x > details::LOG_UPPER_LIMIT)
- res = std::numeric_limits<double>::infinity();
- if (original_x < details::LOG_LOWER_LIMIT) // THIS IS NAN!
- res = - std::numeric_limits<double>::quiet_NaN();
+ if (original_x > details::LOG_UPPER_LIMIT)
+ res = std::numeric_limits<double>::infinity();
+ if (original_x < details::LOG_LOWER_LIMIT) // THIS IS NAN!
+ res = - std::numeric_limits<double>::quiet_NaN();
- return res;
+ return res;
}
@@ -135,33 +135,33 @@ const float LOGF_UPPER_LIMIT = MAXNUMF;
const float LOGF_LOWER_LIMIT = 0;
const float PX1logf = 7.0376836292E-2f;
-const float PX2logf = -1.1514610310E-1f;
-const float PX3logf = 1.1676998740E-1f;
-const float PX4logf = -1.2420140846E-1f;
-const float PX5logf = 1.4249322787E-1f;
-const float PX6logf = -1.6668057665E-1f;
-const float PX7logf = 2.0000714765E-1f;
-const float PX8logf = -2.4999993993E-1f;
-const float PX9logf = 3.3333331174E-1f;
+const float PX2logf = -1.1514610310E-1f;
+const float PX3logf = 1.1676998740E-1f;
+const float PX4logf = -1.2420140846E-1f;
+const float PX5logf = 1.4249322787E-1f;
+const float PX6logf = -1.6668057665E-1f;
+const float PX7logf = 2.0000714765E-1f;
+const float PX8logf = -2.4999993993E-1f;
+const float PX9logf = 3.3333331174E-1f;
inline float get_log_poly(const float x){
- float y = x*PX1logf;
- y += PX2logf;
- y *= x;
- y += PX3logf;
- y *= x;
- y += PX4logf;
- y *= x;
- y += PX5logf;
- y *= x;
- y += PX6logf;
- y *= x;
- y += PX7logf;
- y *= x;
- y += PX8logf;
- y *= x;
- y += PX9logf;
- return y;
+ float y = x*PX1logf;
+ y += PX2logf;
+ y *= x;
+ y += PX3logf;
+ y *= x;
+ y += PX4logf;
+ y *= x;
+ y += PX5logf;
+ y *= x;
+ y += PX6logf;
+ y *= x;
+ y += PX7logf;
+ y *= x;
+ y += PX8logf;
+ y *= x;
+ y += PX9logf;
+ return y;
}
const float SQRTHF = 0.707106781186547524f;
@@ -171,32 +171,32 @@ const float SQRTHF = 0.707106781186547524f;
// Log single precision --------------------------------------------------------
inline float fast_logf( float x ) {
- const float original_x = x;
+ const float original_x = x;
- float fe;
- x = details::getMantExponentf( x, fe);
+ float fe;
+ x = details::getMantExponentf( x, fe);
- x > details::SQRTHF? fe+=1.f : x+=x ;
- x -= 1.0f;
+ x > details::SQRTHF? fe+=1.f : x+=x ;
+ x -= 1.0f;
- const float x2 = x*x;
+ const float x2 = x*x;
- float res = details::get_log_poly(x);
- res *= x2*x;
+ float res = details::get_log_poly(x);
+ res *= x2*x;
- res += -2.12194440e-4f * fe;
- res += -0.5f * x2;
+ res += -2.12194440e-4f * fe;
+ res += -0.5f * x2;
- res= x + res;
+ res= x + res;
- res += 0.693359375f * fe;
+ res += 0.693359375f * fe;
- if (original_x > details::LOGF_UPPER_LIMIT)
- res = std::numeric_limits<float>::infinity();
- if (original_x < details::LOGF_LOWER_LIMIT)
- res = -std::numeric_limits<float>::quiet_NaN();
+ if (original_x > details::LOGF_UPPER_LIMIT)
+ res = std::numeric_limits<float>::infinity();
+ if (original_x < details::LOGF_LOWER_LIMIT)
+ res = -std::numeric_limits<float>::quiet_NaN();
- return res;
+ return res;
}
diff --git a/math/vdt/include/vdt/sincos.h b/math/vdt/include/vdt/sincos.h
index 563ae934f7f..5422001418a 100644
--- a/math/vdt/include/vdt/sincos.h
+++ b/math/vdt/include/vdt/sincos.h
@@ -70,35 +70,35 @@ const float T24M1 = 16777215.;
//------------------------------------------------------------------------------
inline double get_sin_px(const double x){
- double px=C1sin;
- px *= x;
- px += C2sin;
- px *= x;
- px += C3sin;
- px *= x;
- px += C4sin;
- px *= x;
- px += C5sin;
- px *= x;
- px += C6sin;
- return px;
+ double px=C1sin;
+ px *= x;
+ px += C2sin;
+ px *= x;
+ px += C3sin;
+ px *= x;
+ px += C4sin;
+ px *= x;
+ px += C5sin;
+ px *= x;
+ px += C6sin;
+ return px;
}
//------------------------------------------------------------------------------
inline double get_cos_px(const double x){
- double px=C1cos;
- px *= x;
- px += C2cos;
- px *= x;
- px += C3cos;
- px *= x;
- px += C4cos;
- px *= x;
- px += C5cos;
- px *= x;
- px += C6cos;
- return px;
+ double px=C1cos;
+ px *= x;
+ px += C2cos;
+ px *= x;
+ px += C3cos;
+ px *= x;
+ px += C4cos;
+ px *= x;
+ px += C5cos;
+ px *= x;
+ px += C6cos;
+ return px;
}
@@ -205,7 +205,7 @@ inline void fast_sincosf_m45_45( const float x, float & s, float &c ) {
/// Single precision sincos
inline void fast_sincosf( const float xx, float & s, float &c ) {
-
+
int j;
const float x = details::reduce2quadrant(xx,j);
diff --git a/math/vdt/include/vdt/sqrt.h b/math/vdt/include/vdt/sqrt.h
index ced3c73880b..670b3e0ca14 100644
--- a/math/vdt/include/vdt/sqrt.h
+++ b/math/vdt/include/vdt/sqrt.h
@@ -67,16 +67,16 @@ inline double isqrt (double x) {return 1./std::sqrt(x);}
/// Sqrt implmentation from Quake3
inline float fast_isqrtf_general(float x, const uint32_t ISQRT_ITERATIONS) {
- const float threehalfs = 1.5f;
- const float x2 = x * 0.5f;
- float y = x;
- uint32_t i = details::sp2uint32(y);
- i = 0x5f3759df - ( i >> 1 );
- y = details::uint322sp(i);
- for (uint32_t j=0;j<ISQRT_ITERATIONS;++j)
- y *= ( threehalfs - ( x2 * y * y ) );
-
- return y;
+ const float threehalfs = 1.5f;
+ const float x2 = x * 0.5f;
+ float y = x;
+ uint32_t i = details::sp2uint32(y);
+ i = 0x5f3759df - ( i >> 1 );
+ y = details::uint322sp(i);
+ for (uint32_t j=0;j<ISQRT_ITERATIONS;++j)
+ y *= ( threehalfs - ( x2 * y * y ) );
+
+ return y;
}
//------------------------------------------------------------------------------
diff --git a/math/vdt/include/vdt/vdtcore_common.h b/math/vdt/include/vdt/vdtcore_common.h
index e15b9c03c0c..7cd6ac92cc6 100644
--- a/math/vdt/include/vdt/vdtcore_common.h
+++ b/math/vdt/include/vdt/vdtcore_common.h
@@ -58,11 +58,11 @@ const float MAXNUMF = 3.4028234663852885981170418348451692544e38f;
/// Used to switch between different type of interpretations of the data (64 bits)
union ieee754{
- ieee754 () {};
- ieee754 (double thed) {d=thed;};
- ieee754 (uint64_t thell) {ll=thell;};
- ieee754 (float thef) {f[0]=thef;};
- ieee754 (uint32_t thei) {i[0]=thei;};
+ ieee754 () {};
+ ieee754 (double thed) {d=thed;};
+ ieee754 (uint64_t thell) {ll=thell;};
+ ieee754 (float thef) {f[0]=thef;};
+ ieee754 (uint32_t thei) {i[0]=thei;};
double d;
float f[2];
uint32_t i[2];
diff --git a/misc/memstat/doc/TMemStat_Technical_Overview.xml b/misc/memstat/doc/TMemStat_Technical_Overview.xml
index 253f1f80a97..4982a01bee0 100644
--- a/misc/memstat/doc/TMemStat_Technical_Overview.xml
+++ b/misc/memstat/doc/TMemStat_Technical_Overview.xml
@@ -79,33 +79,33 @@ gcc version 4.2.1 (Apple Inc. build 5646) (dot 1)
</literallayout>
</para>
<table>
- <title>General comparison</title>
- <tgroup cols="9">
- <thead>
- <row>
- <entry>algorithm / OS</entry>
- <entry>Linix 64b (opt.<footnote id="opt"><para><emphasis role="bold">opt.</emphasis> means that TMemStat compiled with the default ROOT optimization flags and the same valid for a test script.
+ <title>General comparison</title>
+ <tgroup cols="9">
+ <thead>
+ <row>
+ <entry>algorithm / OS</entry>
+ <entry>Linix 64b (opt.<footnote id="opt"><para><emphasis role="bold">opt.</emphasis> means that TMemStat compiled with the default ROOT optimization flags and the same valid for a test script.
</para></footnote>)</entry>
<entry>Linux 64b (debug<footnote id="debug"><para><emphasis role="bold">debug</emphasis> means that TMemStat library is compiled with “make ROOTBUILD=debug†and a test script compiled by ACLIC with C++g option.
</para></footnote>)</entry>
- <entry>Linux 32b (opt.<footnoteref linkend="opt" />)</entry>
+ <entry>Linux 32b (opt.<footnoteref linkend="opt" />)</entry>
<entry>Linux 32b (debug <footnoteref linkend="debug" />)</entry>
- <entry>MacOSX 10.5 (opt<footnoteref linkend="opt" />)</entry>
- <entry>MacOSX 10.5 (debug<footnoteref linkend="debug" />)</entry>
+ <entry>MacOSX 10.5 (opt<footnoteref linkend="opt" />)</entry>
+ <entry>MacOSX 10.5 (debug<footnoteref linkend="debug" />)</entry>
<entry>MacOSX 10.6 (opt.<footnoteref linkend="opt" />)</entry>
- <entry>MacOSX 10.6 (debug<footnoteref linkend="debug" />)</entry>
+ <entry>MacOSX 10.6 (debug<footnoteref linkend="debug" />)</entry>
</row>
- </thead>
- <tbody>
- <row>
+ </thead>
+ <tbody>
+ <row>
<entry>backtrace</entry>
- <entry>Ok.</entry>
+ <entry>Ok.</entry>
<entry>Ok.</entry>
<entry>-</entry>
- <entry>-</entry>
+ <entry>-</entry>
<entry>-</entry>
<entry>-</entry>
- <entry>Ok. <footnote id="mac_optim">
+ <entry>Ok. <footnote id="mac_optim">
<para>
Works, but if the malloc/free is called in a loop, than we get two unique backtraces for each loop. Probably there is a partial optimization, and compiler unrolls the first iteration outside of the loop. This is why we actually get two calls for malloc/free, one before the loop and another is in the loop. I checked, that it doesn’t matter how many iteration we do, 10 or 100000. We always get two different back traces.
Sometimes we even can get full loop unroll, which means we get as many return address as iterations in the loop.
@@ -115,18 +115,18 @@ What else we could expect, if the code was really optimized and compiler unrolle
</footnote>
</entry>
<entry>Ok.</entry>
- </row>
- <row>
+ </row>
+ <row>
<entry>builtin</entry>
- <entry>X</entry>
+ <entry>X</entry>
<entry>Ok.</entry>
<entry>-</entry>
- <entry>-</entry>
+ <entry>-</entry>
<entry>-</entry>
<entry>-</entry>
- <entry>Ok. <footnoteref linkend="mac_optim"/></entry>
+ <entry>Ok. <footnoteref linkend="mac_optim"/></entry>
<entry>Ok.</entry>
- </row>
+ </row>
</tbody>
</tgroup>
</table>
diff --git a/misc/memstat/doc/docbook.css b/misc/memstat/doc/docbook.css
index 29d326302fe..e4eaa430b02 100644
--- a/misc/memstat/doc/docbook.css
+++ b/misc/memstat/doc/docbook.css
@@ -119,7 +119,7 @@
h1 tt.computeroutput { font-size: 140% }
h2 tt.computeroutput { font-size: 140% }
h3 tt.computeroutput { font-size: 130% }
- h4 tt.computeroutput { font-size: 130% }
+ h4 tt.computeroutput { font-size: 130% }
h5 tt.computeroutput { font-size: 130% }
h6 tt.computeroutput { font-size: 130% }
@@ -221,10 +221,10 @@
float: right;
padding: 0.5pc;
}
-
+
/* Code on toc */
.toc .computeroutput { font-size: 120% }
-
+
/*=============================================================================
Tables
=============================================================================*/
@@ -584,19 +584,19 @@
sup,
sub {
- height: 0;
- line-height: 1;
- vertical-align: baseline;
- _vertical-align: bottom;
- position: relative;
-
+ height: 0;
+ line-height: 1;
+ vertical-align: baseline;
+ _vertical-align: bottom;
+ position: relative;
+
}
sup {
- bottom: 1ex;
+ bottom: 1ex;
}
sub {
- top: .5ex;
+ top: .5ex;
}
diff --git a/misc/minicern/src/cernlib.c b/misc/minicern/src/cernlib.c
index 56e7175abe7..e2c034adc5c 100644
--- a/misc/minicern/src/cernlib.c
+++ b/misc/minicern/src/cernlib.c
@@ -114,7 +114,7 @@ void cfget_(int *lundes, int *medium, int *nwrec, int *nwtak, char *mbuf,
*astat = 0;
if (*nwtak <= 0) return;
-
+
fildes = *lundes;
nbdo = *nwrec * 4;
nbdn = read (fildes, mbuf, nbdo);
diff --git a/misc/rootql/GeneratePreviewForURL.m b/misc/rootql/GeneratePreviewForURL.m
index f799304be48..f7c771b7283 100644
--- a/misc/rootql/GeneratePreviewForURL.m
+++ b/misc/rootql/GeneratePreviewForURL.m
@@ -19,27 +19,27 @@ OSStatus GeneratePreviewForURL(void *thisInterface, QLPreviewRequestRef preview,
NSDate *startDate = [NSDate date];
#endif
- // Get the posix-style path for the thing we are quicklooking at
- NSString *fullPath = (NSString*)CFURLCopyFileSystemPath(url, kCFURLPOSIXPathStyle);
+ // Get the posix-style path for the thing we are quicklooking at
+ NSString *fullPath = (NSString*)CFURLCopyFileSystemPath(url, kCFURLPOSIXPathStyle);
#ifdef DEBUG
NSLog(@"GeneratePreviewForURL %@", fullPath);
#endif
// Check for cancel
- if (QLPreviewRequestIsCancelled(preview)) {
- [pool release];
- return noErr;
- }
+ if (QLPreviewRequestIsCancelled(preview)) {
+ [pool release];
+ return noErr;
+ }
// Set properties for the preview data
- NSMutableDictionary *props = [[[NSMutableDictionary alloc] init] autorelease];
+ NSMutableDictionary *props = [[[NSMutableDictionary alloc] init] autorelease];
[props setObject: @"UTF-8" forKey: (NSString *)kQLPreviewPropertyTextEncodingNameKey];
[props setObject: @"text/html" forKey: (NSString *)kQLPreviewPropertyMIMETypeKey];
- //[props setObject: [NSString stringWithFormat: @"Contents of %@", fullPath] forKey: (NSString *)kQLPreviewPropertyDisplayNameKey];
+ //[props setObject: [NSString stringWithFormat: @"Contents of %@", fullPath] forKey: (NSString *)kQLPreviewPropertyDisplayNameKey];
[props setObject: [NSString stringWithFormat: @"Contents of %s", basename((char*)[fullPath UTF8String])] forKey: (NSString *)kQLPreviewPropertyDisplayNameKey];
- // Build the HTML
+ // Build the HTML
NSMutableString *html = [[[NSMutableString alloc] init] autorelease];
[html appendString: @"<html>"];
[html appendString: @"<head><style type=\"text/css\">"];
@@ -61,10 +61,10 @@ OSStatus GeneratePreviewForURL(void *thisInterface, QLPreviewRequestRef preview,
#endif
// Check for cancel
- if (QLPreviewRequestIsCancelled(preview)) {
- [pool release];
- return noErr;
- }
+ if (QLPreviewRequestIsCancelled(preview)) {
+ [pool release];
+ return noErr;
+ }
// Now let WebKit do its thing
QLPreviewRequestSetDataRepresentation(preview, (CFDataRef)[html dataUsingEncoding: NSUTF8StringEncoding], kUTTypeHTML, (CFDictionaryRef)props);
diff --git a/misc/rootql/ReadFile.m b/misc/rootql/ReadFile.m
index 8a81e5efe6a..e6a1cfe004e 100644
--- a/misc/rootql/ReadFile.m
+++ b/misc/rootql/ReadFile.m
@@ -475,12 +475,12 @@ int ReadFile(NSString *fullPath, NSMutableString *html, QLPreviewRequestRef prev
}
// Check for cancel
- if (QLPreviewRequestIsCancelled(preview)) {
+ if (QLPreviewRequestIsCancelled(preview)) {
free(fh.uuid);
free(fh.title);
close(fd);
- return -1;
- }
+ return -1;
+ }
if (ReadKeys(fd, &fh, html, preview) == -1) {
free(fh.uuid);
diff --git a/misc/rootql/main.c b/misc/rootql/main.c
index 364921befad..52cfae9c564 100644
--- a/misc/rootql/main.c
+++ b/misc/rootql/main.c
@@ -1,9 +1,9 @@
//==============================================================================
//
-// DO NO MODIFY THE CONTENT OF THIS FILE
+// DO NO MODIFY THE CONTENT OF THIS FILE
//
-// This file contains the generic CFPlug-in code necessary for your generator
-// To complete your generator implement the function in GenerateThumbnailForURL/GeneratePreviewForURL.c
+// This file contains the generic CFPlug-in code necessary for your generator
+// To complete your generator implement the function in GenerateThumbnailForURL/GeneratePreviewForURL.c
//
//==============================================================================
@@ -18,7 +18,7 @@
#include <QuickLook/QuickLook.h>
// -----------------------------------------------------------------------------
-// constants
+// constants
// -----------------------------------------------------------------------------
// Don't modify this line
@@ -33,7 +33,7 @@
// -----------------------------------------------------------------------------
-// typedefs
+// typedefs
// -----------------------------------------------------------------------------
// The thumbnail generation function to be implemented in GenerateThumbnailForURL.c
@@ -53,9 +53,9 @@ typedef struct __QuickLookGeneratorPluginType
} QuickLookGeneratorPluginType;
// -----------------------------------------------------------------------------
-// prototypes
+// prototypes
// -----------------------------------------------------------------------------
-// Forward declaration for the IUnknown implementation.
+// Forward declaration for the IUnknown implementation.
//
QuickLookGeneratorPluginType *AllocQuickLookGeneratorPluginType(CFUUIDRef inFactoryID);
@@ -66,9 +66,9 @@ ULONG QuickLookGeneratorPluginAddRef(void *thisInstance);
ULONG QuickLookGeneratorPluginRelease(void *thisInstance);
// -----------------------------------------------------------------------------
-// myInterfaceFtbl definition
+// myInterfaceFtbl definition
// -----------------------------------------------------------------------------
-// The QLGeneratorInterfaceStruct function table.
+// The QLGeneratorInterfaceStruct function table.
//
static QLGeneratorInterfaceStruct myInterfaceFtbl = {
NULL,
@@ -83,9 +83,9 @@ static QLGeneratorInterfaceStruct myInterfaceFtbl = {
// -----------------------------------------------------------------------------
-// AllocQuickLookGeneratorPluginType
+// AllocQuickLookGeneratorPluginType
// -----------------------------------------------------------------------------
-// Utility function that allocates a new instance.
+// Utility function that allocates a new instance.
// You can do some initial setup for the generator here if you wish
// like allocating globals etc...
//
@@ -110,10 +110,10 @@ QuickLookGeneratorPluginType *AllocQuickLookGeneratorPluginType(CFUUIDRef inFact
}
// -----------------------------------------------------------------------------
-// DeallocQuickLookGeneratorPluginType
+// DeallocQuickLookGeneratorPluginType
// -----------------------------------------------------------------------------
-// Utility function that deallocates the instance when
-// the refCount goes to zero.
+// Utility function that deallocates the instance when
+// the refCount goes to zero.
// In the current implementation generator interfaces are never deallocated
// but implement this as this might change in the future
//
@@ -134,9 +134,9 @@ void DeallocQuickLookGeneratorPluginType(QuickLookGeneratorPluginType *thisInsta
}
// -----------------------------------------------------------------------------
-// QuickLookGeneratorQueryInterface
+// QuickLookGeneratorQueryInterface
// -----------------------------------------------------------------------------
-// Implementation of the IUnknown QueryInterface function.
+// Implementation of the IUnknown QueryInterface function.
//
HRESULT QuickLookGeneratorQueryInterface(void *thisInstance,REFIID iid,LPVOID *ppv)
{
@@ -168,9 +168,9 @@ HRESULT QuickLookGeneratorQueryInterface(void *thisInstance,REFIID iid,LPVOID *p
// -----------------------------------------------------------------------------
// QuickLookGeneratorPluginAddRef
// -----------------------------------------------------------------------------
-// Implementation of reference counting for this type. Whenever an interface
-// is requested, bump the refCount for the instance. NOTE: returning the
-// refcount is a convention but is not required so don't rely on it.
+// Implementation of reference counting for this type. Whenever an interface
+// is requested, bump the refCount for the instance. NOTE: returning the
+// refcount is a convention but is not required so don't rely on it.
//
ULONG QuickLookGeneratorPluginAddRef(void *thisInstance)
{
@@ -181,8 +181,8 @@ ULONG QuickLookGeneratorPluginAddRef(void *thisInstance)
// -----------------------------------------------------------------------------
// QuickLookGeneratorPluginRelease
// -----------------------------------------------------------------------------
-// When an interface is released, decrement the refCount.
-// If the refCount goes to zero, deallocate the instance.
+// When an interface is released, decrement the refCount.
+// If the refCount goes to zero, deallocate the instance.
//
ULONG QuickLookGeneratorPluginRelease(void *thisInstance)
{
diff --git a/misc/rootsl/GetMetadataForFile.m b/misc/rootsl/GetMetadataForFile.m
index 885c3c09c61..607f45f528a 100644
--- a/misc/rootsl/GetMetadataForFile.m
+++ b/misc/rootsl/GetMetadataForFile.m
@@ -13,9 +13,9 @@
----------------------------------------------------------------------------- */
Boolean GetMetadataForFile(void *thisInterface,
- CFMutableDictionaryRef attributes,
- CFStringRef contentTypeUTI,
- CFStringRef pathToFile)
+ CFMutableDictionaryRef attributes,
+ CFStringRef contentTypeUTI,
+ CFStringRef pathToFile)
{
// Pull any available metadata from the file at the specified path
// Return the attribute keys and attribute values in the dict
diff --git a/misc/rootsl/main.c b/misc/rootsl/main.c
index 2d7e90c42ca..83dc4ee551f 100644
--- a/misc/rootsl/main.c
+++ b/misc/rootsl/main.c
@@ -1,9 +1,9 @@
//==============================================================================
//
-// DO NO MODIFY THE CONTENT OF THIS FILE
+// DO NO MODIFY THE CONTENT OF THIS FILE
//
-// This file contains the generic CFPlug-in code necessary for your importer
-// To complete your importer implement the function in GetMetadataForFile.c
+// This file contains the generic CFPlug-in code necessary for your importer
+// To complete your importer implement the function in GetMetadataForFile.c
//
//==============================================================================
@@ -17,7 +17,7 @@
#include <CoreServices/CoreServices.h>
// -----------------------------------------------------------------------------
-// constants
+// constants
// -----------------------------------------------------------------------------
@@ -32,15 +32,15 @@
// -----------------------------------------------------------------------------
-// typedefs
+// typedefs
// -----------------------------------------------------------------------------
// The import function to be implemented in GetMetadataForFile.c
Boolean GetMetadataForFile(void *thisInterface,
- CFMutableDictionaryRef attributes,
- CFStringRef contentTypeUTI,
- CFStringRef pathToFile);
-
+ CFMutableDictionaryRef attributes,
+ CFStringRef contentTypeUTI,
+ CFStringRef pathToFile);
+
// The layout for an instance of MetaDataImporterPlugIn
typedef struct __MetadataImporterPluginType
{
@@ -50,9 +50,9 @@ typedef struct __MetadataImporterPluginType
} MetadataImporterPluginType;
// -----------------------------------------------------------------------------
-// prototypes
+// prototypes
// -----------------------------------------------------------------------------
-// Forward declaration for the IUnknown implementation.
+// Forward declaration for the IUnknown implementation.
//
MetadataImporterPluginType *AllocMetadataImporterPluginType(CFUUIDRef inFactoryID);
@@ -62,9 +62,9 @@ void *MetadataImporterPluginFactory(CFAllocatorRef allocator
ULONG MetadataImporterPluginAddRef(void *thisInstance);
ULONG MetadataImporterPluginRelease(void *thisInstance);
// -----------------------------------------------------------------------------
-// testInterfaceFtbl definition
+// testInterfaceFtbl definition
// -----------------------------------------------------------------------------
-// The TestInterface function table.
+// The TestInterface function table.
//
static MDImporterInterfaceStruct testInterfaceFtbl = {
@@ -77,9 +77,9 @@ static MDImporterInterfaceStruct testInterfaceFtbl = {
// -----------------------------------------------------------------------------
-// AllocMetadataImporterPluginType
+// AllocMetadataImporterPluginType
// -----------------------------------------------------------------------------
-// Utility function that allocates a new instance.
+// Utility function that allocates a new instance.
// You can do some initial setup for the importer here if you wish
// like allocating globals etc...
//
@@ -103,10 +103,10 @@ MetadataImporterPluginType *AllocMetadataImporterPluginType(CFUUIDRef inFactoryI
}
// -----------------------------------------------------------------------------
-// DeallocROOTSLMDImporterPluginType
+// DeallocROOTSLMDImporterPluginType
// -----------------------------------------------------------------------------
-// Utility function that deallocates the instance when
-// the refCount goes to zero.
+// Utility function that deallocates the instance when
+// the refCount goes to zero.
// In the current implementation importer interfaces are never deallocated
// but implement this as this might change in the future
//
@@ -123,9 +123,9 @@ void DeallocMetadataImporterPluginType(MetadataImporterPluginType *thisInstance)
}
// -----------------------------------------------------------------------------
-// MetadataImporterQueryInterface
+// MetadataImporterQueryInterface
// -----------------------------------------------------------------------------
-// Implementation of the IUnknown QueryInterface function.
+// Implementation of the IUnknown QueryInterface function.
//
HRESULT MetadataImporterQueryInterface(void *thisInstance,REFIID iid,LPVOID *ppv)
{
@@ -159,11 +159,11 @@ HRESULT MetadataImporterQueryInterface(void *thisInstance,REFIID iid,LPVOID *ppv
}
// -----------------------------------------------------------------------------
-// MetadataImporterPluginAddRef
+// MetadataImporterPluginAddRef
// -----------------------------------------------------------------------------
-// Implementation of reference counting for this type. Whenever an interface
-// is requested, bump the refCount for the instance. NOTE: returning the
-// refcount is a convention but is not required so don't rely on it.
+// Implementation of reference counting for this type. Whenever an interface
+// is requested, bump the refCount for the instance. NOTE: returning the
+// refcount is a convention but is not required so don't rely on it.
//
ULONG MetadataImporterPluginAddRef(void *thisInstance)
{
@@ -174,8 +174,8 @@ ULONG MetadataImporterPluginAddRef(void *thisInstance)
// -----------------------------------------------------------------------------
// SampleCMPluginRelease
// -----------------------------------------------------------------------------
-// When an interface is released, decrement the refCount.
-// If the refCount goes to zero, deallocate the instance.
+// When an interface is released, decrement the refCount.
+// If the refCount goes to zero, deallocate the instance.
//
ULONG MetadataImporterPluginRelease(void *thisInstance)
{
@@ -189,9 +189,9 @@ ULONG MetadataImporterPluginRelease(void *thisInstance)
}
// -----------------------------------------------------------------------------
-// ROOTSLMDImporterPluginFactory
+// ROOTSLMDImporterPluginFactory
// -----------------------------------------------------------------------------
-// Implementation of the factory function for this type.
+// Implementation of the factory function for this type.
//
void *MetadataImporterPluginFactory(CFAllocatorRef allocator,CFUUIDRef typeID)
{
diff --git a/misc/table/inc/TTableMap.h b/misc/table/inc/TTableMap.h
index 31d8c0fe47c..e8a1171b0a2 100644
--- a/misc/table/inc/TTableMap.h
+++ b/misc/table/inc/TTableMap.h
@@ -45,7 +45,7 @@ public:
#ifndef __CINT__
, std::vector<Long_t>(map)
#endif
- , fTable(map.fTable) {;}
+ , fTable(map.fTable) {;}
virtual ~TTableMap(){;}
Bool_t IsValid() const;
Bool_t IsFolder() const;
diff --git a/misc/table/src/TTableDescriptor.cxx b/misc/table/src/TTableDescriptor.cxx
index b4c9e0c25d6..de8c53e3bdb 100644
--- a/misc/table/src/TTableDescriptor.cxx
+++ b/misc/table/src/TTableDescriptor.cxx
@@ -352,27 +352,27 @@ Int_t TTableDescriptor::UpdateOffsets(const TTableDescriptor *newDescriptor)
else if (newType == kUInt) newType = kULong;
#endif
if ( colNewIndx >=0
- && Dimensions(colCounter) == newDescriptor->Dimensions(colNewIndx)
- && ColumnType(colCounter) == newType) {
- Bool_t same = kFALSE;
- if ( Dimensions(colCounter)) {
- for (UInt_t d = 0; d < Dimensions(colCounter); d++) {
- if (IndexArray(colCounter)[d] != newDescriptor->IndexArray(colNewIndx)[d]){ same = kTRUE; break; }
- }
- }
+ && Dimensions(colCounter) == newDescriptor->Dimensions(colNewIndx)
+ && ColumnType(colCounter) == newType) {
+ Bool_t same = kFALSE;
+ if ( Dimensions(colCounter)) {
+ for (UInt_t d = 0; d < Dimensions(colCounter); d++) {
+ if (IndexArray(colCounter)[d] != newDescriptor->IndexArray(colNewIndx)[d]){ same = kTRUE; break; }
+ }
+ }
SetOffset(newDescriptor->Offset(colNewIndx),colCounter);
if (colNewIndx != colCounter) {
Printf("Schema evolution: \t%d column of the \"%s\" table has been moved to %d-th column\n",
- colCounter,ColumnName(colCounter),colNewIndx);
+ colCounter,ColumnName(colCounter),colNewIndx);
mismathes++;
- } else if (same) {
- Printf("Schema evolution: \t%d column \"%s\" size has been changed\n",
- colNewIndx, ColumnName(colCounter));
- mismathes++;
- }
+ } else if (same) {
+ Printf("Schema evolution: \t%d column \"%s\" size has been changed\n",
+ colNewIndx, ColumnName(colCounter));
+ mismathes++;
+ }
} else {
Printf("Schema evolution: \t%d column \"%s\" of %d type has been lost\n",
- colCounter,ColumnName(colCounter),ColumnType(colCounter));
+ colCounter,ColumnName(colCounter),ColumnType(colCounter));
Printf(" Indx = %d, name = %s \n", colNewIndx, ColumnName(colCounter));
SetOffset(UInt_t(-1),colCounter);
mismathes++;
diff --git a/montecarlo/eg/inc/TGenerator.h b/montecarlo/eg/inc/TGenerator.h
index 8133aaf33c1..ddce96c41a5 100644
--- a/montecarlo/eg/inc/TGenerator.h
+++ b/montecarlo/eg/inc/TGenerator.h
@@ -14,8 +14,8 @@
// //
// TGenerator //
// //
-// Is an base class, that defines the interface of ROOT to various //
-// event generators. Every event generator should inherit from //
+// Is an base class, that defines the interface of ROOT to various //
+// event generators. Every event generator should inherit from //
// TGenerator or its subclasses. //
// //
// Derived class can overload the member function GenerateEvent //
diff --git a/montecarlo/eg/inc/TParticleClassPDG.h b/montecarlo/eg/inc/TParticleClassPDG.h
index 722a2a17c7b..57c18132458 100644
--- a/montecarlo/eg/inc/TParticleClassPDG.h
+++ b/montecarlo/eg/inc/TParticleClassPDG.h
@@ -22,7 +22,7 @@ public:
// data members
//------------------------------------------------------------------------------
protected:
- TObjArray* fListOfParticles; // list of (non-owned) particles
+ TObjArray* fListOfParticles; // list of (non-owned) particles
TParticleClassPDG(const TParticleClassPDG& pcp): TNamed(pcp), fListOfParticles(pcp.fListOfParticles) { }
TParticleClassPDG& operator=(const TParticleClassPDG& pcp)
@@ -60,7 +60,7 @@ public:
Bool_t IsFolder() const { return kTRUE; }
virtual void Browse(TBrowser* b);
- ClassDef(TParticleClassPDG,1) // PDG static particle definition
+ ClassDef(TParticleClassPDG,1) // PDG static particle definition
};
#endif
diff --git a/montecarlo/eg/inc/cfortran.h b/montecarlo/eg/inc/cfortran.h
index 647a5777111..d44e1cef15f 100644
--- a/montecarlo/eg/inc/cfortran.h
+++ b/montecarlo/eg/inc/cfortran.h
@@ -39,18 +39,18 @@
f2cFortran (KMCCARTY)
Dec 2005: If f2cFortran is defined, enforce REAL functions in FORTRAN
returning "double" in C. This was one of the items on
- Burkhard's TODO list. (KMCCARTY)
+ Burkhard's TODO list. (KMCCARTY)
Dec 2005: Modifications to support 8-byte integers. (MR)
- USE AT YOUR OWN RISK!
+ USE AT YOUR OWN RISK!
Feb 2006 Added logic to typedef the symbol 'LONGLONG' to an appropriate
intrinsic 8-byte integer datatype (WDP)
Apr 2006: Modifications to support gfortran (and g77 with -fno-f2c flag)
since by default it returns "float" for FORTRAN REAL function.
(KMCCARTY)
May 2008: Revert commenting out of "extern" in COMMON_BLOCK_DEF macro.
- Add braces around do-nothing ";" in 3 empty while blocks to
- get rid of compiler warnings. Thanks to ROOT developers
- Jacek Holeczek and Rene Brun for these suggestions. (KMCCARTY)
+ Add braces around do-nothing ";" in 3 empty while blocks to
+ get rid of compiler warnings. Thanks to ROOT developers
+ Jacek Holeczek and Rene Brun for these suggestions. (KMCCARTY)
*******/
/*
@@ -178,7 +178,7 @@ only C calling FORTRAN subroutines will work using K&R style.*/
#define f2cFortran
#endif
#if defined(__FreeBSD__)
-#define f2cFortran
+#define f2cFortran
#endif
#if defined(__hpux) /* 921107: Use __hpux instead of __hp9000s300 */
#define hpuxFortran /* Should also allow hp9000s7/800 use.*/
@@ -583,18 +583,18 @@ return cstr; }
#ifdef vmsFortran
typedef struct dsc$descriptor_s fstring;
-#define DSC$DESCRIPTOR_A(DIMCT) \
+#define DSC$DESCRIPTOR_A(DIMCT) \
struct { \
- unsigned short dsc$w_length; unsigned char dsc$b_dtype; \
- unsigned char dsc$b_class; char *dsc$a_pointer; \
- char dsc$b_scale; unsigned char dsc$b_digits; \
+ unsigned short dsc$w_length; unsigned char dsc$b_dtype; \
+ unsigned char dsc$b_class; char *dsc$a_pointer; \
+ char dsc$b_scale; unsigned char dsc$b_digits; \
struct { \
- unsigned : 3; unsigned dsc$v_fl_binscale : 1; \
+ unsigned : 3; unsigned dsc$v_fl_binscale : 1; \
unsigned dsc$v_fl_redim : 1; unsigned dsc$v_fl_column : 1; \
unsigned dsc$v_fl_coeff : 1; unsigned dsc$v_fl_bounds : 1; \
- } dsc$b_aflags; \
- unsigned char dsc$b_dimct; unsigned long dsc$l_arsize; \
- char *dsc$a_a0; long dsc$l_m [DIMCT]; \
+ } dsc$b_aflags; \
+ unsigned char dsc$b_dimct; unsigned long dsc$l_arsize; \
+ char *dsc$a_a0; long dsc$l_m [DIMCT]; \
struct { \
long dsc$l_l; long dsc$l_u; \
} dsc$bounds [DIMCT]; \
@@ -2520,4 +2520,4 @@ string. */
#endif
-#endif /* __CFORTRAN_LOADED */
+#endif /* __CFORTRAN_LOADED */
diff --git a/montecarlo/eg/src/TGenerator.cxx b/montecarlo/eg/src/TGenerator.cxx
index 69eaf5b00ab..d63c1ff271a 100644
--- a/montecarlo/eg/src/TGenerator.cxx
+++ b/montecarlo/eg/src/TGenerator.cxx
@@ -13,8 +13,8 @@
// //
// TGenerator //
// //
-// Is an base class, that defines the interface of ROOT to various //
-// event generators. Every event generator should inherit from //
+// Is an base class, that defines the interface of ROOT to various //
+// event generators. Every event generator should inherit from //
// TGenerator or its subclasses. //
// //
// Derived class can overload the member function GenerateEvent //
@@ -35,7 +35,7 @@
// Int_t nhep; // # of particles //
// Int_t isthep[4000]; // Status flag of i'th particle //
// Int_t idhep[4000]; // PDG # of particle //
-// Int_t jmohep[4000][2]; // 1st & 2nd mother particle # //
+// Int_t jmohep[4000][2]; // 1st & 2nd mother particle # //
// Int_t jdahep[4000][2]; // 1st & 2nd daughter particle # //
// Double_t phep[4000][5]; // 4-momentum and 1 word //
// Double_t vhep[4000][4]; // 4-position of production //
diff --git a/montecarlo/pythia6/inc/TPythia6Calls.h b/montecarlo/pythia6/inc/TPythia6Calls.h
index 7628f451080..ed78d420f02 100644
--- a/montecarlo/pythia6/inc/TPythia6Calls.h
+++ b/montecarlo/pythia6/inc/TPythia6Calls.h
@@ -85,7 +85,7 @@ struct Pydat3_t {
};
struct Pydat4_t {
- char CHAF[2][500][16]; // here I needed manual intervention
+ char CHAF[2][500][16]; // here I needed manual intervention
};
struct Pydatr_t {
@@ -97,7 +97,7 @@ struct Pysubs_t {
int MSEL;
int MSELPD;
int MSUB[500];
- int KFIN[81][2]; //
+ int KFIN[81][2]; //
double CKIN[200];
};
@@ -121,7 +121,7 @@ struct Pyint2_t {
};
struct Pyint3_t {
- double XSFX[81][2]; //
+ double XSFX[81][2]; //
int ISIG[3][1000];
double SIGH[1000];
};
diff --git a/montecarlo/pythia6/inc/TPythia6Decayer.h b/montecarlo/pythia6/inc/TPythia6Decayer.h
index 29209be2603..bfb0d605e5b 100644
--- a/montecarlo/pythia6/inc/TPythia6Decayer.h
+++ b/montecarlo/pythia6/inc/TPythia6Decayer.h
@@ -85,7 +85,7 @@ public:
virtual void SetForceDecay(Int_t type);
virtual void ForceDecay();
void ForceParticleDecay(Int_t particle, Int_t* products,
- Int_t* mult, Int_t npart);
+ Int_t* mult, Int_t npart);
void ForceParticleDecay(Int_t particle, Int_t product, Int_t mult);
virtual Float_t GetPartialBranchingRatio(Int_t ipart);
virtual Float_t GetLifetime(Int_t kf);
diff --git a/montecarlo/pythia8/src/TPythia8.cxx b/montecarlo/pythia8/src/TPythia8.cxx
index 94f4a27a461..e9beb344f82 100644
--- a/montecarlo/pythia8/src/TPythia8.cxx
+++ b/montecarlo/pythia8/src/TPythia8.cxx
@@ -175,49 +175,49 @@ Int_t TPythia8::ImportParticles(TClonesArray *particles, Option_t *option)
if (!strcmp(option,"") || !strcmp(option,"Final")) {
for (i = 0; i < fNumberOfParticles; i++) {
- if (fPythia->event[i].id() == 90) continue;
+ if (fPythia->event[i].id() == 90) continue;
if (fPythia->event[i].isFinal()) {
new(clonesParticles[nparts]) TParticle(
- fPythia->event[i].id(),
- fPythia->event[i].isFinal(),
- fPythia->event[i].mother1() + ioff,
- fPythia->event[i].mother2() + ioff,
- fPythia->event[i].daughter1() + ioff,
- fPythia->event[i].daughter2() + ioff,
- fPythia->event[i].px(), // [GeV/c]
- fPythia->event[i].py(), // [GeV/c]
- fPythia->event[i].pz(), // [GeV/c]
- fPythia->event[i].e(), // [GeV]
- fPythia->event[i].xProd(), // [mm]
- fPythia->event[i].yProd(), // [mm]
- fPythia->event[i].zProd(), // [mm]
- fPythia->event[i].tProd()); // [mm/c]
- nparts++;
- } // final state partice
- } // particle loop
- } else if (!strcmp(option,"All")) {
- for (i = 0; i < fNumberOfParticles; i++) {
- if (fPythia->event[i].id() == 90) continue;
- new(clonesParticles[nparts]) TParticle(
- fPythia->event[i].id(),
- fPythia->event[i].isFinal(),
- fPythia->event[i].mother1() + ioff,
- fPythia->event[i].mother2() + ioff,
- fPythia->event[i].daughter1() + ioff,
- fPythia->event[i].daughter2() + ioff,
- fPythia->event[i].px(), // [GeV/c]
- fPythia->event[i].py(), // [GeV/c]
- fPythia->event[i].pz(), // [GeV/c]
- fPythia->event[i].e(), // [GeV]
- fPythia->event[i].xProd(), // [mm]
- fPythia->event[i].yProd(), // [mm]
- fPythia->event[i].zProd(), // [mm]
- fPythia->event[i].tProd()); // [mm/c]
- nparts++;
- } // particle loop
- }
- if(ioff==-1) fNumberOfParticles--;
- return nparts;
+ fPythia->event[i].id(),
+ fPythia->event[i].isFinal(),
+ fPythia->event[i].mother1() + ioff,
+ fPythia->event[i].mother2() + ioff,
+ fPythia->event[i].daughter1() + ioff,
+ fPythia->event[i].daughter2() + ioff,
+ fPythia->event[i].px(), // [GeV/c]
+ fPythia->event[i].py(), // [GeV/c]
+ fPythia->event[i].pz(), // [GeV/c]
+ fPythia->event[i].e(), // [GeV]
+ fPythia->event[i].xProd(), // [mm]
+ fPythia->event[i].yProd(), // [mm]
+ fPythia->event[i].zProd(), // [mm]
+ fPythia->event[i].tProd()); // [mm/c]
+ nparts++;
+ } // final state partice
+ } // particle loop
+ } else if (!strcmp(option,"All")) {
+ for (i = 0; i < fNumberOfParticles; i++) {
+ if (fPythia->event[i].id() == 90) continue;
+ new(clonesParticles[nparts]) TParticle(
+ fPythia->event[i].id(),
+ fPythia->event[i].isFinal(),
+ fPythia->event[i].mother1() + ioff,
+ fPythia->event[i].mother2() + ioff,
+ fPythia->event[i].daughter1() + ioff,
+ fPythia->event[i].daughter2() + ioff,
+ fPythia->event[i].px(), // [GeV/c]
+ fPythia->event[i].py(), // [GeV/c]
+ fPythia->event[i].pz(), // [GeV/c]
+ fPythia->event[i].e(), // [GeV]
+ fPythia->event[i].xProd(), // [mm]
+ fPythia->event[i].yProd(), // [mm]
+ fPythia->event[i].zProd(), // [mm]
+ fPythia->event[i].tProd()); // [mm/c]
+ nparts++;
+ } // particle loop
+ }
+ if(ioff==-1) fNumberOfParticles--;
+ return nparts;
}
//___________________________________________________________________________
diff --git a/montecarlo/vmc/inc/TGeoMCGeometry.h b/montecarlo/vmc/inc/TGeoMCGeometry.h
index a11e29a0b3d..e2db9c30d35 100644
--- a/montecarlo/vmc/inc/TGeoMCGeometry.h
+++ b/montecarlo/vmc/inc/TGeoMCGeometry.h
@@ -115,8 +115,8 @@ public:
//virtual void DrawOneSpec(const char* name);
//virtual void Gsatt(const char* name, const char* att, Int_t val);
//virtual void Gdraw(const char*,Double_t theta, Double_t phi,
- // Double_t psi, Double_t u0, Double_t v0,
- // Double_t ul, Double_t vl);
+ // Double_t psi, Double_t u0, Double_t v0,
+ // Double_t ul, Double_t vl);
// Euclid
//virtual void WriteEuclid(const char*, const char*, Int_t, Int_t);
diff --git a/montecarlo/vmc/inc/TPDGCode.h b/montecarlo/vmc/inc/TPDGCode.h
index d6e24847765..9cb8e538ab0 100644
--- a/montecarlo/vmc/inc/TPDGCode.h
+++ b/montecarlo/vmc/inc/TPDGCode.h
@@ -17,24 +17,24 @@
//
typedef enum {kRootino=0,kDown=1,kDownBar=-1,kUp=2,kUpBar=-2,kStrange=3,
- kStrangeBar=-3,kCharm=4,kCharmBar=-4,kBottom=5,
- kBottomBar=-5,kTop=6,kTopBar=-6,kGluon=21,kPythia92=92,
- kDd1=1103,kDd1Bar=-1103,kUd0=2101,kUd0Bar=-2101,kUd1=2103,
- kUd1Bar=-2103,kUu1=2203,kUu1Bar=-2203,kSd0=3101,kSd0Bar=-3101,
- kSd1=3103,kSd1Bar=-3103,kSu0=3201,kSu0Bar=-3201,kSu1=3203,
- kSu1Bar=-3203,kSearches0=7,kElectron=11,kPositron=-11,kNuE=12,
- kNuEBar=-12,kMuonMinus=13,kMuonPlus=-13,kNuMu=14,kNuMuBar=-14,
- kTauMinus=15,kTauPlus=-15,kNuTau=16,kNuTauBar=-16,kGamma=22,
- kZ0=23,kWPlus=24,kWMinus=-24,kPi0=111,kRho770_0=113,
- kA2_1320_0=115,kRho3_1690_0=117,kK0Long=130,kPiPlus=211,
- kPiMinus=-211,kRho770Plus=213,kRho770Minus=-213,
- kA2_1320Plus=215,kProton=2212,kProtonBar=-2212,
- kNeutron=2112,kNeutronBar=-2112,kK0Short=310,kK0=311,
- kK0Bar=-311,kKPlus=321,kKMinus=-321,kLambda0=3122,
- kLambda1520=3124,kLambda0Bar=-3122,kSigmaMinus=3112,kSigmaBarPlus=-3112,
- kSigmaPlus=3222,kSigmaBarMinus=-3222,kSigma0=3212,
- kSigma0Bar=-3212,kXiMinus=3312,kXiPlusBar=-3312,
- kOmegaMinus=3334,kOmegaPlusBar=-3334}
+ kStrangeBar=-3,kCharm=4,kCharmBar=-4,kBottom=5,
+ kBottomBar=-5,kTop=6,kTopBar=-6,kGluon=21,kPythia92=92,
+ kDd1=1103,kDd1Bar=-1103,kUd0=2101,kUd0Bar=-2101,kUd1=2103,
+ kUd1Bar=-2103,kUu1=2203,kUu1Bar=-2203,kSd0=3101,kSd0Bar=-3101,
+ kSd1=3103,kSd1Bar=-3103,kSu0=3201,kSu0Bar=-3201,kSu1=3203,
+ kSu1Bar=-3203,kSearches0=7,kElectron=11,kPositron=-11,kNuE=12,
+ kNuEBar=-12,kMuonMinus=13,kMuonPlus=-13,kNuMu=14,kNuMuBar=-14,
+ kTauMinus=15,kTauPlus=-15,kNuTau=16,kNuTauBar=-16,kGamma=22,
+ kZ0=23,kWPlus=24,kWMinus=-24,kPi0=111,kRho770_0=113,
+ kA2_1320_0=115,kRho3_1690_0=117,kK0Long=130,kPiPlus=211,
+ kPiMinus=-211,kRho770Plus=213,kRho770Minus=-213,
+ kA2_1320Plus=215,kProton=2212,kProtonBar=-2212,
+ kNeutron=2112,kNeutronBar=-2112,kK0Short=310,kK0=311,
+ kK0Bar=-311,kKPlus=321,kKMinus=-321,kLambda0=3122,
+ kLambda1520=3124,kLambda0Bar=-3122,kSigmaMinus=3112,kSigmaBarPlus=-3112,
+ kSigmaPlus=3222,kSigmaBarMinus=-3222,kSigma0=3212,
+ kSigma0Bar=-3212,kXiMinus=3312,kXiPlusBar=-3312,
+ kOmegaMinus=3334,kOmegaPlusBar=-3334}
PDG_t;
/*
@@ -508,11 +508,11 @@ PDG_t;
-1.,kFALSE, -1.,
0.0,"Baryon", -5114));
"Sigma(b)*+","Sigma(b)*+",
- -1.,kFALSE, -1.,
- 1.0,"Baryon", 5214));
+ -1.,kFALSE, -1.,
+ 1.0,"Baryon", 5214));
"Sigma(b)*+ bar","Sigma(b)*+ bar",
- -1.,kFALSE, -1.,
- -1.0,"Baryon", -5214));
+ -1.,kFALSE, -1.,
+ -1.0,"Baryon", -5214));
"Ksi(b)-","Ksi(b)-",
-1.,kFALSE, -1.,
-1.0,"Baryon", 5132));
@@ -1153,7 +1153,7 @@ PDG_t;
"chi(b1)(2P)0","M080",
10.2552,kTRUE, .0,
0.0,"Meson", 70553));
- */
+ */
#endif //ROOT_TPDGCode
diff --git a/montecarlo/vmc/inc/TVirtualMC.h b/montecarlo/vmc/inc/TVirtualMC.h
index 8df57cb8f01..a220ffc13d0 100644
--- a/montecarlo/vmc/inc/TVirtualMC.h
+++ b/montecarlo/vmc/inc/TVirtualMC.h
@@ -774,7 +774,7 @@ public:
// Return the parameters of the secondary track number isec produced
// in the current step
virtual void GetSecondary(Int_t isec, Int_t& particleId,
- TLorentzVector& position, TLorentzVector& momentum) =0;
+ TLorentzVector& position, TLorentzVector& momentum) =0;
// Return the VMC code of the process that has produced the secondary
// particles in the current step
diff --git a/montecarlo/vmc/inc/TVirtualMCStack.h b/montecarlo/vmc/inc/TVirtualMCStack.h
index 984c818b99e..9bc7b9a988c 100644
--- a/montecarlo/vmc/inc/TVirtualMCStack.h
+++ b/montecarlo/vmc/inc/TVirtualMCStack.h
@@ -50,11 +50,11 @@ public:
// weight - particle weight
// is - generation status code
virtual void PushTrack(Int_t toBeDone, Int_t parent, Int_t pdg,
- Double_t px, Double_t py, Double_t pz, Double_t e,
- Double_t vx, Double_t vy, Double_t vz, Double_t tof,
- Double_t polx, Double_t poly, Double_t polz,
- TMCProcess mech, Int_t& ntr, Double_t weight,
- Int_t is) = 0;
+ Double_t px, Double_t py, Double_t pz, Double_t e,
+ Double_t vx, Double_t vy, Double_t vz, Double_t tof,
+ Double_t polx, Double_t poly, Double_t polz,
+ TMCProcess mech, Int_t& ntr, Double_t weight,
+ Int_t is) = 0;
// The stack has to provide two pop mechanisms:
// The first pop mechanism required.
diff --git a/net/auth/inc/rsaaux.h b/net/auth/inc/rsaaux.h
index b062aab4235..999c4ec6ef2 100644
--- a/net/auth/inc/rsaaux.h
+++ b/net/auth/inc/rsaaux.h
@@ -22,19 +22,19 @@ MA 02110-1301 USA
******************************************************************************/
/*******************************************************************************
-* *
+* *
* Simple RSA public key code. *
* Adaptation in library for ROOT by G. Ganis, July 2003 *
* (gerardo.ganis@cern.ch) *
-* *
-* Header used by internal rsa functions *
-* *
+* *
+* Header used by internal rsa functions *
+* *
*******************************************************************************/
-#ifndef _RSAAUX_H
-#define _RSAAUX_H
+#ifndef _RSAAUX_H
+#define _RSAAUX_H
-#ifndef _RSADEF_H
+#ifndef _RSADEF_H
#include "rsadef.h"
#endif
@@ -44,25 +44,25 @@ extern rsa_NUMBER a_one,a_two;
* Prototypes
*/
-void a_add(rsa_NUMBER*, rsa_NUMBER*, rsa_NUMBER*);
-void a_assign(rsa_NUMBER*, rsa_NUMBER*);
-int a_cmp(rsa_NUMBER*, rsa_NUMBER*);
-void a_div(rsa_NUMBER*, rsa_NUMBER*, rsa_NUMBER*, rsa_NUMBER*);
-void a_div2(rsa_NUMBER*);
-void a_ggt(rsa_NUMBER*, rsa_NUMBER*, rsa_NUMBER*);
-void a_imult(rsa_NUMBER*, rsa_INT, rsa_NUMBER*);
-void a_mult(rsa_NUMBER*, rsa_NUMBER*, rsa_NUMBER*);
-void a_sub(rsa_NUMBER*, rsa_NUMBER*, rsa_NUMBER*);
-void m_init(rsa_NUMBER*, rsa_NUMBER*);
-void m_add(rsa_NUMBER*, rsa_NUMBER*, rsa_NUMBER*);
-void m_mult(rsa_NUMBER*, rsa_NUMBER*, rsa_NUMBER*);
-void m_exp(rsa_NUMBER*, rsa_NUMBER*, rsa_NUMBER*);
-int n_bits(rsa_NUMBER*, int);
-void n_div(rsa_NUMBER*, rsa_NUMBER*, rsa_NUMBER*, rsa_NUMBER*);
-int n_cmp(rsa_INT*, rsa_INT*, int);
-int n_mult(rsa_INT*, rsa_INT, rsa_INT*, int);
-int n_sub(rsa_INT*, rsa_INT*, rsa_INT*, int, int);
-int n_bitlen(rsa_NUMBER*);
+void a_add(rsa_NUMBER*, rsa_NUMBER*, rsa_NUMBER*);
+void a_assign(rsa_NUMBER*, rsa_NUMBER*);
+int a_cmp(rsa_NUMBER*, rsa_NUMBER*);
+void a_div(rsa_NUMBER*, rsa_NUMBER*, rsa_NUMBER*, rsa_NUMBER*);
+void a_div2(rsa_NUMBER*);
+void a_ggt(rsa_NUMBER*, rsa_NUMBER*, rsa_NUMBER*);
+void a_imult(rsa_NUMBER*, rsa_INT, rsa_NUMBER*);
+void a_mult(rsa_NUMBER*, rsa_NUMBER*, rsa_NUMBER*);
+void a_sub(rsa_NUMBER*, rsa_NUMBER*, rsa_NUMBER*);
+void m_init(rsa_NUMBER*, rsa_NUMBER*);
+void m_add(rsa_NUMBER*, rsa_NUMBER*, rsa_NUMBER*);
+void m_mult(rsa_NUMBER*, rsa_NUMBER*, rsa_NUMBER*);
+void m_exp(rsa_NUMBER*, rsa_NUMBER*, rsa_NUMBER*);
+int n_bits(rsa_NUMBER*, int);
+void n_div(rsa_NUMBER*, rsa_NUMBER*, rsa_NUMBER*, rsa_NUMBER*);
+int n_cmp(rsa_INT*, rsa_INT*, int);
+int n_mult(rsa_INT*, rsa_INT, rsa_INT*, int);
+int n_sub(rsa_INT*, rsa_INT*, rsa_INT*, int, int);
+int n_bitlen(rsa_NUMBER*);
@@ -70,16 +70,16 @@ int n_bitlen(rsa_NUMBER*);
* prim.h *
******************/
-int p_prim(rsa_NUMBER*, int);
-void inv(rsa_NUMBER*, rsa_NUMBER*, rsa_NUMBER*);
+int p_prim(rsa_NUMBER*, int);
+void inv(rsa_NUMBER*, rsa_NUMBER*, rsa_NUMBER*);
/******************
* rnd.h *
******************/
-void gen_number(int, rsa_NUMBER*);
-void init_rnd(void);
+void gen_number(int, rsa_NUMBER*);
+void init_rnd(void);
/******************
diff --git a/net/auth/inc/rsadef.h b/net/auth/inc/rsadef.h
index e7b304f0dc0..8f0254f3752 100644
--- a/net/auth/inc/rsadef.h
+++ b/net/auth/inc/rsadef.h
@@ -22,91 +22,91 @@ MA 02110-1301 USA
******************************************************************************/
/*******************************************************************************
-* *
+* *
* Simple RSA public key code. *
* Adaptation in library for ROOT by G. Ganis, July 2003 *
* (gerardo.ganis@cern.ch) *
-* *
-* Header used by internal rsa functions *
-* *
+* *
+* Header used by internal rsa functions *
+* *
*******************************************************************************/
-#ifndef _RSADEF_H
-#define _RSADEF_H
+#ifndef _RSADEF_H
+#define _RSADEF_H
-typedef unsigned short rsa_INT; /* muss MAXINT fassen */
-typedef unsigned long rsa_LONG; /* muss (MAXINT+1)^2 -1 fassen */
+typedef unsigned short rsa_INT; /* muss MAXINT fassen */
+typedef unsigned long rsa_LONG; /* muss (MAXINT+1)^2 -1 fassen */
/*
- * (MAXINT+1)-adic Zahlen
+ * (MAXINT+1)-adic Zahlen
*/
/*
- * MAXINT Maximale Zahl pro Element (muss int sein)
- * MAXBIT Maximales Bit von MAXINT
- * LOWBITS Anzahl der consekutiven low Bits von MAXINT
- * HIGHBIT Hoechsten Bit von MAXINT
- * TOINT muss (INT)( (x) % MAXINT) ergeben
- * MAXLEN Laenge der INT Array in jeder NUMBER
+ * MAXINT Maximale Zahl pro Element (muss int sein)
+ * MAXBIT Maximales Bit von MAXINT
+ * LOWBITS Anzahl der consekutiven low Bits von MAXINT
+ * HIGHBIT Hoechsten Bit von MAXINT
+ * TOINT muss (INT)( (x) % MAXINT) ergeben
+ * MAXLEN Laenge der INT Array in jeder NUMBER
*/
-#define rsa_MAXINT 0xFFFF
+#define rsa_MAXINT 0xFFFF
#if rsa_MAXINT == 99
-#define rsa_MAXBIT 7
-#define rsa_LOWBITS 2
+#define rsa_MAXBIT 7
+#define rsa_LOWBITS 2
#endif
#if rsa_MAXINT == 9
-#define rsa_MAXBIT 4
-#define rsa_LOWBITS 1
+#define rsa_MAXBIT 4
+#define rsa_LOWBITS 1
#endif
#if rsa_MAXINT == 1
-#define rsa_MAXBIT 1
+#define rsa_MAXBIT 1
#endif
#if rsa_MAXINT == 0xFF
-#define rsa_MAXBIT 8
-#define rsa_TOINT(x) ((rsa_INT)(x)) /* ACHTUNG !!!!! */
+#define rsa_MAXBIT 8
+#define rsa_TOINT(x) ((rsa_INT)(x)) /* ACHTUNG !!!!! */
#endif
#if rsa_MAXINT == 0xFFFF
-#define rsa_MAXBIT 16
-#define rsa_TOINT(x) ((rsa_INT)(x)) /* ACHTUNG !!!!! */
+#define rsa_MAXBIT 16
+#define rsa_TOINT(x) ((rsa_INT)(x)) /* ACHTUNG !!!!! */
#endif
-#ifndef rsa_MAXBIT
-#include "<< ERROR: rsa_MAXBIT must be defined >>"
+#ifndef rsa_MAXBIT
+#include "<< ERROR: rsa_MAXBIT must be defined >>"
#endif
-#ifndef rsa_LOWBITS
+#ifndef rsa_LOWBITS
#if rsa_MAXINT == (1 << rsa_MAXBIT) - 1
-#define rsa_LOWBITS rsa_MAXBIT
+#define rsa_LOWBITS rsa_MAXBIT
#else
-#include "<< ERROR: rsa_LOWBITS must be defined >>"
+#include "<< ERROR: rsa_LOWBITS must be defined >>"
#endif
#endif
-#define rsa_MAXLEN (300*8/(rsa_MAXBIT + 1))
-#define rsa_STRLEN (rsa_MAXLEN*rsa_MAXBIT/4)
-#define rsa_HIGHBIT (1 << (rsa_MAXBIT-1) )
+#define rsa_MAXLEN (300*8/(rsa_MAXBIT + 1))
+#define rsa_STRLEN (rsa_MAXLEN*rsa_MAXBIT/4)
+#define rsa_HIGHBIT (1 << (rsa_MAXBIT-1) )
#if rsa_LOWBITS == rsa_MAXBIT
-#define rsa_DIVMAX1(x) ((x) >> rsa_MAXBIT)
-#define rsa_MODMAX1(x) ((x) & rsa_MAXINT)
-#define rsa_MULMAX1(x) ((x) << rsa_MAXBIT)
+#define rsa_DIVMAX1(x) ((x) >> rsa_MAXBIT)
+#define rsa_MODMAX1(x) ((x) & rsa_MAXINT)
+#define rsa_MULMAX1(x) ((x) << rsa_MAXBIT)
#else
-#define rsa_DIVMAX1(x) ((x) / (rsa_MAXINT+1))
-#define rsa_MODMAX1(x) ((x) % (rsa_MAXINT+1))
-#define rsa_MULMAX1(x) ((x) * (unsigned)(rsa_MAXINT+1))
+#define rsa_DIVMAX1(x) ((x) / (rsa_MAXINT+1))
+#define rsa_MODMAX1(x) ((x) % (rsa_MAXINT+1))
+#define rsa_MULMAX1(x) ((x) * (unsigned)(rsa_MAXINT+1))
#endif
-#ifndef rsa_TOINT
-#define rsa_TOINT(x) ((rsa_INT)rsa_MODMAX1(x))
+#ifndef rsa_TOINT
+#define rsa_TOINT(x) ((rsa_INT)rsa_MODMAX1(x))
#endif
typedef struct {
- int n_len; /* Hoechster benutzter Index */
- rsa_INT n_part[rsa_MAXLEN];
+ int n_len; /* Hoechster benutzter Index */
+ rsa_INT n_part[rsa_MAXLEN];
} rsa_NUMBER;
-#define rsa_NUM0P ((rsa_NUMBER *)0) /* Abkuerzung */
+#define rsa_NUM0P ((rsa_NUMBER *)0) /* Abkuerzung */
/* Key structures */
typedef struct {
diff --git a/net/auth/inc/rsafun.h b/net/auth/inc/rsafun.h
index 4ead4ac9dc3..e69c7c25625 100644
--- a/net/auth/inc/rsafun.h
+++ b/net/auth/inc/rsafun.h
@@ -22,13 +22,13 @@ MA 02110-1301 USA
******************************************************************************/
/*******************************************************************************
-* *
+* *
* Simple RSA public key code. *
* Adaptation in library for ROOT by G. Ganis, July 2003 *
* (gerardo.ganis@cern.ch) *
-* *
-* Header used by internal rsa functions *
-* *
+* *
+* Header used by internal rsa functions *
+* *
*******************************************************************************/
#include <stdio.h>
@@ -45,10 +45,10 @@ typedef rsa_NUMBER (*RSA_genprim_t)(int, int);
typedef int (*RSA_genrsa_t)(rsa_NUMBER, rsa_NUMBER, rsa_NUMBER *, rsa_NUMBER *, rsa_NUMBER *);
typedef int (*RSA_encode_t)(char *, int, rsa_NUMBER, rsa_NUMBER);
typedef int (*RSA_decode_t)(char *, int, rsa_NUMBER, rsa_NUMBER);
-typedef int (*RSA_num_sput_t)(rsa_NUMBER*, char*, int );
-typedef int (*RSA_num_fput_t)(rsa_NUMBER*, FILE* );
-typedef int (*RSA_num_sget_t)(rsa_NUMBER*, char* );
-typedef int (*RSA_num_fget_t)(rsa_NUMBER*, FILE* );
+typedef int (*RSA_num_sput_t)(rsa_NUMBER*, char*, int );
+typedef int (*RSA_num_fput_t)(rsa_NUMBER*, FILE* );
+typedef int (*RSA_num_sget_t)(rsa_NUMBER*, char* );
+typedef int (*RSA_num_fget_t)(rsa_NUMBER*, FILE* );
typedef void (*RSA_assign_t)(rsa_NUMBER *, rsa_NUMBER *);
typedef int (*RSA_cmp_t)(rsa_NUMBER *, rsa_NUMBER *);
diff --git a/net/auth/inc/rsalib.h b/net/auth/inc/rsalib.h
index 5c6f6433c34..969e8fa207d 100644
--- a/net/auth/inc/rsalib.h
+++ b/net/auth/inc/rsalib.h
@@ -22,17 +22,17 @@ MA 02110-1301 USA
******************************************************************************/
/*******************************************************************************
-* *
+* *
* Simple RSA public key code. *
* Adaptation in library for ROOT by G. Ganis, July 2003 *
* (gerardo.ganis@cern.ch) *
-* *
+* *
* Header used by internal rsa functions *
-* *
+* *
*******************************************************************************/
-#ifndef _RSALIB_H
-#define _RSALIB_H
+#ifndef _RSALIB_H
+#define _RSALIB_H
#ifndef _RSADEF_H
#include "rsadef.h"
@@ -49,13 +49,13 @@ int rsa_encode_size(rsa_NUMBER);
* nio.h *
******************/
-int rsa_cmp( rsa_NUMBER*, rsa_NUMBER* );
-void rsa_assign( rsa_NUMBER*, rsa_NUMBER* );
+int rsa_cmp( rsa_NUMBER*, rsa_NUMBER* );
+void rsa_assign( rsa_NUMBER*, rsa_NUMBER* );
-int rsa_num_sput( rsa_NUMBER*, char*, int );
-int rsa_num_fput( rsa_NUMBER*, FILE* );
-int rsa_num_sget( rsa_NUMBER*, char* );
-int rsa_num_fget( rsa_NUMBER*, FILE* );
+int rsa_num_sput( rsa_NUMBER*, char*, int );
+int rsa_num_fput( rsa_NUMBER*, FILE* );
+int rsa_num_sget( rsa_NUMBER*, char* );
+int rsa_num_fget( rsa_NUMBER*, FILE* );
#endif
diff --git a/net/auth/src/rsaaux.cxx b/net/auth/src/rsaaux.cxx
index 0028ba5b039..976a7e315e0 100644
--- a/net/auth/src/rsaaux.cxx
+++ b/net/auth/src/rsaaux.cxx
@@ -22,11 +22,11 @@ MA 02110-1301 USA
******************************************************************************/
/*******************************************************************************
-* *
+* *
* Simple RSA public key code. *
* Adaptation in library for ROOT by G. Ganis, July 2003 *
* (gerardo.ganis@cern.ch) *
-* *
+* *
*******************************************************************************/
#include <stdio.h>
@@ -50,113 +50,113 @@ typedef long off_t;
#include "rsalib.h"
/********************************************************************************
- * *
+ * *
* arith.c *
* *
********************************************************************************/
/*
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!! ACHTUNG !!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * Es findet keinerlei Ueberpruefung auf Bereichsueberschreitung
- * statt. Alle Werte muessen natuerliche Zahlen aus dem Bereich
- * 0 ... (rsa_MAXINT+1)^rsa_MAXLEN-1 sein.
+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!! ACHTUNG !!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * Es findet keinerlei Ueberpruefung auf Bereichsueberschreitung
+ * statt. Alle Werte muessen natuerliche Zahlen aus dem Bereich
+ * 0 ... (rsa_MAXINT+1)^rsa_MAXLEN-1 sein.
*
*
- * Bei keiner Funktion oder Hilsfunktion werden Annahmen getroffen,
- * ueber die Verschiedenheit von Eingabe- & Ausgabe-Werten.
+ * Bei keiner Funktion oder Hilsfunktion werden Annahmen getroffen,
+ * ueber die Verschiedenheit von Eingabe- & Ausgabe-Werten.
*
*
- * Funktionen:
+ * Funktionen:
*
- * a_add( s1, s2, d )
- * rsa_NUMBER *s1,*s2,*d;
- * *d = *s1 + *s2;
+ * a_add( s1, s2, d )
+ * rsa_NUMBER *s1,*s2,*d;
+ * *d = *s1 + *s2;
*
- * a_assign( *d, *s )
- * rsa_NUMBER *d,*s;
- * *d = *s;
+ * a_assign( *d, *s )
+ * rsa_NUMBER *d,*s;
+ * *d = *s;
*
- * int a_cmp( c1, c2 )
- * rsa_NUMBER *c1,*c2;
- * 1 : falls *c1 > *c2
- * 0 : falls *c1 == *c2
- * -1 : falls *c1 < *c2
+ * int a_cmp( c1, c2 )
+ * rsa_NUMBER *c1,*c2;
+ * 1 : falls *c1 > *c2
+ * 0 : falls *c1 == *c2
+ * -1 : falls *c1 < *c2
*
- * a_div( d1, d2, q, r )
- * rsa_NUMBER *d1,*d2,*q,*r;
- * *q = *d1 / *d2 Rest *r;
+ * a_div( d1, d2, q, r )
+ * rsa_NUMBER *d1,*d2,*q,*r;
+ * *q = *d1 / *d2 Rest *r;
*
- * a_div2( n )
- * rsa_NUMBER *n;
- * *n /= 2;
+ * a_div2( n )
+ * rsa_NUMBER *n;
+ * *n /= 2;
*
- * a_ggt( a, b, f )
- * rsa_NUMBER *a,*b,*f;
- * *f = ( *a, *b );
+ * a_ggt( a, b, f )
+ * rsa_NUMBER *a,*b,*f;
+ * *f = ( *a, *b );
*
- * a_imult( n, m, d )
- * rsa_NUMBER *n;
- * rsa_INT m;
- * rsa_NUMBER *d;
- * *d = *n * m
+ * a_imult( n, m, d )
+ * rsa_NUMBER *n;
+ * rsa_INT m;
+ * rsa_NUMBER *d;
+ * *d = *n * m
*
- * a_mult( m1, m2, d )
- * rsa_NUMBER *m1,*m2,*d;
- * *d = *m1 * *m2;
+ * a_mult( m1, m2, d )
+ * rsa_NUMBER *m1,*m2,*d;
+ * *d = *m1 * *m2;
*
- * a_sub( s1, s2, d )
- * rsa_NUMBER *s1,*s2,*d;
- * *d = *s1 - *s2;
+ * a_sub( s1, s2, d )
+ * rsa_NUMBER *s1,*s2,*d;
+ * *d = *s1 - *s2;
*
- * Modulare Funktionen
- * m_init( n, o )
- * rsa_NUMBER *n,*o;
- * Initialsierung der Modularen Funktionen
- * o != 0 : *o = alter Wert
+ * Modulare Funktionen
+ * m_init( n, o )
+ * rsa_NUMBER *n,*o;
+ * Initialsierung der Modularen Funktionen
+ * o != 0 : *o = alter Wert
*
- * m_add( s1, s2, d )
- * rsa_NUMBER *s1, *s2, *d;
- * *d = *s1 + *s2;
+ * m_add( s1, s2, d )
+ * rsa_NUMBER *s1, *s2, *d;
+ * *d = *s1 + *s2;
*
- * m_mult( m1, m2, d )
- * rsa_NUMBER *m1,*m2,*d;
+ * m_mult( m1, m2, d )
+ * rsa_NUMBER *m1,*m2,*d;
*
- * m_exp( x, n, z )
- * rsa_NUMBER *x,*n,*z;
- * *z = *x exp *n;
+ * m_exp( x, n, z )
+ * rsa_NUMBER *x,*n,*z;
+ * *z = *x exp *n;
*
*
- * Hilfs-Funktionen:
+ * Hilfs-Funktionen:
*
- * int n_bits( n, b )
- * rsa_NUMBER *n;
- * int b;
- * return( unterste b Bits der Dualdarstellung von n)
+ * int n_bits( n, b )
+ * rsa_NUMBER *n;
+ * int b;
+ * return( unterste b Bits der Dualdarstellung von n)
*
- * n_div( d1, z2, q, r )
- * rsa_NUMBER *d1,z2[rsa_MAXBIT],*q,*r;
- * *q = *d1 / z2[0] Rest *r;
- * z2[i] = z2[0] * 2^i, i=0..rsa_MAXBIT-1
+ * n_div( d1, z2, q, r )
+ * rsa_NUMBER *d1,z2[rsa_MAXBIT],*q,*r;
+ * *q = *d1 / z2[0] Rest *r;
+ * z2[i] = z2[0] * 2^i, i=0..rsa_MAXBIT-1
*
- * int n_cmp( i1, i2, l )
- * rsa_INT i1[l], i2[l];
- * 1 : falls i1 > i2
- * 0 : falls i1 == i2
- * -1 : falls i1 < i2
+ * int n_cmp( i1, i2, l )
+ * rsa_INT i1[l], i2[l];
+ * 1 : falls i1 > i2
+ * 0 : falls i1 == i2
+ * -1 : falls i1 < i2
*
- * int n_mult( n, m, d, l)
- * rsa_INT n[l], m, d[];
- * d = m * n;
- * return( sizeof(d) ); d.h. 'l' oder 'l+1'
+ * int n_mult( n, m, d, l)
+ * rsa_INT n[l], m, d[];
+ * d = m * n;
+ * return( sizeof(d) ); d.h. 'l' oder 'l+1'
*
- * int n_sub( p1, p2, p3, l, lo )
- * rsa_INT p1[l], p2[lo], p3[];
- * p3 = p1 - p2;
- * return( sizeof(p3) ); d.h. '<= min(l,lo)'
+ * int n_sub( p1, p2, p3, l, lo )
+ * rsa_INT p1[l], p2[lo], p3[];
+ * p3 = p1 - p2;
+ * return( sizeof(p3) ); d.h. '<= min(l,lo)'
*
- * int n_bitlen( n )
- * rsa_NUMBER *n;
- * return( sizeof(n) in bits )
+ * int n_bitlen( n )
+ * rsa_NUMBER *n;
+ * return( sizeof(n) in bits )
*
*/
@@ -217,7 +217,7 @@ rsa_NUMBER a_two = {
*/
int n_cmp(rsa_INT *i1, rsa_INT *i2, int l)
{
- i1 += (l-1); /* Pointer ans Ende */
+ i1 += (l-1); /* Pointer ans Ende */
i2 += (l-1);
for (;l--;)
@@ -237,7 +237,7 @@ int a_cmp(rsa_NUMBER *c1, rsa_NUMBER *c2)
if ( (l=c1->n_len) != c2->n_len)
return( l - c2->n_len);
- /* vergleiche als arrays */
+ /* vergleiche als arrays */
return( n_cmp( c1->n_part, c2->n_part, l) );
}
@@ -248,7 +248,7 @@ void a_assign(rsa_NUMBER *d, rsa_NUMBER *s)
{
int l;
- if (s == d) /* nichts zu kopieren */
+ if (s == d) /* nichts zu kopieren */
return;
if ((l=s->n_len))
@@ -267,7 +267,7 @@ void a_add(rsa_NUMBER *s1, rsa_NUMBER *s2, rsa_NUMBER *d)
rsa_INT *p1,*p2,*p3;
rsa_INT b;
- /* setze s1 auch die groessere Zahl */
+ /* setze s1 auch die groessere Zahl */
l = s1->n_len;
if ( (l=s1->n_len) < s2->n_len) {
rsa_NUMBER *tmp = s1;
@@ -287,32 +287,32 @@ void a_add(rsa_NUMBER *s1, rsa_NUMBER *s2, rsa_NUMBER *d)
sum = 0;
while (l --) {
- if (lo) { /* es ist noch was von s2 da */
+ if (lo) { /* es ist noch was von s2 da */
lo--;
b = *p2++;
}
else
- b = 0; /* ansonten 0 nehmen */
+ b = 0; /* ansonten 0 nehmen */
sum += (rsa_LONG)*p1++ + (rsa_LONG)b;
*p3++ = rsa_TOINT(sum);
- if (sum > (rsa_LONG)rsa_MAXINT) { /* carry merken */
+ if (sum > (rsa_LONG)rsa_MAXINT) { /* carry merken */
sum = 1;
}
else
sum = 0;
- if (!lo && same && !sum) /* nichts mehr zu tuen */
+ if (!lo && same && !sum) /* nichts mehr zu tuen */
break;
}
- if (sum) { /* letztes carry beruecksichtigen */
+ if (sum) { /* letztes carry beruecksichtigen */
ld++;
*p3 = sum;
}
- d->n_len = ld; /* Laenge setzen */
+ d->n_len = ld; /* Laenge setzen */
}
/*
@@ -327,20 +327,20 @@ int n_sub(rsa_INT *p1, rsa_INT *p2, rsa_INT *p3, int l, int lo)
rsa_LONG dif;
rsa_LONG a,b;
- same = (p1 == p3); /* frueher Abbruch moeglich */
+ same = (p1 == p3); /* frueher Abbruch moeglich */
for (lc=1, ld=0; l--; lc++) {
a = (rsa_LONG)*p1++;
- if (lo) { /* ist noch was von p2 da ? */
+ if (lo) { /* ist noch was von p2 da ? */
lo--;
b = (rsa_LONG)*p2++;
}
else
- b=0; /* ansonten 0 nehmen */
+ b=0; /* ansonten 0 nehmen */
- if (over) /* frueherer Overflow */
+ if (over) /* frueherer Overflow */
b++;
- if ( b > a) { /* jetzt Overflow ? */
+ if ( b > a) { /* jetzt Overflow ? */
over = 1;
dif = (rsa_MAXINT +1) + a;
}
@@ -351,10 +351,10 @@ int n_sub(rsa_INT *p1, rsa_INT *p2, rsa_INT *p3, int l, int lo)
dif -= b;
*p3++ = (rsa_INT)dif;
- if (dif) /* Teil != 0 : Laenge neu */
+ if (dif) /* Teil != 0 : Laenge neu */
ld = lc;
- if (!lo && same && !over) { /* nichts mehr zu tuen */
- if (l > 0) /* Laenge korrigieren */
+ if (!lo && same && !over) { /* nichts mehr zu tuen */
+ if (l > 0) /* Laenge korrigieren */
ld = lc + l;
break;
}
@@ -387,7 +387,7 @@ int n_mult(rsa_INT *n, rsa_INT m, rsa_INT *d, int l)
mul = rsa_DIVMAX1( mul );
}
- if (mul) { /* carry ? */
+ if (mul) { /* carry ? */
l++;
*d = mul;
}
@@ -413,10 +413,10 @@ void a_imult(rsa_NUMBER *n, rsa_INT m, rsa_NUMBER *d)
*/
void a_mult(rsa_NUMBER *m1, rsa_NUMBER *m2, rsa_NUMBER *d)
{
- static rsa_INT id[ rsa_MAXLEN ]; /* Zwischenspeicher */
- rsa_INT *vp; /* Pointer darin */
- rsa_LONG sum; /* Summe fuer jede Stelle */
- rsa_LONG tp1; /* Zwischenspeicher fuer m1 */
+ static rsa_INT id[ rsa_MAXLEN ]; /* Zwischenspeicher */
+ rsa_INT *vp; /* Pointer darin */
+ rsa_LONG sum; /* Summe fuer jede Stelle */
+ rsa_LONG tp1; /* Zwischenspeicher fuer m1 */
rsa_INT *p2;
rsa_INT *p1;
int l1,l2,ld,lc,l,i,j;
@@ -444,7 +444,7 @@ void a_mult(rsa_NUMBER *m1, rsa_NUMBER *m2, rsa_NUMBER *d)
*vp++ += (rsa_INT)sum;
}
- /* jetzt alle Uebertraege beruecksichtigen */
+ /* jetzt alle Uebertraege beruecksichtigen */
ld = 0;
for (lc=0, vp=id, p1=d->n_part; lc++ < l;) {
if ( (*p1++ = *vp++))
@@ -463,8 +463,8 @@ void a_mult(rsa_NUMBER *m1, rsa_NUMBER *m2, rsa_NUMBER *d)
*/
void n_div(rsa_NUMBER *d1, rsa_NUMBER *z2, rsa_NUMBER *q, rsa_NUMBER *r)
{
- static rsa_NUMBER dummy_rest; /* Dummy Variable, falls r = 0 */
- static rsa_NUMBER dummy_quot; /* Dummy Variable, falla q = 0 */
+ static rsa_NUMBER dummy_rest; /* Dummy Variable, falls r = 0 */
+ static rsa_NUMBER dummy_quot; /* Dummy Variable, falla q = 0 */
rsa_INT *i1,*i1e,*i3;
int l2,ld,l,lq;
#if rsa_MAXINT != 1
@@ -480,16 +480,16 @@ void n_div(rsa_NUMBER *d1, rsa_NUMBER *z2, rsa_NUMBER *q, rsa_NUMBER *r)
if (!q)
q = &dummy_quot;
- a_assign( r, d1 ); /* Kopie von d1 in den Rest */
+ a_assign( r, d1 ); /* Kopie von d1 in den Rest */
- l2= z2->n_len; /* Laenge von z2[0] */
- l = r->n_len - l2; /* Laenge des noch ''rechts'' liegenden
- Stuecks von d1 */
- lq= l +1; /* Laenge des Quotienten */
+ l2= z2->n_len; /* Laenge von z2[0] */
+ l = r->n_len - l2; /* Laenge des noch ''rechts'' liegenden
+ Stuecks von d1 */
+ lq= l +1; /* Laenge des Quotienten */
i3= q->n_part + l;
i1= r->n_part + l;
- ld = l2; /* aktuelle Laenge des ''Vergleichsstuecks''
- von d1 */
+ ld = l2; /* aktuelle Laenge des ''Vergleichsstuecks''
+ von d1 */
i1e= i1 + (ld-1);
for (; l >= 0; ld++, i1--, i1e--, l--, i3--) {
@@ -502,7 +502,7 @@ void n_div(rsa_NUMBER *d1, rsa_NUMBER *z2, rsa_NUMBER *q, rsa_NUMBER *r)
if ( ld > l2 || (ld == l2 && n_cmp( i1, z2->n_part, l2) >= 0) ) {
#if rsa_MAXINT != 1
- /* nach 2er-Potenzen zerlegen */
+ /* nach 2er-Potenzen zerlegen */
for (pw=rsa_MAXBIT-1, z=(rsa_INT)rsa_HIGHBIT; pw >= 0; pw--, z /= 2) {
if ( ld > (l2t= z2[pw].n_len)
|| (ld == l2t
@@ -512,7 +512,7 @@ void n_div(rsa_NUMBER *d1, rsa_NUMBER *z2, rsa_NUMBER *q, rsa_NUMBER *r)
}
}
#else
- /* bei rsa_MAXINT == 1 alles viel einfacher */
+ /* bei rsa_MAXINT == 1 alles viel einfacher */
ld = n_sub( i1, z2->n_part, i1, ld, l2 );
(*i3) ++;
#endif
@@ -524,7 +524,7 @@ void n_div(rsa_NUMBER *d1, rsa_NUMBER *z2, rsa_NUMBER *q, rsa_NUMBER *r)
lq -= l;
ld += l;
- if (lq>0 && !q->n_part[lq -1]) /* evtl. Laenge korrigieren */
+ if (lq>0 && !q->n_part[lq -1]) /* evtl. Laenge korrigieren */
lq--;
q->n_len = lq;
@@ -605,7 +605,7 @@ void a_div2(rsa_NUMBER *n)
/*
- * MODULO-FUNKTIONEN
+ * MODULO-FUNKTIONEN
*/
static rsa_NUMBER g_mod_z2[ rsa_MAXBIT ];
@@ -676,7 +676,7 @@ void a_ggt(rsa_NUMBER *a, rsa_NUMBER *b, rsa_NUMBER *f)
if ( a_cmp( &t[at], &t[bt]) < 0) {
tmp= at; at= bt; bt= tmp;
}
- /* euklidischer Algorithmus */
+ /* euklidischer Algorithmus */
while ( t[bt].n_len) {
a_div( &t[at], &t[bt], rsa_NUM0P, &t[at] );
tmp= at; at= bt; bt= tmp;
@@ -733,63 +733,63 @@ int n_bitlen(rsa_NUMBER *n)
/*******************************************************************************
- * *
+ * *
* prim.c *
* *
********************************************************************************/
/*
- * RSA
+ * RSA
*
- * p,q prim
- * p != q
- * n = p*q
- * phi = (p -1)*(q -1)
- * e,d aus 0...n-1
- * e*d == 1 mod phi
+ * p,q prim
+ * p != q
+ * n = p*q
+ * phi = (p -1)*(q -1)
+ * e,d aus 0...n-1
+ * e*d == 1 mod phi
*
- * m aus 0...n-1 sei eine Nachricht
+ * m aus 0...n-1 sei eine Nachricht
*
- * Verschluesseln:
- * E(x) = x^e mod n ( n,e oeffendlich )
+ * Verschluesseln:
+ * E(x) = x^e mod n ( n,e oeffendlich )
*
- * Entschluesseln:
- * D(x) = x^d mod n ( d geheim )
+ * Entschluesseln:
+ * D(x) = x^d mod n ( d geheim )
*
*
- * Sicherheit:
+ * Sicherheit:
*
- * p,q sollten bei mind. 10^100 liegen.
- * (d,phi) == 1, das gilt fuer alle Primzahlen > max(p,q).
- * Allerdings sollte d moeglichst gross sein ( d < phi-1 )
- * um direktes Suchen zu verhindern.
+ * p,q sollten bei mind. 10^100 liegen.
+ * (d,phi) == 1, das gilt fuer alle Primzahlen > max(p,q).
+ * Allerdings sollte d moeglichst gross sein ( d < phi-1 )
+ * um direktes Suchen zu verhindern.
*/
/*
- * FUNKTIONEN um RSA Schluessel zu generieren.
+ * FUNKTIONEN um RSA Schluessel zu generieren.
*
- * int p_prim( n, m )
- * rsa_NUMBER *n;
- * int m;
- * 0 : n ist nicht prim
- * 1 : n ist mit Wahrscheinlichkeit (1-1/2^m) prim
- * ACHTUNG !!!!
- * p_prim benutzt m_init
+ * int p_prim( n, m )
+ * rsa_NUMBER *n;
+ * int m;
+ * 0 : n ist nicht prim
+ * 1 : n ist mit Wahrscheinlichkeit (1-1/2^m) prim
+ * ACHTUNG !!!!
+ * p_prim benutzt m_init
*
- * inv( d, phi, e )
- * rsa_NUMBER *d,*phi,*e;
- * *e = *d^-1 (mod phi)
- * ACHTUNG !!!!
- * p_prim benutzt m_init
+ * inv( d, phi, e )
+ * rsa_NUMBER *d,*phi,*e;
+ * *e = *d^-1 (mod phi)
+ * ACHTUNG !!!!
+ * p_prim benutzt m_init
*/
/*
* Prototypes
*/
-static int jak_f( rsa_NUMBER* );
-static int jak_g( rsa_NUMBER*, rsa_NUMBER* );
-static int jakobi( rsa_NUMBER*, rsa_NUMBER* );
+static int jak_f( rsa_NUMBER* );
+static int jak_g( rsa_NUMBER*, rsa_NUMBER* );
+static int jakobi( rsa_NUMBER*, rsa_NUMBER* );
/*
* Hilfs-Funktion fuer jakobi
@@ -836,10 +836,10 @@ static int jakobi(rsa_NUMBER *a, rsa_NUMBER *n)
* b > 1
*
* J( a, b) =
- * a == 1 : 1
- * a == 2 : f(n)
- * a == 2*b : J(b,n)*J(2,n) ( == J(b,n)*f(n) )
- * a == 2*b -1 : J(n % a,a)*g(a,n)
+ * a == 1 : 1
+ * a == 2 : f(n)
+ * a == 2*b : J(b,n)*J(2,n) ( == J(b,n)*f(n) )
+ * a == 2*b -1 : J(n % a,a)*g(a,n)
*
*/
@@ -852,16 +852,16 @@ static int jakobi(rsa_NUMBER *a, rsa_NUMBER *n)
ret *= jak_f( &t[nt] );
break;
}
- if ( ! t[at].n_len ) /* Fehler :-) */
+ if ( ! t[at].n_len ) /* Fehler :-) */
abort();
- if ( t[at].n_part[0] & 1) { /* a == 2*b -1 */
+ if ( t[at].n_part[0] & 1) { /* a == 2*b -1 */
int tmp;
ret *= jak_g( &t[at], &t[nt] );
a_div( &t[nt], &t[at], rsa_NUM0P, &t[nt] );
tmp = at; at = nt; nt = tmp;
}
- else { /* a == 2*b */
+ else { /* a == 2*b */
ret *= jak_f( &t[nt] );
a_div2( &t[at] );
}
@@ -877,8 +877,8 @@ static int jakobi(rsa_NUMBER *a, rsa_NUMBER *n)
* 0 -> n nicht prim
* 1 -> n prim mit (1-1/2^m) Wahrscheinlichkeit.
*
- * ACHTUNG !!!!!!
- * p_prim benutzt m_init !!
+ * ACHTUNG !!!!!!
+ * p_prim benutzt m_init !!
*
*/
int p_prim(rsa_NUMBER *n, int m)
@@ -890,15 +890,15 @@ int p_prim(rsa_NUMBER *n, int m)
if (a_cmp(n,&a_two) <= 0 || m <= 0)
abort();
- a_sub( n, &a_one, &n1 ); /* n1 = -1 mod n */
+ a_sub( n, &a_one, &n1 ); /* n1 = -1 mod n */
a_assign( &n2, &n1 );
- a_div2( &n2 ); /* n2 = ( n -1) / 2 */
+ a_div2( &n2 ); /* n2 = ( n -1) / 2 */
m_init( n, rsa_NUM0P );
w = 1;
for (; w && m; m--) {
- /* ziehe zufaellig a aus 2..n-1 */
+ /* ziehe zufaellig a aus 2..n-1 */
do {
for (i=n->n_len-1, p=a.n_part; i; i--)
*p++ = (rsa_INT)aux_rand();
@@ -909,13 +909,13 @@ int p_prim(rsa_NUMBER *n, int m)
a.n_len = i;
} while ( a_cmp( &a, n) >= 0 || a_cmp( &a, &a_two) < 0 );
- /* jetzt ist a fertig */
+ /* jetzt ist a fertig */
/*
* n ist nicht prim wenn gilt:
- * (a,n) != 1
+ * (a,n) != 1
* oder
- * a^( (n-1)/2) != J(a,n) mod n
+ * a^( (n-1)/2) != J(a,n) mod n
*
*/
@@ -940,11 +940,11 @@ int p_prim(rsa_NUMBER *n, int m)
/*
* Berechne mulitiplikatives Inverses zu d (mod phi)
- * d relativ prim zu phi ( d < phi )
- * d.h. (d,phi) == 1
+ * d relativ prim zu phi ( d < phi )
+ * d.h. (d,phi) == 1
*
- * ACHTUNG !!!!
- * inv benutzt m_init
+ * ACHTUNG !!!!
+ * inv benutzt m_init
*/
void inv(rsa_NUMBER *d, rsa_NUMBER *phi, rsa_NUMBER *e)
{
@@ -953,7 +953,7 @@ void inv(rsa_NUMBER *d, rsa_NUMBER *phi, rsa_NUMBER *e)
/*
* Berlekamp-Algorithmus
- * ( fuer diesen Spezialfall vereinfacht )
+ * ( fuer diesen Spezialfall vereinfacht )
*/
if (a_cmp(phi,d) <= 0)
@@ -975,10 +975,10 @@ void inv(rsa_NUMBER *d, rsa_NUMBER *phi, rsa_NUMBER *e)
m_add( &p[i0], &p[i2], &p[i0] );
} while (r[i0].n_len);
- if ( a_cmp( &r[i1], &a_one) ) /* r[i1] == (d,phi) muss 1 sein */
+ if ( a_cmp( &r[i1], &a_one) ) /* r[i1] == (d,phi) muss 1 sein */
abort();
- if ( k & 1 ) /* falsches ''Vorzeichen'' */
+ if ( k & 1 ) /* falsches ''Vorzeichen'' */
a_sub( phi, &p[i1], e );
else
a_assign( e, &p[i1] );
@@ -986,7 +986,7 @@ void inv(rsa_NUMBER *d, rsa_NUMBER *phi, rsa_NUMBER *e)
/*******************************************************************************
- * *
+ * *
* rnd.c *
* *
********************************************************************************/
@@ -1030,7 +1030,7 @@ void init_rnd()
/*******************************************************************************
- * *
+ * *
* aux.c *
* *
********************************************************************************/
diff --git a/net/auth/src/rsafun.cxx b/net/auth/src/rsafun.cxx
index 13318904c81..1491bdc9cd9 100644
--- a/net/auth/src/rsafun.cxx
+++ b/net/auth/src/rsafun.cxx
@@ -22,11 +22,11 @@ MA 02110-1301 USA
******************************************************************************/
/*******************************************************************************
-* *
+* *
* Simple RSA public key code. *
* Adaptation in library for ROOT by G. Ganis, July 2003 *
* (gerardo.ganis@cern.ch) *
-* *
+* *
*******************************************************************************/
#include "rsafun.h"
diff --git a/net/auth/src/rsalib.cxx b/net/auth/src/rsalib.cxx
index bcefe06cd23..aad3b5e99f9 100644
--- a/net/auth/src/rsalib.cxx
+++ b/net/auth/src/rsalib.cxx
@@ -22,24 +22,24 @@ MA 02110-1301 USA
******************************************************************************/
/*******************************************************************************
-* *
+* *
* Simple RSA public key code. *
* Adaptation in library for ROOT by G. Ganis, July 2003 *
* (gerardo.ganis@cern.ch) *
-* *
+* *
*******************************************************************************/
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdlib.h>
#include <errno.h>
-#include "rsaaux.h"
-#include "rsalib.h"
+#include "rsaaux.h"
+#include "rsalib.h"
-static int g_clear_siz; /* clear-text blocksize */
-static int g_enc_siz; /* encoded blocksize */
+static int g_clear_siz; /* clear-text blocksize */
+static int g_enc_siz; /* encoded blocksize */
/* g_clear_siz < g_enc_siz */
int gLog = 0;
@@ -211,38 +211,38 @@ int rsa_decode(char *bufin, int lin, rsa_NUMBER n, rsa_NUMBER e)
/*******************************************************************************
- * *
+ * *
* nio.c *
* *
********************************************************************************/
/*
- * rsa_NUMBER io
+ * rsa_NUMBER io
*/
/*
- * Funktionen
+ * Funktionen
*
- * int num_sput( n, s, l)
- * rsa_NUMBER *n;
- * char s[l];
- * schreibt *n als Hex-Zahl in s
+ * int num_sput( n, s, l)
+ * rsa_NUMBER *n;
+ * char s[l];
+ * schreibt *n als Hex-Zahl in s
*
- * int num_fput( n, f )
- * rsa_NUMBER *n;
- * FILE *f;
- * schreibt *n als Hex-Zahl in File f
+ * int num_fput( n, f )
+ * rsa_NUMBER *n;
+ * FILE *f;
+ * schreibt *n als Hex-Zahl in File f
*
- * int num_sget( n, s )
- * rsa_NUMBER *n;
- * char *s;
- * liest Hex-Zahl s in *n ein
+ * int num_sget( n, s )
+ * rsa_NUMBER *n;
+ * char *s;
+ * liest Hex-Zahl s in *n ein
*
- * int num_fget( n, f )
- * rsa_NUMBER *n;
- * FILE *f;
- * liest eine Hex-Zahl von f in *n ein
+ * int num_fget( n, f )
+ * rsa_NUMBER *n;
+ * FILE *f;
+ * liest eine Hex-Zahl von f in *n ein
*
*/
@@ -480,7 +480,7 @@ int rsa_cmp(rsa_NUMBER *c1, rsa_NUMBER *c2)
if ( (l=c1->n_len) != c2->n_len)
return( l - c2->n_len);
- /* vergleiche als arrays */
+ /* vergleiche als arrays */
return( n_cmp( c1->n_part, c2->n_part, l) );
}
@@ -488,7 +488,7 @@ void rsa_assign(rsa_NUMBER *d, rsa_NUMBER *s)
{
int l;
- if (s == d) /* nichts zu kopieren */
+ if (s == d) /* nichts zu kopieren */
return;
if ((l=s->n_len))
diff --git a/net/davix/src/TDavixSystem.cxx b/net/davix/src/TDavixSystem.cxx
index 82433eeec25..d4fcffd88fb 100644
--- a/net/davix/src/TDavixSystem.cxx
+++ b/net/davix/src/TDavixSystem.cxx
@@ -52,7 +52,7 @@ extern const std::string VERSION;
extern const std::string gUserAgent;
// The prefix that is used to find the variables in the gEnv
-#define ENVPFX "Davix."
+#define ENVPFX "Davix."
ClassImp(TDavixSystem)
diff --git a/net/http/civetweb/md5.inl b/net/http/civetweb/md5.inl
index 4da933db403..4f5779098aa 100644
--- a/net/http/civetweb/md5.inl
+++ b/net/http/civetweb/md5.inl
@@ -14,7 +14,7 @@
This code implements the MD5 Algorithm defined in RFC 1321, whose
text is available at
- http://www.ietf.org/rfc/rfc1321.txt
+ http://www.ietf.org/rfc/rfc1321.txt
The code is derived from the text of the RFC, including the test suite
(section A.5) but excluding the rest of Appendix A. It does not include
any code or documentation that is identified in the RFC as being
@@ -25,12 +25,12 @@
that follows (in reverse chronological order):
2002-04-13 lpd Removed support for non-ANSI compilers; removed
- references to Ghostscript; clarified derivation from RFC 1321;
- now handles byte order either statically or dynamically.
+ references to Ghostscript; clarified derivation from RFC 1321;
+ now handles byte order either statically or dynamically.
1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5);
- added conditionalization for C++ compilation from Martin
- Purschke <purschke@bnl.gov>.
+ added conditionalization for C++ compilation from Martin
+ Purschke <purschke@bnl.gov>.
1999-05-03 lpd Original version.
*/
@@ -52,9 +52,9 @@ typedef unsigned int md5_word_t; /* 32-bit word */
/* Define the state of the MD5 Algorithm. */
typedef struct md5_state_s {
- md5_word_t count[2]; /* message length in bits, lsw first */
- md5_word_t abcd[4]; /* digest buffer */
- md5_byte_t buf[64]; /* accumulate block */
+ md5_word_t count[2]; /* message length in bits, lsw first */
+ md5_word_t abcd[4]; /* digest buffer */
+ md5_byte_t buf[64]; /* accumulate block */
} md5_state_t;
#ifdef __cplusplus
@@ -106,7 +106,7 @@ MD5_STATIC void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
This code implements the MD5 Algorithm defined in RFC 1321, whose
text is available at
- http://www.ietf.org/rfc/rfc1321.txt
+ http://www.ietf.org/rfc/rfc1321.txt
The code is derived from the text of the RFC, including the test suite
(section A.5) but excluding the rest of Appendix A. It does not include
any code or documentation that is identified in the RFC as being
@@ -117,14 +117,14 @@ MD5_STATIC void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
that follows (in reverse chronological order):
2002-04-13 lpd Clarified derivation from RFC 1321; now handles byte order
- either statically or dynamically; added missing #include <string.h>
- in library.
+ either statically or dynamically; added missing #include <string.h>
+ in library.
2002-03-11 lpd Corrected argument list for main(), and added int return
- type, in test program and T value program.
+ type, in test program and T value program.
2002-02-21 lpd Added missing #include <stdio.h> in test program.
2000-07-03 lpd Patched to eliminate warnings about "constant is
- unsigned in ANSI C, signed in traditional"; made test program
- self-checking.
+ unsigned in ANSI C, signed in traditional"; made test program
+ self-checking.
1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5).
1999-05-03 lpd Original version.
@@ -134,7 +134,7 @@ MD5_STATIC void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
#include <string.h>
#endif
-#undef BYTE_ORDER /* 1 = big-endian, -1 = little-endian, 0 = unknown */
+#undef BYTE_ORDER /* 1 = big-endian, -1 = little-endian, 0 = unknown */
#ifdef ARCH_IS_BIG_ENDIAN
# define BYTE_ORDER (ARCH_IS_BIG_ENDIAN ? 1 : -1)
#else
@@ -235,7 +235,7 @@ md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
if (*((const md5_byte_t *)&w)) /* dynamic little-endian */
#endif
-#if BYTE_ORDER <= 0 /* little-endian */
+#if BYTE_ORDER <= 0 /* little-endian */
{
/*
* On little-endian machines, we can process properly aligned
@@ -252,9 +252,9 @@ md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
}
#endif
#if BYTE_ORDER == 0
- else /* dynamic big-endian */
+ else /* dynamic big-endian */
#endif
-#if BYTE_ORDER >= 0 /* big-endian */
+#if BYTE_ORDER >= 0 /* big-endian */
{
/*
* On big-endian machines, we must arrange the bytes in the
@@ -264,9 +264,9 @@ md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
int i;
# if BYTE_ORDER == 0
- X = xbuf; /* (dynamic only) */
+ X = xbuf; /* (dynamic only) */
# else
-# define xbuf X /* (static only) */
+# define xbuf X /* (static only) */
# endif
for (i = 0; i < 16; ++i, xp += 4)
xbuf[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
diff --git a/net/krb5auth/src/TKSocket.cxx b/net/krb5auth/src/TKSocket.cxx
index 3c6d6cfb4fb..5cf553bb337 100644
--- a/net/krb5auth/src/TKSocket.cxx
+++ b/net/krb5auth/src/TKSocket.cxx
@@ -77,7 +77,7 @@ int krb5_net_read(krb5_context /*context*/, int fd, register char *buf, register
continue;
/* XXX this interface sucks! */
- errno = SOCKET_ERRNO;
+ errno = SOCKET_ERRNO;
return(cc); /* errno is already set */
} else if (cc == 0) {
diff --git a/net/ldap/inc/CintLDAP.h b/net/ldap/inc/CintLDAP.h
index 48b0121805f..4220b705fd7 100644
--- a/net/ldap/inc/CintLDAP.h
+++ b/net/ldap/inc/CintLDAP.h
@@ -36,9 +36,9 @@ struct LDAP;
struct LDAPMessage;
struct LDAPMod;
-#define LDAP_VERSION1 1
-#define LDAP_VERSION2 2
-#define LDAP_VERSION3 3
+#define LDAP_VERSION1 1
+#define LDAP_VERSION2 2
+#define LDAP_VERSION3 3
const int LDAP_PORT = 389;
diff --git a/net/net/inc/TS3WebFile.h b/net/net/inc/TS3WebFile.h
index 95947ed53aa..1e823de9379 100644
--- a/net/net/inc/TS3WebFile.h
+++ b/net/net/inc/TS3WebFile.h
@@ -108,7 +108,7 @@ public:
const TUrl& GetUrl() const { return fUrl; }
// Modifiers
- virtual Bool_t ReadBuffers(char* buf, Long64_t* pos, Int_t* len, Int_t nbuf);
+ virtual Bool_t ReadBuffers(char* buf, Long64_t* pos, Int_t* len, Int_t nbuf);
ClassDef(TS3WebFile, 0) // Read a ROOT file from a S3 server
};
diff --git a/net/net/inc/TWebFile.h b/net/net/inc/TWebFile.h
index e20fe5dee3d..21851e52525 100644
--- a/net/net/inc/TWebFile.h
+++ b/net/net/inc/TWebFile.h
@@ -42,7 +42,7 @@ friend class TWebSocket;
friend class TWebSystem;
private:
- TWebFile() : fSocket(0) { }
+ TWebFile() : fSocket(0) { }
protected:
mutable Long64_t fSize; // file size
diff --git a/net/rpdutils/src/daemon.cxx b/net/rpdutils/src/daemon.cxx
index ab52f4a3523..54d00140817 100644
--- a/net/rpdutils/src/daemon.cxx
+++ b/net/rpdutils/src/daemon.cxx
@@ -48,7 +48,7 @@
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
#define USE_SIGCHLD
-#define SIGCLD SIGCHLD
+#define SIGCLD SIGCHLD
#endif
#if defined(linux) || defined(__hpux) || defined(__sun) || defined(__sgi) || \
diff --git a/net/srputils/src/rpasswd.c b/net/srputils/src/rpasswd.c
index c5e994dc648..b4555544e48 100644
--- a/net/srputils/src/rpasswd.c
+++ b/net/srputils/src/rpasswd.c
@@ -20,7 +20,7 @@
#endif
#endif
#define STRFCPY(A,B) \
- (strncpy((A), (B), sizeof(A) - 1), (A)[sizeof(A) - 1] = '\0')
+ (strncpy((A), (B), sizeof(A) - 1), (A)[sizeof(A) - 1] = '\0')
extern int obscure P_((const char *, const char *, const struct passwd *));
extern char *Basename P_((char *str));
extern struct passwd *get_my_pwent P_((void));
@@ -83,7 +83,7 @@ Please use a combination of upper and lower case letters and numbers.\n"
#define UNCHANGED "The password for %s is unchanged.\n"
#define PASSWARN \
- "\nWarning: weak password (enter it again to use it anyway).\n"
+ "\nWarning: weak password (enter it again to use it anyway).\n"
/*
* usage - print command usage and exit
@@ -183,21 +183,21 @@ static int new_password(const struct passwd *pw)
/*
* rpasswd - change a user's password file information
*
- * This command controls the password file and commands which are
- * used to modify it.
+ * This command controls the password file and commands which are
+ * used to modify it.
*
- * The valid options are
+ * The valid options are
*
- * -c config file name (default $HOME/.srootdpass.conf)
- * -p passwd file name (default $HOME/.srootdpass)
+ * -c config file name (default $HOME/.srootdpass.conf)
+ * -p passwd file name (default $HOME/.srootdpass)
*
- * Exit status:
- * 0 - success
- * 1 - permission denied
- * 2 - invalid combination of options
- * 3 - unexpected failure, password file unchanged
- * 5 - password file busy, try again later
- * 6 - invalid argument to option
+ * Exit status:
+ * 0 - success
+ * 1 - permission denied
+ * 2 - invalid combination of options
+ * 3 - unexpected failure, password file unchanged
+ * 5 - password file busy, try again later
+ * 6 - invalid argument to option
*/
int main(int argc, char **argv)
diff --git a/test/QpRandomDriver.cxx b/test/QpRandomDriver.cxx
index a4a2d975cb1..92889edaf27 100644
--- a/test/QpRandomDriver.cxx
+++ b/test/QpRandomDriver.cxx
@@ -56,8 +56,8 @@ int main(int argc,char *argv[])
if (SolutionMatches(vars,soln,temp,1e-4)) {
std::cout << "The solution appears to be correct." <<std::endl;
} else {
- std::cout << std::endl << "The solution may be wrong "
- "(or the generated problem may be ill conditioned.)" <<std::endl;
+ std::cout << std::endl << "The solution may be wrong "
+ "(or the generated problem may be ill conditioned.)" <<std::endl;
}
delete temp;
} else {
diff --git a/test/ctorture.cxx b/test/ctorture.cxx
index ba1f648c2e2..9089ebc5b84 100644
--- a/test/ctorture.cxx
+++ b/test/ctorture.cxx
@@ -11,8 +11,8 @@ Double_t Error(TComplex a, TComplex b)
{return 2*TComplex::Abs(a-b)/(a.Rho()+b.Rho());}
void Verify(const TComplex a, const TComplex b,
- Double_t epsmin, Double_t epsmax,
- const char* where, Int_t & ifail, Double_t &serr)
+ Double_t epsmin, Double_t epsmax,
+ const char* where, Int_t & ifail, Double_t &serr)
{
Double_t err=Error(a,b);
serr+=err;
@@ -25,7 +25,7 @@ void Verify(const TComplex a, const TComplex b,
}
}
}
-
+
void Summary(const char* title, Int_t ifail, Double_t serr, Int_t np)
{
printf("Results for %s\n",title);
@@ -193,9 +193,9 @@ int main () {
for(i=0; i<np; i++) {
a=TComplex(10*(1-2*gRandom->Rndm()),10*(1-2*gRandom->Rndm()));
while (TComplex::Abs(
- e=TComplex(10*(1-2*gRandom->Rndm()),
- 10*(1-2*gRandom->Rndm()))
- )<0.1) { }
+ e=TComplex(10*(1-2*gRandom->Rndm()),
+ 10*(1-2*gRandom->Rndm()))
+ )<0.1) { }
b=TComplex::Power(a,1./e);
c=TComplex::Power(b,e);
Verify(a,c,2e-14,1.,title,ifail,serr);
@@ -221,9 +221,9 @@ int main () {
strlcpy(title,"Power R-C",20);
for(i=0; i<np; i++) {
while (TComplex::Abs(
- a=TComplex(10*(1-2*gRandom->Rndm()),
- 10*(1-2*gRandom->Rndm()))
- )<0.1) { }
+ a=TComplex(10*(1-2*gRandom->Rndm()),
+ 10*(1-2*gRandom->Rndm()))
+ )<0.1) { }
x=10*(1-2*gRandom->Rndm());
b=TComplex::Power(x,1./a);
c=TComplex::Power(b,a);
diff --git a/test/ios/Tutorials/PadOptionsController.mm b/test/ios/Tutorials/PadOptionsController.mm
index ca3b374559b..4437d61b22d 100644
--- a/test/ios/Tutorials/PadOptionsController.mm
+++ b/test/ios/Tutorials/PadOptionsController.mm
@@ -103,8 +103,8 @@ const unsigned colorIndices[16] = {
//_________________________________________________________________
- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
{
- // Return YES for supported orientations
- return YES;
+ // Return YES for supported orientations
+ return YES;
}
#pragma mark - editing.
@@ -194,7 +194,7 @@ const unsigned colorIndices[16] = {
//_________________________________________________________________
- (NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView
{
- return 1;
+ return 1;
}
#pragma mark UIPickerViewDelegate
@@ -202,7 +202,7 @@ const unsigned colorIndices[16] = {
// tell the picker which view to use for a given component and row, we have an array of views to show
//_________________________________________________________________
- (UIView *)pickerView:(UIPickerView *)pickerView viewForRow:(NSInteger)row
- forComponent:(NSInteger)component reusingView:(UIView *)view
+ forComponent:(NSInteger)component reusingView:(UIView *)view
{
if (pickerView == colorPicker_)
return [colors_ objectAtIndex : row];
diff --git a/test/ios/Tutorials/PadView.mm b/test/ios/Tutorials/PadView.mm
index 8ad4e43a358..37e0c628c4f 100644
--- a/test/ios/Tutorials/PadView.mm
+++ b/test/ios/Tutorials/PadView.mm
@@ -127,21 +127,21 @@
//_________________________________________________________________
- (BOOL) fillPickingBufferFromCGImage : (CGImageRef) cgImage
{
- const size_t pixelsW = CGImageGetWidth(cgImage);
- const size_t pixelsH = CGImageGetHeight(cgImage);
- //Declare the number of bytes per row. Each pixel in the bitmap
- //is represented by 4 bytes; 8 bits each of red, green, blue, and
- //alpha.
- const int bitmapBytesPerRow = pixelsW * 4;
- const int bitmapByteCount = bitmapBytesPerRow * pixelsH;
-
- //Use the generic RGB color space.
- CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
- if (!colorSpace) {
+ const size_t pixelsW = CGImageGetWidth(cgImage);
+ const size_t pixelsH = CGImageGetHeight(cgImage);
+ //Declare the number of bytes per row. Each pixel in the bitmap
+ //is represented by 4 bytes; 8 bits each of red, green, blue, and
+ //alpha.
+ const int bitmapBytesPerRow = pixelsW * 4;
+ const int bitmapByteCount = bitmapBytesPerRow * pixelsH;
+
+ //Use the generic RGB color space.
+ CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
+ if (!colorSpace) {
//Log error: color space allocation failed.
return NO;
}
-
+
unsigned char *buffer = (unsigned char*)malloc(bitmapByteCount);
if (!buffer) {
//Log error: memory allocation failed.
@@ -149,31 +149,31 @@
return NO;
}
- // Create the bitmap context. We want pre-multiplied ARGB, 8-bits
- // per component. Regardless of what the source image format is
- // (CMYK, Grayscale, and so on) it will be converted over to the format
- // specified here by CGBitmapContextCreate.
+ // Create the bitmap context. We want pre-multiplied ARGB, 8-bits
+ // per component. Regardless of what the source image format is
+ // (CMYK, Grayscale, and so on) it will be converted over to the format
+ // specified here by CGBitmapContextCreate.
CGContextRef ctx = CGBitmapContextCreate(buffer, pixelsW, pixelsH, 8, bitmapBytesPerRow, colorSpace, kCGImageAlphaPremultipliedFirst);
CGColorSpaceRelease(colorSpace);
- if (!ctx) {
+ if (!ctx) {
//Log error: bitmap context creation failed.
free(buffer);
return NO;
}
-
- const CGRect rect = CGRectMake(0.f, 0.f, pixelsW, pixelsH);
- //Draw the image to the bitmap context. Once we draw, the memory
- //allocated for the context for rendering will then contain the
- //raw image data in the specified color space.
+
+ const CGRect rect = CGRectMake(0.f, 0.f, pixelsW, pixelsH);
+ //Draw the image to the bitmap context. Once we draw, the memory
+ //allocated for the context for rendering will then contain the
+ //raw image data in the specified color space.
CGContextSetAllowsAntialiasing(ctx, 0);//Check, if I need this for a bitmap.
- CGContextDrawImage(ctx, rect, cgImage);
+ CGContextDrawImage(ctx, rect, cgImage);
pad->SetSelectionBuffer(pixelsW, pixelsH, buffer);
- // When finished, release the context
- CGContextRelease(ctx);
+ // When finished, release the context
+ CGContextRelease(ctx);
free(buffer);
return YES;
diff --git a/test/ios/Tutorials/Tutorials/DetailViewController.mm b/test/ios/Tutorials/Tutorials/DetailViewController.mm
index 9e91427de30..ddc0354ba42 100644
--- a/test/ios/Tutorials/Tutorials/DetailViewController.mm
+++ b/test/ios/Tutorials/Tutorials/DetailViewController.mm
@@ -429,7 +429,7 @@ enum ETutorialsDefaults {
transition.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
// Now to set the type of transition.
transition.type = kCATransitionReveal;
- transition.subtype = kCATransitionFromLeft;
+ transition.subtype = kCATransitionFromLeft;
// Finally, to avoid overlapping transitions we assign ourselves as the delegate for the animation and wait for the
// -animationDidStop:finished: message. When it comes in, we will flag that we are no longer transitioning.
//transitioning = YES;
diff --git a/test/ios/Tutorials/Tutorials/RootViewController.h b/test/ios/Tutorials/Tutorials/RootViewController.h
index 9c233532dfc..247cec14376 100644
--- a/test/ios/Tutorials/Tutorials/RootViewController.h
+++ b/test/ios/Tutorials/Tutorials/RootViewController.h
@@ -1,7 +1,7 @@
#import <UIKit/UIKit.h>
@interface RootViewController : UITableViewController
-
+
@property (nonatomic, retain) IBOutlet DetailViewController *detailViewController;
@end
diff --git a/test/periodic/NdbAngularDist.h b/test/periodic/NdbAngularDist.h
index 4b6f952f636..7f6b1ee8c42 100644
--- a/test/periodic/NdbAngularDist.h
+++ b/test/periodic/NdbAngularDist.h
@@ -9,11 +9,11 @@ class NdbAngularDist : public NdbMF
protected:
public:
- NdbAngularDist()
- : NdbMF(4, "Angular distributions for emitted particles") {}
- ~NdbAngularDist() {}
+ NdbAngularDist()
+ : NdbMF(4, "Angular distributions for emitted particles") {}
+ ~NdbAngularDist() {}
- ClassDef(NdbAngularDist,1)
+ ClassDef(NdbAngularDist,1)
}; // NdbMfAngularDist
diff --git a/test/periodic/NdbDCAngularDist.h b/test/periodic/NdbDCAngularDist.h
index 15172750cfe..8238c9b6a05 100644
--- a/test/periodic/NdbDCAngularDist.h
+++ b/test/periodic/NdbDCAngularDist.h
@@ -9,11 +9,11 @@ class NdbDCAngularDist : public NdbMF
protected:
public:
- NdbDCAngularDist()
- : NdbMF(34, "Data covariances for angular distributions") {}
- ~NdbDCAngularDist() {}
+ NdbDCAngularDist()
+ : NdbMF(34, "Data covariances for angular distributions") {}
+ ~NdbDCAngularDist() {}
- ClassDef(NdbDCAngularDist,1)
+ ClassDef(NdbDCAngularDist,1)
}; // NdbDCAngularDist
diff --git a/test/periodic/NdbDCEnergyDist.h b/test/periodic/NdbDCEnergyDist.h
index 996e8380128..cf36e67baf0 100644
--- a/test/periodic/NdbDCEnergyDist.h
+++ b/test/periodic/NdbDCEnergyDist.h
@@ -9,11 +9,11 @@ class NdbDCEnergyDist : public NdbMF
protected:
public:
- NdbDCEnergyDist()
- : NdbMF(35, "Data covariances for energy distributions") {}
- ~NdbDCEnergyDist() {}
+ NdbDCEnergyDist()
+ : NdbMF(35, "Data covariances for energy distributions") {}
+ ~NdbDCEnergyDist() {}
- ClassDef(NdbDCEnergyDist,1)
+ ClassDef(NdbDCEnergyDist,1)
}; // NdbDCEnergyDist
diff --git a/test/periodic/NdbDCNuBar.h b/test/periodic/NdbDCNuBar.h
index ff7b1a20fd2..c6f3fa94ad0 100644
--- a/test/periodic/NdbDCNuBar.h
+++ b/test/periodic/NdbDCNuBar.h
@@ -9,11 +9,11 @@ class NdbDCNuBar : public NdbMF
protected:
public:
- NdbDCNuBar()
- : NdbMF(31, "Data covariances for nu(bar)") {}
- ~NdbDCNuBar() {}
+ NdbDCNuBar()
+ : NdbMF(31, "Data covariances for nu(bar)") {}
+ ~NdbDCNuBar() {}
- ClassDef(NdbDCNuBar,1)
+ ClassDef(NdbDCNuBar,1)
}; // NdbDCNuBar
diff --git a/test/periodic/NdbDCRadioXS.h b/test/periodic/NdbDCRadioXS.h
index 0be22aee884..27e67ba84cf 100644
--- a/test/periodic/NdbDCRadioXS.h
+++ b/test/periodic/NdbDCRadioXS.h
@@ -9,12 +9,12 @@ class NdbDCRadioXS : public NdbMF
protected:
public:
- NdbDCRadioXS()
- : NdbMF(40, "Data covariances for radionuclide production "
- "cross sections") {}
- ~NdbDCRadioXS() {}
+ NdbDCRadioXS()
+ : NdbMF(40, "Data covariances for radionuclide production "
+ "cross sections") {}
+ ~NdbDCRadioXS() {}
- ClassDef(NdbDCRadioXS,1)
+ ClassDef(NdbDCRadioXS,1)
}; // NdbDCRadioXS
diff --git a/test/periodic/NdbDCRadioYield.h b/test/periodic/NdbDCRadioYield.h
index 2c66b62c683..c4b7af1b401 100644
--- a/test/periodic/NdbDCRadioYield.h
+++ b/test/periodic/NdbDCRadioYield.h
@@ -9,12 +9,12 @@ class NdbDCRadioYield : public NdbMF
protected:
public:
- NdbDCRadioYield()
- : NdbMF(39, "Data covariances for radionuclide "
- "production yields") {}
- ~NdbDCRadioYield() {}
+ NdbDCRadioYield()
+ : NdbMF(39, "Data covariances for radionuclide "
+ "production yields") {}
+ ~NdbDCRadioYield() {}
- ClassDef(NdbDCRadioYield,1)
+ ClassDef(NdbDCRadioYield,1)
}; // NdbDCRadioYield
diff --git a/test/periodic/NdbDCReactionXS.h b/test/periodic/NdbDCReactionXS.h
index 9eb62bbf297..d6ac9df8da7 100644
--- a/test/periodic/NdbDCReactionXS.h
+++ b/test/periodic/NdbDCReactionXS.h
@@ -9,12 +9,12 @@ class NdbDCReactionXS : public NdbMF
protected:
public:
- NdbDCReactionXS()
- : NdbMF(33, "Data covariances for reaction cross section") {}
+ NdbDCReactionXS()
+ : NdbMF(33, "Data covariances for reaction cross section") {}
- ~NdbDCReactionXS() {}
+ ~NdbDCReactionXS() {}
- ClassDef(NdbDCReactionXS,1)
+ ClassDef(NdbDCReactionXS,1)
}; // NdbDCReactionXS
diff --git a/test/periodic/NdbDCResParam.h b/test/periodic/NdbDCResParam.h
index c1640d6f47b..dc3d88dfa77 100644
--- a/test/periodic/NdbDCResParam.h
+++ b/test/periodic/NdbDCResParam.h
@@ -9,11 +9,11 @@ class NdbDCResParam : public NdbMF
protected:
public:
- NdbDCResParam()
- : NdbMF(32, "Data covariances for resonance parameters") {}
- ~NdbDCResParam() {}
+ NdbDCResParam()
+ : NdbMF(32, "Data covariances for resonance parameters") {}
+ ~NdbDCResParam() {}
- ClassDef(NdbDCResParam,1)
+ ClassDef(NdbDCResParam,1)
}; // NdbDCResParam
diff --git a/test/periodic/NdbDataCovariances.h b/test/periodic/NdbDataCovariances.h
index f13bcfb3213..f47c282cb03 100644
--- a/test/periodic/NdbDataCovariances.h
+++ b/test/periodic/NdbDataCovariances.h
@@ -9,13 +9,13 @@ class NdbDataCovariances : public NdbMF
protected:
public:
- NdbDataCovariances()
- : NdbMF(30, "Data covariances obtained from parameter "
- "covariances and sensitivities") {}
+ NdbDataCovariances()
+ : NdbMF(30, "Data covariances obtained from parameter "
+ "covariances and sensitivities") {}
- ~NdbDataCovariances() {}
+ ~NdbDataCovariances() {}
- ClassDef(NdbDataCovariances,1)
+ ClassDef(NdbDataCovariances,1)
}; // NdbDataCovariances
diff --git a/test/periodic/NdbDefs.h b/test/periodic/NdbDefs.h
index 098d9b3df79..56679b3ee0c 100644
--- a/test/periodic/NdbDefs.h
+++ b/test/periodic/NdbDefs.h
@@ -7,31 +7,31 @@
#define __DEFS_H
#ifndef TRUE
-# define FALSE 0
-# define TRUE 1
+# define FALSE 0
+# define TRUE 1
#endif
#ifndef OFF
-# define OFF 0
-# define ON 1
+# define OFF 0
+# define ON 1
#endif
#ifndef NO
-# define NO 0
-# define YES 1
+# define NO 0
+# define YES 1
#endif
-#define NOTFOUND -1
+#define NOTFOUND -1
-#define THERMAL_ENERGY 0.05
-#define MAX_REAL 1e38
+#define THERMAL_ENERGY 0.05
+#define MAX_REAL 1e38
#ifndef PI
-# define PI 3.14159265358979323844
-# define PI2 6.28318530717958647692
+# define PI 3.14159265358979323844
+# define PI2 6.28318530717958647692
#endif
-#define PIover2 1.57079632679489661923
-#define PIover180 1.74532925199433E-002
-#define PIunder180 5.72957795130823E+001
-#define LN10 2.30258509299405
-#define ONEoverLN10 0.43429448190325
+#define PIover2 1.57079632679489661923
+#define PIover180 1.74532925199433E-002
+#define PIunder180 5.72957795130823E+001
+#define LN10 2.30258509299405
+#define ONEoverLN10 0.43429448190325
/* --- BIT definitions --- */
#define MASK1 0x0001
@@ -70,50 +70,50 @@
#define BIT16 0x10000L
/* ------------------ comonly used macros -------------------- */
-#define ISPRINT(c) ((c)>=' ' && (c)<='~' && (c)!='\'')
-#define ISSPACE(c) ((c==0x09) || (c==0x0D) || (c==0x20))
-#define HEXVAL(x) (((x)>='A')?((((x)>='a')?((x)&(0xdf)):(x))-'A'+10):((x)-'0'))
-#define CTL(a) (('a') & 0x1f)
-#define ESC ((char)27)
+#define ISPRINT(c) ((c)>=' ' && (c)<='~' && (c)!='\'')
+#define ISSPACE(c) ((c==0x09) || (c==0x0D) || (c==0x20))
+#define HEXVAL(x) (((x)>='A')?((((x)>='a')?((x)&(0xdf)):(x))-'A'+10):((x)-'0'))
+#define CTL(a) (('a') & 0x1f)
+#define ESC ((char)27)
-#define SWAP(a,b) a ^= b ^= a ^= b;
+#define SWAP(a,b) a ^= b ^= a ^= b;
-#define DIMENSION(p) (sizeof(p) / sizeof(p[0]))
-#define ABS(a) (((a)<0)?-(a):(a))
+#define DIMENSION(p) (sizeof(p) / sizeof(p[0]))
+#define ABS(a) (((a)<0)?-(a):(a))
#ifndef MAX
-# define MAX(a,b) (((a)>(b))?(a):(b))
-# define MIN(a,b) (((a)<(b))?(a):(b))
+# define MAX(a,b) (((a)>(b))?(a):(b))
+# define MIN(a,b) (((a)<(b))?(a):(b))
#endif
-#define MAX3(a,b,c) MAX(MAX(a,b),c)
-#define MAX4(a,b,c,d) MAX(MAX3(a,b,c),d)
+#define MAX3(a,b,c) MAX(MAX(a,b),c)
+#define MAX4(a,b,c,d) MAX(MAX3(a,b,c),d)
-#define MIN3(a,b,c) MIN(MIN(a,b),c)
-#define MIN4(a,b,c,d) MIN(MIN3(a,b,c),d)
+#define MIN3(a,b,c) MIN(MIN(a,b),c)
+#define MIN4(a,b,c,d) MIN(MIN3(a,b,c),d)
-#define RANGE(a,x,b) ((x)<(a)?(a): ((x)>(b)?(b):(x)))
-#define IN_RANGE(a,x,b) (((a) <= (x)) && ((x) <= (b)))
+#define RANGE(a,x,b) ((x)<(a)?(a): ((x)>(b)?(b):(x)))
+#define IN_RANGE(a,x,b) (((a) <= (x)) && ((x) <= (b)))
-#define ODD(n) ((n)&1)
-#define EVEN(n) (!((n)&1))
+#define ODD(n) ((n)&1)
+#define EVEN(n) (!((n)&1))
-#define TRUNC(a) ((a)>=0? (int)(a) : (int)((a)-1))
-#define ROUND(a) ((a)>=0? (int)((a)+0.5): -(int)(0.5-(a)))
-#define CEILING(a) ((a)==(int)(a)? (int)(a): \
- (a)>0? (int)(1+(int)(a)): -(int)(1+(int)(-(a))))
-#define FRAC(x) ((x)-(float)((int)(x)))
-#define SIGN(x) ((x)>0? 1:(((x)==0)?0:-1))
-#define SQR(x) ((x)*(x))
+#define TRUNC(a) ((a)>=0? (int)(a) : (int)((a)-1))
+#define ROUND(a) ((a)>=0? (int)((a)+0.5): -(int)(0.5-(a)))
+#define CEILING(a) ((a)==(int)(a)? (int)(a): \
+ (a)>0? (int)(1+(int)(a)): -(int)(1+(int)(-(a))))
+#define FRAC(x) ((x)-(float)((int)(x)))
+#define SIGN(x) ((x)>0? 1:(((x)==0)?0:-1))
+#define SQR(x) ((x)*(x))
-#define RAD(a) ((a)*PIover180)
-#define DEG(a) ((a)*PIunder180)
+#define RAD(a) ((a)*PIover180)
+#define DEG(a) ((a)*PIunder180)
-#define COSD(a) cos(RAD(a))
-#define SIND(a) sin(RAD(a))
-#define TAND(a) tan(RAD(a))
+#define COSD(a) cos(RAD(a))
+#define SIND(a) sin(RAD(a))
+#define TAND(a) tan(RAD(a))
-#define LOG(x) (log(x)*ONEoverLN10)
-#define EXP10(x) exp((x)*LN10)
+#define LOG(x) (log(x)*ONEoverLN10)
+#define EXP10(x) exp((x)*LN10)
#endif
diff --git a/test/periodic/NdbEndfIO.cxx b/test/periodic/NdbEndfIO.cxx
index e24ee97b125..22575c310fd 100644
--- a/test/periodic/NdbEndfIO.cxx
+++ b/test/periodic/NdbEndfIO.cxx
@@ -2,24 +2,24 @@
#include "NdbEndfIO.h"
-#define NUMBER_SIZE 11
+#define NUMBER_SIZE 11
-char NdbEndfIO::_str[100]; // define static _str var
+char NdbEndfIO::_str[100]; // define static _str var
ClassImp(NdbEndfIO)
/* ============ NdbEndfIO ============== */
NdbEndfIO::NdbEndfIO( char *filename, Int_t mode )
{
- f = fopen(filename,mode==TENDF_READ?"r":"w");
- matStart = 0;
- mfStart = 0;
- mtStart = 0;
- iMAT = 0;
- iMF = 0;
- iMT = 0;
- lineNum = 0;
- lineTxt[0] = 0;
+ f = fopen(filename,mode==TENDF_READ?"r":"w");
+ matStart = 0;
+ mfStart = 0;
+ mtStart = 0;
+ iMAT = 0;
+ iMF = 0;
+ iMT = 0;
+ lineNum = 0;
+ lineTxt[0] = 0;
} // NdbEndfIO
@@ -28,14 +28,14 @@ NdbEndfIO::NdbEndfIO( char *filename, Int_t mode )
Bool_t
NdbEndfIO::FindMAT( Int_t mat, Bool_t rewind )
{
- if (rewind)
- fseek(f, 0L, SEEK_SET);
-
- while (ReadLine())
- if (iMAT == mat)
- return TRUE;
-
- return FALSE;
+ if (rewind)
+ fseek(f, 0L, SEEK_SET);
+
+ while (ReadLine())
+ if (iMAT == mat)
+ return TRUE;
+
+ return FALSE;
} // FindMAT
/* -------- FindMATMF --------- */
@@ -43,14 +43,14 @@ NdbEndfIO::FindMAT( Int_t mat, Bool_t rewind )
Bool_t
NdbEndfIO::FindMATMF( Int_t mat, Int_t mf, Bool_t rewind )
{
- FindMAT(mat,rewind);
-
- do {
- if (iMF == mf)
- return TRUE;
- } while (ReadLine());
-
- return FALSE;
+ FindMAT(mat,rewind);
+
+ do {
+ if (iMF == mf)
+ return TRUE;
+ } while (ReadLine());
+
+ return FALSE;
} // FindMATMF
/* -------- FindMATMFMT --------- */
@@ -58,45 +58,45 @@ NdbEndfIO::FindMATMF( Int_t mat, Int_t mf, Bool_t rewind )
Bool_t
NdbEndfIO::FindMATMFMT( Int_t mat, Int_t mf, Int_t mt, Bool_t rewind )
{
- FindMATMF(mat,mf,rewind);
-
- do {
- if (iMT == mt)
- return TRUE;
- } while (ReadLine());
-
- return FALSE;
+ FindMATMF(mat,mf,rewind);
+
+ do {
+ if (iMT == mt)
+ return TRUE;
+ } while (ReadLine());
+
+ return FALSE;
} // FindMATMFMT
/* ------------ FindMFMT ------------- */
Bool_t
NdbEndfIO::FindMFMT( Int_t mf, Int_t mt )
{
- // If current MFMT is higher than what we search go to the beggining
- if (mf*1000+mt >= iMF*1000+iMT) {
- RewindMAT();
- if (!ReadLine())
- return FALSE;
- }
-
- while (mf*1000+mt > iMF*1000+iMT)
- if (!ReadLine())
- return FALSE;
- return TRUE;
+ // If current MFMT is higher than what we search go to the beggining
+ if (mf*1000+mt >= iMF*1000+iMT) {
+ RewindMAT();
+ if (!ReadLine())
+ return FALSE;
+ }
+
+ while (mf*1000+mt > iMF*1000+iMT)
+ if (!ReadLine())
+ return FALSE;
+ return TRUE;
} // FindMFMT
/* -------- Substr ---------- */
char *
NdbEndfIO::Substr(Int_t start, Int_t length)
{
- if (start + length > lineLen) {
-// error(ERR_INVALID_RECORD);
- return NULL;
- }
- memcpy(_str, lineTxt+start, length);
- _str[length] = 0;
-
- return _str;
+ if (start + length > lineLen) {
+// error(ERR_INVALID_RECORD);
+ return NULL;
+ }
+ memcpy(_str, lineTxt+start, length);
+ _str[length] = 0;
+
+ return _str;
} // Substr
/* -------- NextNumber ---------- */
@@ -106,27 +106,27 @@ NdbEndfIO::Substr(Int_t start, Int_t length)
Bool_t
NdbEndfIO::NextNumber(Int_t pos)
{
- if (pos<0 || pos>5*NUMBER_SIZE) {
- lastNumPos += NUMBER_SIZE;
- if (lineTxt[0]=='\0' || lastNumPos>5*NUMBER_SIZE) {
- Int_t mf = iMF; // Remember current MF, MT
- Int_t mt = iMT;
- if (!ReadLine() || (mf*1000+mt != iMF*1000+iMT))
- return TRUE;
- lastNumPos = 0;
- }
- } else {
- lastNumPos = pos * NUMBER_SIZE;
- }
- return FALSE;
+ if (pos<0 || pos>5*NUMBER_SIZE) {
+ lastNumPos += NUMBER_SIZE;
+ if (lineTxt[0]=='\0' || lastNumPos>5*NUMBER_SIZE) {
+ Int_t mf = iMF; // Remember current MF, MT
+ Int_t mt = iMT;
+ if (!ReadLine() || (mf*1000+mt != iMF*1000+iMT))
+ return TRUE;
+ lastNumPos = 0;
+ }
+ } else {
+ lastNumPos = pos * NUMBER_SIZE;
+ }
+ return FALSE;
} // NextNumber
/* -------- SubReadInt ---------- */
Int_t
NdbEndfIO::SubReadInt(Int_t start, Int_t length)
{
- NdbEndfIO::Substr(start,length);
- return atoi(_str);
+ NdbEndfIO::Substr(start,length);
+ return atoi(_str);
} // SubReadInt
/* ---------- ReadInt ------------- */
@@ -137,72 +137,72 @@ NdbEndfIO::SubReadInt(Int_t start, Int_t length)
Int_t
NdbEndfIO::ReadInt(Bool_t *error, Int_t pos)
{
- if (NextNumber(pos)) {
- *error = TRUE;
- return 0;
- }
- *error = FALSE;
- return SubReadInt(lastNumPos,NUMBER_SIZE);
+ if (NextNumber(pos)) {
+ *error = TRUE;
+ return 0;
+ }
+ *error = FALSE;
+ return SubReadInt(lastNumPos,NUMBER_SIZE);
} // ReadInt
/* -------- SubReadReal ---------- */
Float_t
NdbEndfIO::SubReadReal(Int_t start, Int_t length)
{
- char numstr[20];
- char *dst, *src;
-
- NdbEndfIO::Substr(start,length);
-
- // Real numbers are in the following formats
- // +/- N.NNNNNN+/-N
- // +/- N.NNNNN+/-bN (b=Blank)
- // +/- N.NNNNN+/-NN
-
- dst = numstr;
- src = _str;
-
- /* skip blanks */
- while (*src==' ') src++;
-
- /* copy sign */
- if (*src=='+' || *src=='-') *dst++ = *src++;
-
- /* copy realpart */
- while (1) {
- if (memchr(".0123456789",*src,11))
- *dst++ = *src++;
- else
- break;
- }
-
- /* append the exponent */
- *dst++ = 'E';
-
- /* copy sign */
- if (*src=='+' || *src=='-') *dst++ = *src++;
-
- /* skip blanks */
- while (*src==' ') src++;
-
- /* copy exponent */
- while (1) {
- if (memchr("0123456789",*src,10))
- *dst++ = *src++;
- else
- break;
- }
-
- /* close the destination */
- *dst = 0;
-
- /* if something is still in source then we have an error number */
- if (*src) {
-// error(ERR_INVALID_REAL_NUMBER);
- return 0.0;
- }
-
- return atof(numstr);
+ char numstr[20];
+ char *dst, *src;
+
+ NdbEndfIO::Substr(start,length);
+
+ // Real numbers are in the following formats
+ // +/- N.NNNNNN+/-N
+ // +/- N.NNNNN+/-bN (b=Blank)
+ // +/- N.NNNNN+/-NN
+
+ dst = numstr;
+ src = _str;
+
+ /* skip blanks */
+ while (*src==' ') src++;
+
+ /* copy sign */
+ if (*src=='+' || *src=='-') *dst++ = *src++;
+
+ /* copy realpart */
+ while (1) {
+ if (memchr(".0123456789",*src,11))
+ *dst++ = *src++;
+ else
+ break;
+ }
+
+ /* append the exponent */
+ *dst++ = 'E';
+
+ /* copy sign */
+ if (*src=='+' || *src=='-') *dst++ = *src++;
+
+ /* skip blanks */
+ while (*src==' ') src++;
+
+ /* copy exponent */
+ while (1) {
+ if (memchr("0123456789",*src,10))
+ *dst++ = *src++;
+ else
+ break;
+ }
+
+ /* close the destination */
+ *dst = 0;
+
+ /* if something is still in source then we have an error number */
+ if (*src) {
+// error(ERR_INVALID_REAL_NUMBER);
+ return 0.0;
+ }
+
+ return atof(numstr);
} // SubReadReal
/* ---------- ReadReal ------------- */
@@ -213,61 +213,61 @@ NdbEndfIO::SubReadReal(Int_t start, Int_t length)
Float_t
NdbEndfIO::ReadReal(Bool_t *error, Int_t pos)
{
- if (NextNumber(pos)) {
- *error = TRUE;
- return 0.0;
- }
- *error = FALSE;
- return SubReadReal(lastNumPos,NUMBER_SIZE);
+ if (NextNumber(pos)) {
+ *error = TRUE;
+ return 0.0;
+ }
+ *error = FALSE;
+ return SubReadReal(lastNumPos,NUMBER_SIZE);
} // ReadReal
/* -------- ReadLine -------- */
Bool_t
NdbEndfIO::ReadLine()
{
- Long_t current_pos;
+ Long_t current_pos;
- // --- Force the next number reading to be from the beggining of line
- lastNumPos = -NUMBER_SIZE;
+ // --- Force the next number reading to be from the beggining of line
+ lastNumPos = -NUMBER_SIZE;
- // --- Have we reached the end of file
- if (feof(f)) {
- lineTxt[0] = 0;
- return FALSE;
- }
+ // --- Have we reached the end of file
+ if (feof(f)) {
+ lineTxt[0] = 0;
+ return FALSE;
+ }
- // --- Remember the position of start of line ---
- current_pos = ftell(f);
+ // --- Remember the position of start of line ---
+ current_pos = ftell(f);
- // --- Read one line ---
- fgets(lineTxt,sizeof(lineTxt),f);
+ // --- Read one line ---
+ fgets(lineTxt,sizeof(lineTxt),f);
- lineLen = strlen(lineTxt);
+ lineLen = strlen(lineTxt);
- // Chop the trailing newline char
- if (lineTxt[lineLen-1] == '\n')
- lineTxt[--lineLen] = 0;
+ // Chop the trailing newline char
+ if (lineTxt[lineLen-1] == '\n')
+ lineTxt[--lineLen] = 0;
- // --- Remember previous values ---
- Int_t oldMAT = iMAT;
- Int_t oldMF = iMF;
- Int_t oldMT = iMT;
+ // --- Remember previous values ---
+ Int_t oldMAT = iMAT;
+ Int_t oldMF = iMF;
+ Int_t oldMT = iMT;
- // --- Read the material, mf, mt and line number ---
- iMAT = SubReadInt(66, 4);
- iMF = SubReadInt(70, 2);
- iMT = SubReadInt(72, 3);
- lineNum = SubReadInt(75, 5);
+ // --- Read the material, mf, mt and line number ---
+ iMAT = SubReadInt(66, 4);
+ iMF = SubReadInt(70, 2);
+ iMT = SubReadInt(72, 3);
+ lineNum = SubReadInt(75, 5);
- // --- Update pointers if necessary ---
- if (iMAT && iMAT != oldMAT)
- matStart = current_pos;
+ // --- Update pointers if necessary ---
+ if (iMAT && iMAT != oldMAT)
+ matStart = current_pos;
- if (iMF && iMF != oldMF)
- mfStart = current_pos;
+ if (iMF && iMF != oldMF)
+ mfStart = current_pos;
- if (iMT && iMT != oldMT)
- mtStart = current_pos;
+ if (iMT && iMT != oldMT)
+ mtStart = current_pos;
- return TRUE;
+ return TRUE;
} // ReadLine
diff --git a/test/periodic/NdbEndfIO.h b/test/periodic/NdbEndfIO.h
index 63203903e46..d0a1799dca3 100644
--- a/test/periodic/NdbEndfIO.h
+++ b/test/periodic/NdbEndfIO.h
@@ -10,19 +10,19 @@
// I/O Options
enum {
- TENDF_READ=1,
- TENDF_WRITE=2
+ TENDF_READ=1,
+ TENDF_WRITE=2
};
-#define TENDF_NEXT_NUMBER -1
-#define TENDF_MAXREC 100
+#define TENDF_NEXT_NUMBER -1
+#define TENDF_MAXREC 100
// End records
enum {
- SEND=1,
- FEND=2,
- MEND=3,
- TEND=4
+ SEND=1,
+ FEND=2,
+ MEND=3,
+ TEND=4
};
class NdbEndfIO : public TObject
@@ -32,107 +32,107 @@ class NdbEndfIO : public TObject
// to an ENDF-B/VI file
//
protected:
- FILE *f; //! Working file
- Int_t mode; // Open mode
- Int_t iMAT; // Material number
- Int_t iMF; // Current file type
- Int_t iMT; // Current section
- Int_t lineNum; // Keep track of current line
-
- Long_t matStart; // Pointer of the current
- // material starting pos
- Long_t mfStart; // Current MF starting pos
- Long_t mtStart; // Current MT starting pos
-
- Int_t lineLen; // Length of line
- char lineTxt[TENDF_MAXREC]; // Complete line
- Int_t lastNumPos; // for readReal and readInt;
- static char _str[TENDF_MAXREC]; // Used for substrings
+ FILE *f; //! Working file
+ Int_t mode; // Open mode
+ Int_t iMAT; // Material number
+ Int_t iMF; // Current file type
+ Int_t iMT; // Current section
+ Int_t lineNum; // Keep track of current line
+
+ Long_t matStart; // Pointer of the current
+ // material starting pos
+ Long_t mfStart; // Current MF starting pos
+ Long_t mtStart; // Current MT starting pos
+
+ Int_t lineLen; // Length of line
+ char lineTxt[TENDF_MAXREC]; // Complete line
+ Int_t lastNumPos; // for readReal and readInt;
+ static char _str[TENDF_MAXREC]; // Used for substrings
public:
- NdbEndfIO() { f=NULL; }
- virtual ~NdbEndfIO()
- { if (f) fclose(f); }
+ NdbEndfIO() { f=NULL; }
+ virtual ~NdbEndfIO()
+ { if (f) fclose(f); }
- NdbEndfIO( char *filename, Int_t mode);
+ NdbEndfIO( char *filename, Int_t mode);
- NdbEndfIO( NdbEndfIO *endf ) {
- f = endf->f;
- mode = endf->mode;
- iMAT = endf->iMAT;
- iMF = endf->iMF;
- iMF = endf->iMT;
- matStart= endf->matStart;
- mfStart = endf->mfStart;
- mtStart = endf->mtStart;
- lineNum = endf->lineNum;
- lineLen = endf->lineLen;
- strcpy(lineTxt, endf->lineTxt);
- }
+ NdbEndfIO( NdbEndfIO *endf ) {
+ f = endf->f;
+ mode = endf->mode;
+ iMAT = endf->iMAT;
+ iMF = endf->iMF;
+ iMF = endf->iMT;
+ matStart= endf->matStart;
+ mfStart = endf->mfStart;
+ mtStart = endf->mtStart;
+ lineNum = endf->lineNum;
+ lineLen = endf->lineLen;
+ strcpy(lineTxt, endf->lineTxt);
+ }
- // Access functions
- inline Int_t LineNumber() const { return lineNum; }
- inline char *Line() { return lineTxt; }
- inline Int_t MAT() const { return iMAT; }
- inline Int_t MF() const { return iMF; }
- inline Int_t MT() const { return iMT; }
+ // Access functions
+ inline Int_t LineNumber() const { return lineNum; }
+ inline char *Line() { return lineTxt; }
+ inline Int_t MAT() const { return iMAT; }
+ inline Int_t MF() const { return iMF; }
+ inline Int_t MT() const { return iMT; }
- // Is the file open?
- inline Bool_t IsOpen() { return (f!=NULL); }
+ // Is the file open?
+ inline Bool_t IsOpen() { return (f!=NULL); }
- // Have we reached End of file?
- inline Bool_t Eof() { return feof(f); }
+ // Have we reached End of file?
+ inline Bool_t Eof() { return feof(f); }
- // End of Section
- inline Bool_t EOMT() { return (iMT==0); }
+ // End of Section
+ inline Bool_t EOMT() { return (iMT==0); }
- // End of MF
- inline Bool_t EOMF() { return (iMF==0); }
+ // End of MF
+ inline Bool_t EOMF() { return (iMF==0); }
- // End of MATerial
- inline Bool_t EOMAT() { return (iMAT==0); }
+ // End of MATerial
+ inline Bool_t EOMAT() { return (iMAT==0); }
- // Find Material
- Bool_t FindMAT( Int_t mat, Bool_t rewind=FALSE );
+ // Find Material
+ Bool_t FindMAT( Int_t mat, Bool_t rewind=FALSE );
- // Find File inside material
- Bool_t FindMATMF( Int_t mat, Int_t mf, Bool_t rewind=FALSE );
+ // Find File inside material
+ Bool_t FindMATMF( Int_t mat, Int_t mf, Bool_t rewind=FALSE );
- // Find Section
- Bool_t FindMATMFMT( Int_t mat, Int_t mf, Int_t mt,
- Bool_t rewind=FALSE );
+ // Find Section
+ Bool_t FindMATMFMT( Int_t mat, Int_t mf, Int_t mt,
+ Bool_t rewind=FALSE );
- // Find the specific MF:MT file:section, for current MAT
- Bool_t FindMFMT(Int_t mf, Int_t mt);
+ // Find the specific MF:MT file:section, for current MAT
+ Bool_t FindMFMT(Int_t mf, Int_t mt);
- // Rewind to beggining of current material
- Bool_t RewindMAT() { return fseek(f, matStart, SEEK_SET); }
+ // Rewind to beggining of current material
+ Bool_t RewindMAT() { return fseek(f, matStart, SEEK_SET); }
- // Rewind to beggining of current file (MF)
- Bool_t RewindMF() { return fseek(f, mfStart, SEEK_SET); }
+ // Rewind to beggining of current file (MF)
+ Bool_t RewindMF() { return fseek(f, mfStart, SEEK_SET); }
- // Rewind to beggining of current section (MT)
- Bool_t RewindMT() { return fseek(f, mtStart, SEEK_SET); }
-
- // Read entire line
- Bool_t ReadLine();
+ // Rewind to beggining of current section (MT)
+ Bool_t RewindMT() { return fseek(f, mtStart, SEEK_SET); }
+
+ // Read entire line
+ Bool_t ReadLine();
- // Reads one by one the real numbers from the current line
- Int_t ReadInt(Bool_t *error, Int_t pos=TENDF_NEXT_NUMBER);
+ // Reads one by one the real numbers from the current line
+ Int_t ReadInt(Bool_t *error, Int_t pos=TENDF_NEXT_NUMBER);
- Float_t ReadReal(Bool_t *error, Int_t pos=TENDF_NEXT_NUMBER);
+ Float_t ReadReal(Bool_t *error, Int_t pos=TENDF_NEXT_NUMBER);
- // Return a substring of current line in a static variable
- char* Substr(Int_t start, Int_t length);
+ // Return a substring of current line in a static variable
+ char* Substr(Int_t start, Int_t length);
protected:
- Bool_t NextNumber(Int_t pos=TENDF_NEXT_NUMBER);
- Int_t SubReadInt(Int_t start, Int_t length);
- Float_t SubReadReal(Int_t start, Int_t length);
+ Bool_t NextNumber(Int_t pos=TENDF_NEXT_NUMBER);
+ Int_t SubReadInt(Int_t start, Int_t length);
+ Float_t SubReadReal(Int_t start, Int_t length);
- ClassDef(NdbEndfIO,1)
+ ClassDef(NdbEndfIO,1)
}; // NdbEndfIO
diff --git a/test/periodic/NdbEnergyAngleDist.h b/test/periodic/NdbEnergyAngleDist.h
index e0505a1c1d3..a41dda801b5 100644
--- a/test/periodic/NdbEnergyAngleDist.h
+++ b/test/periodic/NdbEnergyAngleDist.h
@@ -9,12 +9,12 @@ class NdbEnergyAngleDist : public NdbMF
protected:
public:
- NdbEnergyAngleDist()
- : NdbMF(6, "Energy-angle distributions for emitted particles") {}
+ NdbEnergyAngleDist()
+ : NdbMF(6, "Energy-angle distributions for emitted particles") {}
- ~NdbEnergyAngleDist() {}
+ ~NdbEnergyAngleDist() {}
- ClassDef(NdbEnergyAngleDist,1)
+ ClassDef(NdbEnergyAngleDist,1)
}; // NdbEnergyAngleDist
diff --git a/test/periodic/NdbEnergyDist.h b/test/periodic/NdbEnergyDist.h
index f9b3f93fea6..7b5cb91a3fc 100644
--- a/test/periodic/NdbEnergyDist.h
+++ b/test/periodic/NdbEnergyDist.h
@@ -9,12 +9,12 @@ class NdbEnergyDist : public NdbMF
protected:
public:
- NdbEnergyDist()
- : NdbMF(5, "Energy distributions for emitted particles") {}
+ NdbEnergyDist()
+ : NdbMF(5, "Energy distributions for emitted particles") {}
- ~NdbEnergyDist() {}
+ ~NdbEnergyDist() {}
- ClassDef(NdbEnergyDist,1)
+ ClassDef(NdbEnergyDist,1)
}; // NdbEnergyDist
diff --git a/test/periodic/NdbFissionYield.h b/test/periodic/NdbFissionYield.h
index dc4c67d461e..e42fa37306d 100644
--- a/test/periodic/NdbFissionYield.h
+++ b/test/periodic/NdbFissionYield.h
@@ -9,11 +9,11 @@ class NdbFissionYield : public NdbMF
protected:
public:
- NdbFissionYield()
- : NdbMF(8, "Radioactivity and fission-product yield data") {}
- ~NdbFissionYield() {}
+ NdbFissionYield()
+ : NdbMF(8, "Radioactivity and fission-product yield data") {}
+ ~NdbFissionYield() {}
- ClassDef(NdbFissionYield,1)
+ ClassDef(NdbFissionYield,1)
}; // NdbFissionYield
diff --git a/test/periodic/NdbFormFactors.h b/test/periodic/NdbFormFactors.h
index 44ad3f10718..23469c84471 100644
--- a/test/periodic/NdbFormFactors.h
+++ b/test/periodic/NdbFormFactors.h
@@ -9,12 +9,12 @@ class NdbFormFactors : public NdbMF
protected:
public:
- NdbFormFactors()
- : NdbMF(27, "Atomic form factors or scattering functions "
- "for photo-atomic interactions") {}
- ~NdbFormFactors() {}
+ NdbFormFactors()
+ : NdbMF(27, "Atomic form factors or scattering functions "
+ "for photo-atomic interactions") {}
+ ~NdbFormFactors() {}
- ClassDef(NdbFormFactors,1)
+ ClassDef(NdbFormFactors,1)
}; // NdbFormFactors
diff --git a/test/periodic/NdbGeneralInfo.h b/test/periodic/NdbGeneralInfo.h
index 5769dacb390..0d11a485618 100644
--- a/test/periodic/NdbGeneralInfo.h
+++ b/test/periodic/NdbGeneralInfo.h
@@ -9,12 +9,12 @@ class NdbGeneralInfo : public NdbMF
protected:
public:
- NdbGeneralInfo()
- : NdbMF(1, "General Information") {}
+ NdbGeneralInfo()
+ : NdbMF(1, "General Information") {}
- ~NdbGeneralInfo() {}
+ ~NdbGeneralInfo() {}
- ClassDef(NdbGeneralInfo,1)
+ ClassDef(NdbGeneralInfo,1)
}; // NdbGeneralInfo
diff --git a/test/periodic/NdbMF.cxx b/test/periodic/NdbMF.cxx
index 598ceb51c13..0238b26bba8 100644
--- a/test/periodic/NdbMF.cxx
+++ b/test/periodic/NdbMF.cxx
@@ -8,43 +8,43 @@ ClassImp(NdbMF)
NdbMT *
NdbMF::Section(Int_t id)
{
- TObjArrayIter iter(&aSection);
- while (iter()) {
- NdbMT *mt = (NdbMT*)(iter.Next());
- if (mt->MT() == id)
- return mt;
- }
- return NULL;
+ TObjArrayIter iter(&aSection);
+ while (iter()) {
+ NdbMT *mt = (NdbMT*)(iter.Next());
+ if (mt->MT() == id)
+ return mt;
+ }
+ return NULL;
} // Section
/* -------- Section -------- */
NdbMT *
NdbMF::Section(const char *name )
{
- TObjArrayIter iter(&aSection);
- while (iter()) {
- NdbMT *mt = (NdbMT*)(iter.Next());
- if (mt->Description().CompareTo(name))
- return mt;
- }
- return NULL;
+ TObjArrayIter iter(&aSection);
+ while (iter()) {
+ NdbMT *mt = (NdbMT*)(iter.Next());
+ if (mt->Description().CompareTo(name))
+ return mt;
+ }
+ return NULL;
} // Section
/* ---------- Add ---------- */
void
NdbMF::Add(NdbMT& )
{
- std::cout << "NdbMF::add(sec)" << std::endl;
+ std::cout << "NdbMF::add(sec)" << std::endl;
} // Add
/* ---------- EnumerateENDFType ---------- */
/* Enumerates all the available sections inside the ENDF file
- * @param sec Find the next section after <B>sec</B>
- * @return Next available section in ENDF file, -1 if EOF
+ * @param sec Find the next section after <B>sec</B>
+ * @return Next available section in ENDF file, -1 if EOF
*/
Int_t
NdbMF::EnumerateENDFType( Int_t )
{
- std::cout << "NdbMF ::enumerateENDFSection" << std::endl;
- return 0;
+ std::cout << "NdbMF ::enumerateENDFSection" << std::endl;
+ return 0;
} // EnumerateENDFType
diff --git a/test/periodic/NdbMF.h b/test/periodic/NdbMF.h
index 2ebee4c96b0..855145a2a2b 100644
--- a/test/periodic/NdbMF.h
+++ b/test/periodic/NdbMF.h
@@ -14,43 +14,43 @@
class NdbMF: public TObject
{
protected:
- Int_t iMF; // MF number
- TString sDescription; // Description of the File TYPE (MF)
- TObjArray aSection; // Array of sections (MT)
+ Int_t iMF; // MF number
+ TString sDescription; // Description of the File TYPE (MF)
+ TObjArray aSection; // Array of sections (MT)
public:
- NdbMF( Int_t aMF, const char *aDesc)
- : TObject(), sDescription(aDesc), aSection() {
- iMF = aMF;
- }
+ NdbMF( Int_t aMF, const char *aDesc)
+ : TObject(), sDescription(aDesc), aSection() {
+ iMF = aMF;
+ }
- ~NdbMF() {}
+ ~NdbMF() {}
- // Virtual functions
- virtual Int_t Compare(const TObject *o) const
- { return ((iMF==((NdbMF*)o)->iMF)? 0 :
- (iMF > ((NdbMF*)o)->iMF)? 1 : -1 ); }
+ // Virtual functions
+ virtual Int_t Compare(const TObject *o) const
+ { return ((iMF==((NdbMF*)o)->iMF)? 0 :
+ (iMF > ((NdbMF*)o)->iMF)? 1 : -1 ); }
- // Access functions
- inline Int_t MF() const { return iMF; }
- inline TString Description() const { return sDescription; }
+ // Access functions
+ inline Int_t MF() const { return iMF; }
+ inline TString Description() const { return sDescription; }
- // Find Section, by type
- NdbMT* Section(Int_t id);
+ // Find Section, by type
+ NdbMT* Section(Int_t id);
- // Find Section by name
- NdbMT* Section(const char *name);
+ // Find Section by name
+ NdbMT* Section(const char *name);
- // Add a new section in the section list
- void Add(NdbMT& sec);
+ // Add a new section in the section list
+ void Add(NdbMT& sec);
- // Enumerate sections in ENDF file
- Int_t EnumerateENDFType( Int_t sec );
+ // Enumerate sections in ENDF file
+ Int_t EnumerateENDFType( Int_t sec );
- // Move File pointer to beggining of MF section in ENDF file
- void LocateType() {}
+ // Move File pointer to beggining of MF section in ENDF file
+ void LocateType() {}
- ClassDef(NdbMF,1)
+ ClassDef(NdbMF,1)
}; // NdbMF
diff --git a/test/periodic/NdbMT.h b/test/periodic/NdbMT.h
index 85fca543ca6..b4c1627353f 100644
--- a/test/periodic/NdbMT.h
+++ b/test/periodic/NdbMT.h
@@ -18,41 +18,41 @@
class NdbMT: public TObject
{
protected:
- Int_t iMT; // MT number
- TString sDescription;
+ Int_t iMT; // MT number
+ TString sDescription;
public:
- NdbMT( Int_t aMT, const char *desc)
- : sDescription(desc) { iMT = aMT; }
+ NdbMT( Int_t aMT, const char *desc)
+ : sDescription(desc) { iMT = aMT; }
- ~NdbMT() {}
+ ~NdbMT() {}
- // Virtual functions
- virtual Int_t Compare(const TObject *o) const
- { return ((iMT == ((NdbMT*)o)->iMT)? 0 :
- (iMT > ((NdbMT*)o)->iMT)? 1 : -1 ); }
+ // Virtual functions
+ virtual Int_t Compare(const TObject *o) const
+ { return ((iMT == ((NdbMT*)o)->iMT)? 0 :
+ (iMT > ((NdbMT*)o)->iMT)? 1 : -1 ); }
- // Access functions
- inline Int_t MT() const { return iMT; }
- inline TString Description() const { return sDescription; }
+ // Access functions
+ inline Int_t MT() const { return iMT; }
+ inline TString Description() const { return sDescription; }
- // Assign a working file
+ // Assign a working file
- // Enumerate sections in ENDF file
- Int_t EnumerateENDFSection( Int_t /* sec */) {return 0;}
+ // Enumerate sections in ENDF file
+ Int_t EnumerateENDFSection( Int_t /* sec */) {return 0;}
- // Move File pointer to beggining of MT section in ENDF file
- void LocateENDFSection() {}
+ // Move File pointer to beggining of MT section in ENDF file
+ void LocateENDFSection() {}
- // END of ENDF Section reached?
- Bool_t ENDF_EOS() {return 0;}
+ // END of ENDF Section reached?
+ Bool_t ENDF_EOS() {return 0;}
- // Abstract functions (or Virtual?)
- virtual void ReadENDFSectionHeader() {}
- virtual void ReadENDFSection() {}
-
- ClassDef(NdbMT,1)
+ // Abstract functions (or Virtual?)
+ virtual void ReadENDFSectionHeader() {}
+ virtual void ReadENDFSection() {}
+ ClassDef(NdbMT,1)
+
}; // NdbMT
#endif
diff --git a/test/periodic/NdbMTDir.cxx b/test/periodic/NdbMTDir.cxx
index 505122839c1..48f0dca3246 100644
--- a/test/periodic/NdbMTDir.cxx
+++ b/test/periodic/NdbMTDir.cxx
@@ -10,99 +10,99 @@ ClassImp(NdbMTDir);
/* ========= NdbMTDir ======== */
NdbMTDir::~NdbMTDir( )
{
- if (ZSYMAM) free(ZSYMAM);
- if (ALAB) free(ALAB);
- if (EDATE) free(EDATE);
- if (AUTH) free(AUTH);
- if (REF) free(REF);
- if (DDATE) free(DDATE);
- if (RDATE) free(RDATE);
- if (ENDATE) free(ENDATE);
+ if (ZSYMAM) free(ZSYMAM);
+ if (ALAB) free(ALAB);
+ if (EDATE) free(EDATE);
+ if (AUTH) free(AUTH);
+ if (REF) free(REF);
+ if (DDATE) free(DDATE);
+ if (RDATE) free(RDATE);
+ if (ENDATE) free(ENDATE);
} // ~NdbMTDir
/* -------- LoadENDF -------- */
Bool_t
NdbMTDir::LoadENDF( char *filename )
{
- Bool_t error;
+ Bool_t error;
- NdbEndfIO endf(filename,TENDF_READ);
+ NdbEndfIO endf(filename,TENDF_READ);
- if (!endf.IsOpen()) return kTRUE;
-
- endf.FindMFMT(1,MT());
+ if (!endf.IsOpen()) return kTRUE;
- ZA = endf.ReadReal(&error);
- AWR = endf.ReadReal(&error);
- LRP = endf.ReadInt(&error);
- LFI = endf.ReadInt(&error);
- NLIB = endf.ReadInt(&error);
- NMOD = endf.ReadInt(&error);
+ endf.FindMFMT(1,MT());
- ELIS = endf.ReadReal(&error);
- STA = endf.ReadInt(&error);
- LIS = endf.ReadInt(&error);
- LISO = endf.ReadInt(&error);
- endf.ReadInt(&error); // Skip one number
- NFOR = endf.ReadInt(&error);
+ ZA = endf.ReadReal(&error);
+ AWR = endf.ReadReal(&error);
+ LRP = endf.ReadInt(&error);
+ LFI = endf.ReadInt(&error);
+ NLIB = endf.ReadInt(&error);
+ NMOD = endf.ReadInt(&error);
- AWI = endf.ReadReal(&error);
- endf.ReadReal(&error); // Skip three number
- endf.ReadInt(&error);
- endf.ReadInt(&error);
- NSUB = endf.ReadInt(&error);
- NVER = endf.ReadInt(&error);
+ ELIS = endf.ReadReal(&error);
+ STA = endf.ReadInt(&error);
+ LIS = endf.ReadInt(&error);
+ LISO = endf.ReadInt(&error);
+ endf.ReadInt(&error); // Skip one number
+ NFOR = endf.ReadInt(&error);
- TEMP = endf.ReadReal(&error);
- endf.ReadReal(&error);
- LDRV = endf.ReadInt(&error);
- endf.ReadInt(&error); // Skip one number
- NWD = endf.ReadInt(&error);
- NXC = endf.ReadInt(&error);
+ AWI = endf.ReadReal(&error);
+ endf.ReadReal(&error); // Skip three number
+ endf.ReadInt(&error);
+ endf.ReadInt(&error);
+ NSUB = endf.ReadInt(&error);
+ NVER = endf.ReadInt(&error);
-//
-// Author, Dates, etc, skip 'em for the moment
-//
- endf.ReadLine();
- ZSYMAM = strdup(endf.Substr(0,11));
- ALAB = strdup(endf.Substr(11,10));
- EDATE = strdup(endf.Substr(22,10));
- AUTH = strdup(endf.Substr(33,33));
- endf.ReadLine();
- REF = strdup(endf.Substr(1,20));
- DDATE = strdup(endf.Substr(22,10));
- RDATE = strdup(endf.Substr(33,10));
- ENDATE = strdup(endf.Substr(55,6));
+ TEMP = endf.ReadReal(&error);
+ endf.ReadReal(&error);
+ LDRV = endf.ReadInt(&error);
+ endf.ReadInt(&error); // Skip one number
+ NWD = endf.ReadInt(&error);
+ NXC = endf.ReadInt(&error);
-// Skip comments
- for (int i=0; i<NWD-2; i++) {
- endf.ReadLine();
- INFO.Append(endf.Substr(0,66));
- INFO.Append("\n");
- }
-//printf("ZSYMAM=\"%s\"\n",ZSYMAM);
-//printf("ALAB=\"%s\"\n",ALAB);
-//printf("EDATE=\"%s\"\n",EDATE);
-//printf("AUTH=\"%s\"\n",AUTH);
-//printf("REF=\"%s\"\n",REF);
-//printf("DDATE=\"%s\"\n",DDATE);
-//printf("RDATE=\"%s\"\n",RDATE);
-//printf("ENDATE=\"%s\"\n",ENDATE);
-//printf("INFO=\"%s\"\n",INFO.Data());
+ //
+ // Author, Dates, etc, skip 'em for the moment
+ //
+ endf.ReadLine();
+ ZSYMAM = strdup(endf.Substr(0,11));
+ ALAB = strdup(endf.Substr(11,10));
+ EDATE = strdup(endf.Substr(22,10));
+ AUTH = strdup(endf.Substr(33,33));
+ endf.ReadLine();
+ REF = strdup(endf.Substr(1,20));
+ DDATE = strdup(endf.Substr(22,10));
+ RDATE = strdup(endf.Substr(33,10));
+ ENDATE = strdup(endf.Substr(55,6));
- dir_mf.Set(NXC);
- dir_mt.Set(NXC);
- dir_mc.Set(NXC);
- dir_mod.Set(NXC);
+ // Skip comments
+ for (int i=0; i<NWD-2; i++) {
+ endf.ReadLine();
+ INFO.Append(endf.Substr(0,66));
+ INFO.Append("\n");
+ }
+ //printf("ZSYMAM=\"%s\"\n",ZSYMAM);
+ //printf("ALAB=\"%s\"\n",ALAB);
+ //printf("EDATE=\"%s\"\n",EDATE);
+ //printf("AUTH=\"%s\"\n",AUTH);
+ //printf("REF=\"%s\"\n",REF);
+ //printf("DDATE=\"%s\"\n",DDATE);
+ //printf("RDATE=\"%s\"\n",RDATE);
+ //printf("ENDATE=\"%s\"\n",ENDATE);
+ //printf("INFO=\"%s\"\n",INFO.Data());
- endf.ReadLine();
- for (int i=0; i<NXC; i++) {
- dir_mf.AddAt(endf.ReadInt(&error,2), i);
- dir_mt.AddAt(endf.ReadInt(&error), i);
- dir_mc.AddAt(endf.ReadInt(&error), i);
- dir_mod.AddAt(endf.ReadInt(&error), i);
- endf.ReadLine();
-//printf("MF=%d MT=%d MC=%d\n",dir_mf[i], dir_mt[i], dir_mc[i]);
- }
- return kFALSE;
+ dir_mf.Set(NXC);
+ dir_mt.Set(NXC);
+ dir_mc.Set(NXC);
+ dir_mod.Set(NXC);
+
+ endf.ReadLine();
+ for (int i=0; i<NXC; i++) {
+ dir_mf.AddAt(endf.ReadInt(&error,2), i);
+ dir_mt.AddAt(endf.ReadInt(&error), i);
+ dir_mc.AddAt(endf.ReadInt(&error), i);
+ dir_mod.AddAt(endf.ReadInt(&error), i);
+ endf.ReadLine();
+ //printf("MF=%d MT=%d MC=%d\n",dir_mf[i], dir_mt[i], dir_mc[i]);
+ }
+ return kFALSE;
} // LoadENDF
diff --git a/test/periodic/NdbMTDir.h b/test/periodic/NdbMTDir.h
index be620da26fd..f001048182f 100644
--- a/test/periodic/NdbMTDir.h
+++ b/test/periodic/NdbMTDir.h
@@ -11,77 +11,77 @@
class NdbMTDir : public NdbMT
{
protected:
- Float_t ZA;
- Float_t AWR;
- Int_t LRP; // Flag for resonances in MF=2
- Int_t LFI; // Whether this material fissions
- Int_t NLIB; // Library
- Int_t NVER; // Version
- Int_t NFOR; // Format
- Float_t ELIS; // Excitation energy
- Int_t STA; // Stability flag
- Int_t LIS; // Ground state
- Int_t LISO; // Isomeric state number
- Int_t NMOD; // Modification number
- Float_t AWI; // Mass in neutron units
- Int_t NSUB; // Sublibrary number
- Float_t TEMP; // Target temperature
- Int_t LDRV; // Special Derived material flag
- Int_t NWD; // Number of records
- Int_t NXC; // Number of records in the dir.
- char *ZSYMAM; //! Symbol
- char *ALAB; //! Laboratory mnemonic
- char *EDATE; //! Evaluation date
- char *AUTH; //! Authors name
- char *REF; //! Primary reference
- char *DDATE; //! Distribution date
- char *RDATE; //! Date&Number of last revision
- char *ENDATE; //! Master entry date yymmdd
- TString INFO;
+ Float_t ZA;
+ Float_t AWR;
+ Int_t LRP; // Flag for resonances in MF=2
+ Int_t LFI; // Whether this material fissions
+ Int_t NLIB; // Library
+ Int_t NVER; // Version
+ Int_t NFOR; // Format
+ Float_t ELIS; // Excitation energy
+ Int_t STA; // Stability flag
+ Int_t LIS; // Ground state
+ Int_t LISO; // Isomeric state number
+ Int_t NMOD; // Modification number
+ Float_t AWI; // Mass in neutron units
+ Int_t NSUB; // Sublibrary number
+ Float_t TEMP; // Target temperature
+ Int_t LDRV; // Special Derived material flag
+ Int_t NWD; // Number of records
+ Int_t NXC; // Number of records in the dir.
+ char *ZSYMAM; //! Symbol
+ char *ALAB; //! Laboratory mnemonic
+ char *EDATE; //! Evaluation date
+ char *AUTH; //! Authors name
+ char *REF; //! Primary reference
+ char *DDATE; //! Distribution date
+ char *RDATE; //! Date&Number of last revision
+ char *ENDATE; //! Master entry date yymmdd
+ TString INFO;
- TArrayI dir_mf; // Directory entries
- TArrayI dir_mt;
- TArrayI dir_mc;
- TArrayI dir_mod;
+ TArrayI dir_mf; // Directory entries
+ TArrayI dir_mt;
+ TArrayI dir_mc;
+ TArrayI dir_mod;
public:
- NdbMTDir()
- : NdbMT(451,"Descriptive Data and Directory")
- {
- NXC = 0;
- ZSYMAM = NULL;
- ALAB = NULL;
- EDATE = NULL;
- AUTH = NULL;
- REF = NULL;
- DDATE = NULL;
- RDATE = NULL;
- ENDATE = NULL;
- }
+ NdbMTDir()
+ : NdbMT(451,"Descriptive Data and Directory")
+ {
+ NXC = 0;
+ ZSYMAM = NULL;
+ ALAB = NULL;
+ EDATE = NULL;
+ AUTH = NULL;
+ REF = NULL;
+ DDATE = NULL;
+ RDATE = NULL;
+ ENDATE = NULL;
+ }
- ~NdbMTDir();
+ ~NdbMTDir();
- // --- Input/Output routines ---
- Bool_t LoadENDF(char *filename);
+ // --- Input/Output routines ---
+ Bool_t LoadENDF(char *filename);
- inline Int_t Sections() const { return NXC; }
- inline Int_t DIRMF(Int_t i) { return dir_mf[i]; }
- inline Int_t DIRMT(Int_t i) { return dir_mt[i]; }
- inline Int_t DIRMC(Int_t i) { return dir_mc[i]; }
- inline Int_t DIRMOD(Int_t i) { return dir_mod[i]; }
+ inline Int_t Sections() const { return NXC; }
+ inline Int_t DIRMF(Int_t i) { return dir_mf[i]; }
+ inline Int_t DIRMT(Int_t i) { return dir_mt[i]; }
+ inline Int_t DIRMC(Int_t i) { return dir_mc[i]; }
+ inline Int_t DIRMOD(Int_t i) { return dir_mod[i]; }
- inline char* SymbolName() { return ZSYMAM; }
- inline char* Laboratory() { return ALAB; }
- inline char* EvaluationDate() { return EDATE;}
- inline char* Author() { return AUTH; }
- inline char* Reference() { return REF; }
- inline char* DistributionDate() { return DDATE; }
- inline char* LastRevisionDate() { return RDATE; }
- inline char* MasterEntryDate() { return ENDATE; }
- inline TString GetInfo() { return INFO; }
+ inline char* SymbolName() { return ZSYMAM; }
+ inline char* Laboratory() { return ALAB; }
+ inline char* EvaluationDate() { return EDATE;}
+ inline char* Author() { return AUTH; }
+ inline char* Reference() { return REF; }
+ inline char* DistributionDate() { return DDATE; }
+ inline char* LastRevisionDate() { return RDATE; }
+ inline char* MasterEntryDate() { return ENDATE; }
+ inline TString GetInfo() { return INFO; }
- ClassDef(NdbMTDir,1)
+ ClassDef(NdbMTDir,1)
}; // NdbMTDir
#endif
diff --git a/test/periodic/NdbMTReacDesc.cxx b/test/periodic/NdbMTReacDesc.cxx
index 2339fddf5b8..03dc2c59659 100644
--- a/test/periodic/NdbMTReacDesc.cxx
+++ b/test/periodic/NdbMTReacDesc.cxx
@@ -9,147 +9,148 @@ ClassImp(NdbMTReacDesc)
/* ================ NdbMTReacDesc ================== */
NdbMTReacDesc::NdbMTReacDesc(const char *filename)
{
- Init(filename);
+ Init(filename);
} // NdbMTReacDesc
/* ------- ~NdbMTReacDesc ------- */
NdbMTReacDesc::~NdbMTReacDesc()
{
- if (shrt) {
- for (int i=0; i<mt.GetSize(); i++) {
- if (shrt[i]) free(shrt[i]);
- if (desc[i]) free(desc[i]);
- if (comment[i]) free(comment[i]);
- }
- free(shrt);
- free(desc);
- free(comment);
- }
+ if (shrt) {
+ for (int i=0; i<mt.GetSize(); i++) {
+ if (shrt[i]) free(shrt[i]);
+ if (desc[i]) free(desc[i]);
+ if (comment[i]) free(comment[i]);
+ }
+ free(shrt);
+ free(desc);
+ free(comment);
+ }
} // ~NdbMTReacDesc
/* ------ Init ------ */
void
NdbMTReacDesc::Init(const char *filename)
{
- shrt = NULL;
- desc = NULL;
- comment = NULL;
-
- FILE *f;
-
- if ((f=fopen(filename,"r"))==NULL) {
- fprintf(stderr,"ERROR: NdbMTReacDesc::NdbMTReacDesc(%s) cannot open file.\n",filename);
- return;
- }
-
- /* ----- First read total number of MT's ------ */
- Int_t N;
-
- fscanf(f,"%d",&N);
- if (N<=0) {
- fprintf(stderr,"ERROR: NdbMTReacDesc::NdbMTReacDesc(%s) error reading from file.\n",filename);
- fclose(f);
- }
-
- /* ----- Allocate memory ----- */
- mt.Set(N);
- shrt = (char **)malloc(N * sizeof(char*));
- desc = (char **)malloc(N * sizeof(char*));
- comment = (char **)malloc(N * sizeof(char*));
-
- for (int i=0; i<N; i++) {
- /* --- read mt number and short description --- */
- Int_t mt_num, ch;
- char str[512], str2[256];
-
- fscanf(f,"%d",&mt_num);
-
- mt.AddAt(mt_num,i);
-
- /* --- skip blanks --- */
- do {} while (isspace(ch=fgetc(f)));
- ungetc(ch,f);
-
- /* get rest of line */
- fgets(str,sizeof(str),f);
-
- /* --- strip last newline char --- */
- str[strlen(str)-1] = 0;
-
- shrt[i] = strdup(str);
-
- /* --- Read the description line until the empty line --- */
- str[0] = 0;
- while (1) {
- fgets(str2,sizeof(str2),f);
- if (str2[0] == '\n') break;
- strlcat(str,str2,512);
- }
- str[strlen(str)-1] = 0;
- desc[i] = strdup(str);
-
- /* --- Read the description line until the empty line --- */
- str[0] = 0;
- while (1) {
- fgets(str2,sizeof(str2),f);
- if (str2[0] == '\n') break;
- strlcat(str,str2,512);
- }
- if (str && str[0])
- str[strlen(str)-1] = 0;
- comment[i] = strdup(str);
- }
- fclose(f);
+ shrt = NULL;
+ desc = NULL;
+ comment = NULL;
+
+ FILE *f;
+
+ if ((f=fopen(filename,"r"))==NULL) {
+ fprintf(stderr,"ERROR: NdbMTReacDesc::NdbMTReacDesc(%s) cannot open file.\n",filename);
+ return;
+ }
+
+ /* ----- First read total number of MT's ------ */
+ Int_t N;
+
+ fscanf(f,"%d",&N);
+ if (N<=0) {
+ fprintf(stderr,"ERROR: NdbMTReacDesc::NdbMTReacDesc(%s) error reading from file.\n",filename);
+ fclose(f);
+ }
+
+ /* ----- Allocate memory ----- */
+ mt.Set(N);
+ shrt = (char **)malloc(N * sizeof(char*));
+ desc = (char **)malloc(N * sizeof(char*));
+ comment = (char **)malloc(N * sizeof(char*));
+
+ for (int i=0; i<N; i++) {
+ /* --- read mt number and short description --- */
+ Int_t mt_num, ch;
+ char str[512], str2[256];
+
+ fscanf(f,"%d",&mt_num);
+
+ mt.AddAt(mt_num,i);
+
+ /* --- skip blanks --- */
+ do {} while (isspace(ch=fgetc(f)));
+ ungetc(ch,f);
+
+ /* get rest of line */
+ fgets(str,sizeof(str),f);
+
+ /* --- strip last newline char --- */
+ str[strlen(str)-1] = 0;
+
+ shrt[i] = strdup(str);
+
+ /* --- Read the description line until the empty line --- */
+ str[0] = 0;
+ while (1) {
+ fgets(str2,sizeof(str2),f);
+ if (str2[0] == '\n') break;
+ strlcat(str,str2,512);
+ }
+ str[strlen(str)-1] = 0;
+ desc[i] = strdup(str);
+
+ /* --- Read the description line until the empty line --- */
+ str[0] = 0;
+ while (1) {
+ fgets(str2,sizeof(str2),f);
+ if (str2[0] == '\n') break;
+ strlcat(str,str2,512);
+ }
+ if (str && str[0])
+ str[strlen(str)-1] = 0;
+ comment[i] = strdup(str);
+ }
+ fclose(f);
} // NdbMTReacDesc
/* ------- FindMT -------- */
Int_t
NdbMTReacDesc::FindMT( Int_t MT )
{
- /* Make a linear search */
- if (shrt){
- for (int i=0; i<mt.GetSize(); i++){
- if (mt[i] == MT){
- return i;
- } else {
- if (mt[i] > MT){
- break;
- }
- }
- }
- }
- return -1;
+ /* Make a linear search */
+ if (shrt){
+ for (int i=0; i<mt.GetSize(); i++){
+ if (mt[i] == MT){
+ return i;
+ } else {
+ if (mt[i] > MT){
+ break;
+ }
+ }
+ }
+ }
+ return -1;
+
} // FindMT
/* ------- GetShort -------- */
char *
NdbMTReacDesc::GetShort(Int_t MT)
{
- Int_t idx = FindMT(MT);
- if (idx<0)
- return NULL;
+ Int_t idx = FindMT(MT);
+ if (idx<0)
+ return NULL;
- return shrt[idx];
+ return shrt[idx];
} // GetShort
/* ------- GetDescription -------- */
char *
NdbMTReacDesc::GetDescription(Int_t MT)
{
- Int_t idx = FindMT(MT);
- if (idx<0)
- return NULL;
+ Int_t idx = FindMT(MT);
+ if (idx<0)
+ return NULL;
- return desc[idx];
+ return desc[idx];
} // GetDescription
/* ------- GetComment -------- */
char *
NdbMTReacDesc::GetComment(Int_t MT)
{
- Int_t idx = FindMT(MT);
- if (idx<0)
- return NULL;
+ Int_t idx = FindMT(MT);
+ if (idx<0)
+ return NULL;
- return comment[idx];
+ return comment[idx];
} // GetComment
diff --git a/test/periodic/NdbMTReacDesc.h b/test/periodic/NdbMTReacDesc.h
index 79d26ecf885..badd99a2886 100644
--- a/test/periodic/NdbMTReacDesc.h
+++ b/test/periodic/NdbMTReacDesc.h
@@ -15,32 +15,32 @@
class NdbMTReacDesc : public TObject
{
protected:
- TArrayI mt; // MT number
- char **shrt; //! Short description (n,f)
- char **desc; //! Long description
- char **comment; //! Comments on reaction
+ TArrayI mt; // MT number
+ char **shrt; //! Short description (n,f)
+ char **desc; //! Long description
+ char **comment; //! Comments on reaction
public:
- NdbMTReacDesc() {
- shrt = NULL;
- desc = NULL;
- comment = NULL;
- }
- NdbMTReacDesc(const char *filename);
- ~NdbMTReacDesc();
-
- void Init(const char *filename);
-
- // --- Access functions ---
- inline Int_t GetSize() const { return mt.GetSize(); }
- inline Int_t MT(Int_t i) { return mt[i]; }
-
- Int_t FindMT(Int_t MT);
- char* GetShort(Int_t MT);
- char* GetDescription(Int_t MT);
- char* GetComment(Int_t MT);
-
- ClassDef(NdbMTReacDesc,1)
+ NdbMTReacDesc() {
+ shrt = NULL;
+ desc = NULL;
+ comment = NULL;
+ }
+ NdbMTReacDesc(const char *filename);
+ ~NdbMTReacDesc();
+
+ void Init(const char *filename);
+
+ // --- Access functions ---
+ inline Int_t GetSize() const { return mt.GetSize(); }
+ inline Int_t MT(Int_t i) { return mt[i]; }
+
+ Int_t FindMT(Int_t MT);
+ char* GetShort(Int_t MT);
+ char* GetDescription(Int_t MT);
+ char* GetComment(Int_t MT);
+
+ ClassDef(NdbMTReacDesc,1)
}; // NdbMTReacDesc
diff --git a/test/periodic/NdbMTReactionXS.cxx b/test/periodic/NdbMTReactionXS.cxx
index f30297d04e9..19bac444e25 100644
--- a/test/periodic/NdbMTReactionXS.cxx
+++ b/test/periodic/NdbMTReactionXS.cxx
@@ -10,105 +10,105 @@ ClassImp(NdbMTReactionXS);
Bool_t
NdbMTReactionXS::LoadENDF( char *filename )
{
- NdbEndfIO endf(filename,TENDF_READ);
- Bool_t error;
-
- if (!endf.IsOpen()) return kTRUE;
-
- minxs = MAX_REAL;
- maxxs = -MAX_REAL;
-
- endf.FindMFMT(3,MT()); // Find total cross section
- endf.ReadReal(&error); // ??
- endf.ReadReal(&error);
- endf.ReadLine();
- QM = endf.ReadReal(&error);
- QI = endf.ReadReal(&error);
- endf.ReadInt(&error); // Skip number
-
- LR = endf.ReadInt(&error); if (error) return error;
- NR = endf.ReadInt(&error); if (error) return error;
- NP = endf.ReadInt(&error); if (error) return error;
- endf.ReadLine(); // Skip line
-
- IT = endf.ReadInt(&error,2); // Interpolation type
- endf.ReadLine(); // Skip line
-
- ene.Set(NP);
- xs.Set(NP);
-
- for (int i=0; i<NP; i++) {
- Float_t f;
- ene.AddAt(endf.ReadReal(&error), i);
- xs.AddAt( f = endf.ReadReal(&error), i);
- minxs = MIN(minxs,f);
- maxxs = MAX(maxxs,f);
- }
- return kFALSE;
+ NdbEndfIO endf(filename,TENDF_READ);
+ Bool_t error;
+
+ if (!endf.IsOpen()) return kTRUE;
+
+ minxs = MAX_REAL;
+ maxxs = -MAX_REAL;
+
+ endf.FindMFMT(3,MT()); // Find total cross section
+ endf.ReadReal(&error); // ??
+ endf.ReadReal(&error);
+ endf.ReadLine();
+ QM = endf.ReadReal(&error);
+ QI = endf.ReadReal(&error);
+ endf.ReadInt(&error); // Skip number
+
+ LR = endf.ReadInt(&error); if (error) return error;
+ NR = endf.ReadInt(&error); if (error) return error;
+ NP = endf.ReadInt(&error); if (error) return error;
+ endf.ReadLine(); // Skip line
+
+ IT = endf.ReadInt(&error,2); // Interpolation type
+ endf.ReadLine(); // Skip line
+
+ ene.Set(NP);
+ xs.Set(NP);
+
+ for (int i=0; i<NP; i++) {
+ Float_t f;
+ ene.AddAt(endf.ReadReal(&error), i);
+ xs.AddAt( f = endf.ReadReal(&error), i);
+ minxs = MIN(minxs,f);
+ maxxs = MAX(maxxs,f);
+ }
+ return kFALSE;
} // loadENDF
/* -------- BinSearch -------- */
Int_t
NdbMTReactionXS::BinSearch( Float_t e )
{
- Int_t low = 0;
- Int_t high = NP-1;
- Int_t mid;
-
- if (e < ene[low]) return NOTFOUND;
- if (e > ene[high]) return NOTFOUND;
-
- while (1) {
- mid = (low+high)/2;
- if (mid==low) return mid;
- if (e > ene[mid])
- low = mid;
- else
- if (e < ene[mid])
- high = mid;
- else
- return mid;
- }
+ Int_t low = 0;
+ Int_t high = NP-1;
+ Int_t mid;
+
+ if (e < ene[low]) return NOTFOUND;
+ if (e > ene[high]) return NOTFOUND;
+
+ while (1) {
+ mid = (low+high)/2;
+ if (mid==low) return mid;
+ if (e > ene[mid])
+ low = mid;
+ else
+ if (e < ene[mid])
+ high = mid;
+ else
+ return mid;
+ }
} // BinSearch
/* -------- Interpolate -------- */
Float_t
NdbMTReactionXS::Interpolate( Float_t e )
{
- Int_t p = BinSearch(e);
+ Int_t p = BinSearch(e);
- if (p==NOTFOUND)
- return xs[ e<ene[0]? 0 : NP-1 ];
+ if (p==NOTFOUND)
+ return xs[ e<ene[0]? 0 : NP-1 ];
- if (p==NP-1)
- return xs[p];
+ if (p==NP-1)
+ return xs[p];
- Float_t el = ene[p];
- Float_t xl = xs[p];
- p++;
+ Float_t el = ene[p];
+ Float_t xl = xs[p];
+ p++;
- switch (IT) {
- case IT_LINLOG:
- std::cout << "Linear-Log interpolation" << std::endl;
- return 0.0;
+ switch (IT) {
+ case IT_LINLOG:
+ std::cout << "Linear-Log interpolation" << std::endl;
+ return 0.0;
- case IT_LOGLIN:
- std::cout << "Log-Linear interpolation" << std::endl;
- return 0.0;
+ case IT_LOGLIN:
+ std::cout << "Log-Linear interpolation" << std::endl;
+ return 0.0;
- case IT_LOGLOG:
- std::cout << "Log-Log interpolation" << std::endl;
- return 0.0;
+ case IT_LOGLOG:
+ std::cout << "Log-Log interpolation" << std::endl;
+ return 0.0;
- case IT_GAMOW:
- std::cout << "GAMOW interpolation" << std::endl;
- return 0.0;
+ case IT_GAMOW:
+ std::cout << "GAMOW interpolation" << std::endl;
+ return 0.0;
- case IT_LINLIN:
- return xs[p] + (e-el) * (xs[p]-xl) / (ene[p]-el);
+ case IT_LINLIN:
+ return xs[p] + (e-el) * (xs[p]-xl) / (ene[p]-el);
- default:
- break;
- }
- return 0.0;
+ default:
+ break;
+ }
+ return 0.0;
} // interpolate
diff --git a/test/periodic/NdbMTReactionXS.h b/test/periodic/NdbMTReactionXS.h
index a07d74b393b..248819a9612 100644
--- a/test/periodic/NdbMTReactionXS.h
+++ b/test/periodic/NdbMTReactionXS.h
@@ -10,68 +10,68 @@
#include "NdbMaterial.h"
// --- Interpolation types ----
-#define IT_HISTOGRAM 1
-#define IT_LINLIN 2
-#define IT_LINLOG 3
-#define IT_LOGLIN 4
-#define IT_LOGLOG 5
-#define IT_GAMOW 6
+#define IT_HISTOGRAM 1
+#define IT_LINLIN 2
+#define IT_LINLOG 3
+#define IT_LOGLIN 4
+#define IT_LOGLOG 5
+#define IT_GAMOW 6
/* ========= NdbMTReactionXS ============ */
class NdbMTReactionXS : public NdbMT
{
protected:
- TArrayF ene; // Energy in eV
- TArrayF xs; // Cross section in barn
+ TArrayF ene; // Energy in eV
+ TArrayF xs; // Cross section in barn
- Float_t minxs, // Minimum and
- maxxs; // Maximum limits of XS
+ Float_t minxs, // Minimum and
+ maxxs; // Maximum limits of XS
- NdbParticle projectile; // Projectile particle
- NdbParticleList daugthers; // Reaction products
- NdbMaterial residual; // Residual nucleus
- Double_t QM; // Mass-difference Q value (eV)
- Double_t QI; // reaction Q for the lowest
- // energy state
- Int_t LR; // Complex or "breakup" flag.
- Int_t NP; // No. Points (x,y)
- Int_t NR; // interpolation regions
- Int_t IT; // Interpolation type
+ NdbParticle projectile; // Projectile particle
+ NdbParticleList daugthers; // Reaction products
+ NdbMaterial residual; // Residual nucleus
+ Double_t QM; // Mass-difference Q value (eV)
+ Double_t QI; // reaction Q for the lowest
+ // energy state
+ Int_t LR; // Complex or "breakup" flag.
+ Int_t NP; // No. Points (x,y)
+ Int_t NR; // interpolation regions
+ Int_t IT; // Interpolation type
public:
- NdbMTReactionXS(int aMt, const char *desc)
- : NdbMT(aMt,desc) {
- LR = -1;
- NP = -1;
- NR = -1;
- minxs = maxxs = 0.0;
- }
- ~NdbMTReactionXS() {}
+ NdbMTReactionXS(int aMt, const char *desc)
+ : NdbMT(aMt,desc) {
+ LR = -1;
+ NP = -1;
+ NR = -1;
+ minxs = maxxs = 0.0;
+ }
+ ~NdbMTReactionXS() {}
- // --- Access functions ---
- inline Float_t Energy(int i) { return ene[i]; }
- inline Float_t XS(int i) { return xs[i]; }
+ // --- Access functions ---
+ inline Float_t Energy(int i) { return ene[i]; }
+ inline Float_t XS(int i) { return xs[i]; }
- inline Int_t Pairs() const { return NP; }
- inline Int_t InterpolationType() const { return IT; }
- inline Int_t InterpolationRegions() const { return NR; }
- inline Float_t MassDifference() const { return QM; }
- inline Float_t ReactionQ() const { return QI; }
+ inline Int_t Pairs() const { return NP; }
+ inline Int_t InterpolationType() const { return IT; }
+ inline Int_t InterpolationRegions() const { return NR; }
+ inline Float_t MassDifference() const { return QM; }
+ inline Float_t ReactionQ() const { return QI; }
- // --- Input/Output routines ---
- Bool_t LoadENDF(char *filename);
+ // --- Input/Output routines ---
+ Bool_t LoadENDF(char *filename);
- // --- Interpolation routines ---
- Int_t BinSearch( Float_t e);
- Float_t Interpolate(Float_t e);
+ // --- Interpolation routines ---
+ Int_t BinSearch( Float_t e);
+ Float_t Interpolate(Float_t e);
- // --- Limits ---
- inline Float_t MinEnergy() { return ene[0]; }
- inline Float_t MaxEnergy() { return ene[NP-1]; }
- inline Float_t MinXS() const { return minxs; }
- inline Float_t MaxXS() const { return maxxs; }
+ // --- Limits ---
+ inline Float_t MinEnergy() { return ene[0]; }
+ inline Float_t MaxEnergy() { return ene[NP-1]; }
+ inline Float_t MinXS() const { return minxs; }
+ inline Float_t MaxXS() const { return maxxs; }
- ClassDef(NdbMTReactionXS,1)
+ ClassDef(NdbMTReactionXS,1)
}; // NdbMTReactionXS
diff --git a/test/periodic/NdbMaterial.h b/test/periodic/NdbMaterial.h
index 95d47436caa..2e9c3247415 100644
--- a/test/periodic/NdbMaterial.h
+++ b/test/periodic/NdbMaterial.h
@@ -8,98 +8,98 @@
class NdbMaterial : public TObject
{
protected:
- TString eMnemonic; // Mnemonic of the element XX-AAAii
- TString eName; // Name of isotope "Gold"
- Long_t eId; // AZ code = Z*10000 + A*10 + ISO
- Int_t eZ; // Z = number of protons
- Int_t eA; // A = mass number
- Int_t eIS; // Isomeric state of element
- Float_t eMass; // Mass of the element
- Float_t eMassExcess; // M-A
- Float_t eHalfLife; // Half life
- Float_t eAbundance; // Percentage of natural isotope
- Float_t eDensity; // Density of element
- Float_t eMeltingPoint; // Melting point in K
- Float_t eBoilingPoint; // Boiling point in K
+ TString eMnemonic; // Mnemonic of the element XX-AAAii
+ TString eName; // Name of isotope "Gold"
+ Long_t eId; // AZ code = Z*10000 + A*10 + ISO
+ Int_t eZ; // Z = number of protons
+ Int_t eA; // A = mass number
+ Int_t eIS; // Isomeric state of element
+ Float_t eMass; // Mass of the element
+ Float_t eMassExcess; // M-A
+ Float_t eHalfLife; // Half life
+ Float_t eAbundance; // Percentage of natural isotope
+ Float_t eDensity; // Density of element
+ Float_t eMeltingPoint; // Melting point in K
+ Float_t eBoilingPoint; // Boiling point in K
-// TDecayMode eDecayMode; // Decay mode of element
+// TDecayMode eDecayMode; // Decay mode of element
- TObjArray *mf; // Array of File types
+ TObjArray *mf; // Array of File types
public:
- NdbMaterial() {}
+ NdbMaterial() {}
- NdbMaterial(
- const char *aName,
- const char *aMnemonic,
- Int_t aZ,
- Int_t anA,
- Int_t anIso=0,
- Float_t aMass=0.0,
- Float_t aMassExcess=0.0,
- Float_t aHalfLife=0.0,
- Float_t aAbundance=0.0,
- Float_t aDensity=0.0,
- Float_t aMeltingPoint=0.0,
- Float_t aBoilingPoint=0.0)
- : TObject(), eMnemonic(aMnemonic), eName(aName) {
- eZ = aZ;
- eA = anA;
- eIS = anIso;
- eId = eZ*10000 + eA*10 + eIS;
- if (aMass!=0.0)
- eMass = aMass;
- else
- eMass = (Float_t)anA;
- eMassExcess = aMassExcess;
- eAbundance = aAbundance;
- eHalfLife = aHalfLife;
- eDensity = aDensity;
- eMeltingPoint = aMeltingPoint;
- eBoilingPoint = aBoilingPoint;
- }
+ NdbMaterial(
+ const char *aName,
+ const char *aMnemonic,
+ Int_t aZ,
+ Int_t anA,
+ Int_t anIso=0,
+ Float_t aMass=0.0,
+ Float_t aMassExcess=0.0,
+ Float_t aHalfLife=0.0,
+ Float_t aAbundance=0.0,
+ Float_t aDensity=0.0,
+ Float_t aMeltingPoint=0.0,
+ Float_t aBoilingPoint=0.0)
+ : TObject(), eMnemonic(aMnemonic), eName(aName) {
+ eZ = aZ;
+ eA = anA;
+ eIS = anIso;
+ eId = eZ*10000 + eA*10 + eIS;
+ if (aMass!=0.0)
+ eMass = aMass;
+ else
+ eMass = (Float_t)anA;
+ eMassExcess = aMassExcess;
+ eAbundance = aAbundance;
+ eHalfLife = aHalfLife;
+ eDensity = aDensity;
+ eMeltingPoint = aMeltingPoint;
+ eBoilingPoint = aBoilingPoint;
+ }
- NdbMaterial( NdbMaterial& elem )
- : TObject(), eName(elem.eName)
- {
- eZ = elem.eZ;
- eA = elem.eA;
- eIS = elem.eIS;
- eId = elem.eId;
- eMass = elem.eMass;
- eMassExcess = elem.eMassExcess;
- eDensity = elem.eDensity;
- eMeltingPoint = elem.eMeltingPoint;
- eBoilingPoint = elem.eBoilingPoint;
- eAbundance = elem.eAbundance;
- eHalfLife = elem.eHalfLife;
- eMeltingPoint = elem.eMeltingPoint;
- eBoilingPoint = elem.eBoilingPoint;
- }
+ NdbMaterial( NdbMaterial& elem )
+ : TObject(), eName(elem.eName)
+ {
+ eZ = elem.eZ;
+ eA = elem.eA;
+ eIS = elem.eIS;
+ eId = elem.eId;
+ eMass = elem.eMass;
+ eMassExcess = elem.eMassExcess;
+ eDensity = elem.eDensity;
+ eMeltingPoint = elem.eMeltingPoint;
+ eBoilingPoint = elem.eBoilingPoint;
+ eAbundance = elem.eAbundance;
+ eHalfLife = elem.eHalfLife;
+ eMeltingPoint = elem.eMeltingPoint;
+ eBoilingPoint = elem.eBoilingPoint;
+ }
- ~NdbMaterial() {}
+ ~NdbMaterial() {}
- // --- Virtual functions ---
- Int_t Compare(const TObject *o) const
- { return ((eId==((NdbMaterial*)o)->eId)? 0 :
- (eId > ((NdbMaterial*)o)->eId)? 1 : -1 ); }
+ // --- Virtual functions ---
+ Int_t Compare(const TObject *o) const
+ { return ((eId==((NdbMaterial*)o)->eId)? 0 :
+ (eId > ((NdbMaterial*)o)->eId)? 1 : -1 ); }
- // --- Access functions ---
- inline TString Name() const { return eName; }
- inline TString Mnemonic() const { return eMnemonic; }
- inline Long_t Id() const { return eId; }
- inline Int_t A() const { return eA; }
- inline Int_t Z() const { return eZ; }
- inline Int_t ISO() const { return eIS; }
- inline Float_t Mass() const { return eMass; }
- inline Float_t MassExcess() const { return eMassExcess; }
- inline Float_t HalfLife() const { return eHalfLife; }
- inline Float_t Abundance() const { return eAbundance; }
- inline Float_t Density() const { return eDensity; }
- inline Float_t MeltingPoint() const { return eMeltingPoint; }
- inline Float_t BoilingPoint() const { return eBoilingPoint; }
+ // --- Access functions ---
+ inline TString Name() const { return eName; }
+ inline TString Mnemonic() const { return eMnemonic; }
+ inline Long_t Id() const { return eId; }
+ inline Int_t A() const { return eA; }
+ inline Int_t Z() const { return eZ; }
+ inline Int_t ISO() const { return eIS; }
+ inline Float_t Mass() const { return eMass; }
+ inline Float_t MassExcess() const { return eMassExcess; }
+ inline Float_t HalfLife() const { return eHalfLife; }
+ inline Float_t Abundance() const { return eAbundance; }
+ inline Float_t Density() const { return eDensity; }
+ inline Float_t MeltingPoint() const { return eMeltingPoint; }
+ inline Float_t BoilingPoint() const { return eBoilingPoint; }
- ClassDef(NdbMaterial,1)
+ ClassDef(NdbMaterial,1)
}; // NdbMaterial
diff --git a/test/periodic/NdbParticle.h b/test/periodic/NdbParticle.h
index a316196a2db..be6ac16cac1 100644
--- a/test/periodic/NdbParticle.h
+++ b/test/periodic/NdbParticle.h
@@ -5,65 +5,65 @@
#include <TString.h>
/* ------------- Particle Types ---------------- */
-enum ParticleType {
- PTGamma,
- PTNeutron,
- PTAntiNeutron,
- PTNeutrino,
- PTAntiNeutrino,
- PTProton,
- PTAntiProton,
- PTElectron,
- PTPositron,
- PTPionPlus,
- PTPionMinus,
- PTMuonPlus,
- PTMuonMinus,
- PTKaonPlus,
- PTKaonMinus,
- PTKaonLong,
- PTKaonShort,
- PTKaonZero,
- PTLambda,
- PTAlpha
+enum ParticleType {
+ PTGamma,
+ PTNeutron,
+ PTAntiNeutron,
+ PTNeutrino,
+ PTAntiNeutrino,
+ PTProton,
+ PTAntiProton,
+ PTElectron,
+ PTPositron,
+ PTPionPlus,
+ PTPionMinus,
+ PTMuonPlus,
+ PTMuonMinus,
+ PTKaonPlus,
+ PTKaonMinus,
+ PTKaonLong,
+ PTKaonShort,
+ PTKaonZero,
+ PTLambda,
+ PTAlpha
};
/* ------------ Particle Class ---------------- */
class NdbParticle : public TObject
{
protected:
- Long_t pId; // Unique id of each particle
- TString pName; // Particle Name
- TString pMnemonic; // Particle Mnemonic
- ParticleType pType; // Type of particle
- Int_t pCharge; // Particle charge
- Float_t pMass; // mass in MeV/c^2
- Float_t pHalfLife; // Half life in sec.
+ Long_t pId; // Unique id of each particle
+ TString pName; // Particle Name
+ TString pMnemonic; // Particle Mnemonic
+ ParticleType pType; // Type of particle
+ Int_t pCharge; // Particle charge
+ Float_t pMass; // mass in MeV/c^2
+ Float_t pHalfLife; // Half life in sec.
public:
- NdbParticle() { pId = -1; }
+ NdbParticle() { pId = -1; }
- NdbParticle(
- const char *aName,
- ParticleType aType,
- long anId = 0)
- : TObject(), pName(aName)
- {
- pType = aType;
- pId = anId;
- }
+ NdbParticle(
+ const char *aName,
+ ParticleType aType,
+ long anId = 0)
+ : TObject(), pName(aName)
+ {
+ pType = aType;
+ pId = anId;
+ }
- ~NdbParticle() {}
+ ~NdbParticle() {}
- // --- Access Functions ---
- inline TString Name() const { return pName; }
- inline TString Mnemonic() const { return pMnemonic; }
- inline Long_t Id() const { return pId; }
- inline Float_t Mass() const { return pMass; }
- inline Float_t HalfLife() const { return pHalfLife; }
- inline Int_t Charge() const { return pCharge; }
+ // --- Access Functions ---
+ inline TString Name() const { return pName; }
+ inline TString Mnemonic() const { return pMnemonic; }
+ inline Long_t Id() const { return pId; }
+ inline Float_t Mass() const { return pMass; }
+ inline Float_t HalfLife() const { return pHalfLife; }
+ inline Int_t Charge() const { return pCharge; }
- ClassDef(NdbParticle,1)
+ ClassDef(NdbParticle,1)
}; // NdbParticle
diff --git a/test/periodic/NdbParticleList.cxx b/test/periodic/NdbParticleList.cxx
index acad6b345e3..72e1547df44 100644
--- a/test/periodic/NdbParticleList.cxx
+++ b/test/periodic/NdbParticleList.cxx
@@ -8,46 +8,46 @@ ClassImp(NdbParticleList)
Int_t
NdbParticleList::TotalCharge()
{
- Int_t charge = 0;
+ Int_t charge = 0;
- for (int i=0; i<mult.GetSize(); i++)
- charge += ((NdbParticle*)part[i])->Charge() * mult[i];
+ for (int i=0; i<mult.GetSize(); i++)
+ charge += ((NdbParticle*)part[i])->Charge() * mult[i];
- return charge;
+ return charge;
} // TotalCharge
/* -------- TotalMass -------- */
Float_t
NdbParticleList::TotalMass()
{
- Float_t mass = 0.0;
+ Float_t mass = 0.0;
- for (int i=0; i<mult.GetSize(); i++)
- mass += ((NdbParticle*)part[i])->Mass() * mult[i];
+ for (int i=0; i<mult.GetSize(); i++)
+ mass += ((NdbParticle*)part[i])->Mass() * mult[i];
- return mass;
+ return mass;
} // TotalMass
/* -------- Name -------- */
TString
NdbParticleList::Name()
{
- TString nm;
-
- for (int i=0; i<mult.GetSize(); i++) {
- if (mult[i]>1) {
- char num[10];
- sprintf(num,"%d",mult[i]);
- nm.Append(num);
- }
- nm.Append(((NdbParticle*)part[i])->Name());
- }
- return nm;
+ TString nm;
+
+ for (int i=0; i<mult.GetSize(); i++) {
+ if (mult[i]>1) {
+ char num[10];
+ sprintf(num,"%d",mult[i]);
+ nm.Append(num);
+ }
+ nm.Append(((NdbParticle*)part[i])->Name());
+ }
+ return nm;
} // Name
/* --------- Add --------- */
void
NdbParticleList::Add(NdbParticle *, Int_t)
{
- std::cout << "NdbParticleList::add()" << std::endl;
+ std::cout << "NdbParticleList::add()" << std::endl;
} // Add
diff --git a/test/periodic/NdbParticleList.h b/test/periodic/NdbParticleList.h
index f4083a6e055..7ae84d37399 100644
--- a/test/periodic/NdbParticleList.h
+++ b/test/periodic/NdbParticleList.h
@@ -10,22 +10,22 @@
class NdbParticleList : public TObject
{
protected:
- TArrayI mult; // How many times each particle occurs
- TObjArray part; // Link to particle types
+ TArrayI mult; // How many times each particle occurs
+ TObjArray part; // Link to particle types
public:
- NdbParticleList() : mult(), part() { }
- ~NdbParticleList() {}
+ NdbParticleList() : mult(), part() { }
+ ~NdbParticleList() {}
- // --- Access Functions ---
- Int_t TotalCharge(); // Total charge
- Float_t TotalMass(); // Total mass
- TString Name(); // string containing the name
- // in a format like 2np
+ // --- Access Functions ---
+ Int_t TotalCharge(); // Total charge
+ Float_t TotalMass(); // Total mass
+ TString Name(); // string containing the name
+ // in a format like 2np
- void Add(NdbParticle *p, Int_t n=1);
+ void Add(NdbParticle *p, Int_t n=1);
- ClassDef(NdbParticleList,1)
+ ClassDef(NdbParticleList,1)
}; // NdbParticleList
diff --git a/test/periodic/NdbPhotonAngleDist.h b/test/periodic/NdbPhotonAngleDist.h
index b54e60d8323..2a966d5426d 100644
--- a/test/periodic/NdbPhotonAngleDist.h
+++ b/test/periodic/NdbPhotonAngleDist.h
@@ -9,12 +9,12 @@ class NdbPhotonAngleDist : public NdbMF
protected:
public:
- NdbPhotonAngleDist()
- : NdbMF(14, "Angular distributions for photon production") {}
+ NdbPhotonAngleDist()
+ : NdbMF(14, "Angular distributions for photon production") {}
- ~NdbPhotonAngleDist() {}
+ ~NdbPhotonAngleDist() {}
- ClassDef(NdbPhotonAngleDist,1)
+ ClassDef(NdbPhotonAngleDist,1)
}; // NdbPhotonAngleDist
#endif
diff --git a/test/periodic/NdbPhotonEnergyDist.h b/test/periodic/NdbPhotonEnergyDist.h
index abe49e28057..5f0dd228787 100644
--- a/test/periodic/NdbPhotonEnergyDist.h
+++ b/test/periodic/NdbPhotonEnergyDist.h
@@ -9,11 +9,11 @@ class NdbPhotonEnergyDist : public NdbMF
protected:
public:
- NdbPhotonEnergyDist()
- : NdbMF(15, "Energy distributions for photon production") {}
- ~NdbPhotonEnergyDist() {}
+ NdbPhotonEnergyDist()
+ : NdbMF(15, "Energy distributions for photon production") {}
+ ~NdbPhotonEnergyDist() {}
- ClassDef(NdbPhotonEnergyDist,1)
+ ClassDef(NdbPhotonEnergyDist,1)
}; // NdbPhotonEnergyDist
#endif
diff --git a/test/periodic/NdbPhotonInteractionXS.h b/test/periodic/NdbPhotonInteractionXS.h
index a40bafb6174..d2c23f26055 100644
--- a/test/periodic/NdbPhotonInteractionXS.h
+++ b/test/periodic/NdbPhotonInteractionXS.h
@@ -9,11 +9,11 @@ class NdbPhotonInteractionXS : public NdbMF
protected:
public:
- NdbPhotonInteractionXS()
- : NdbMF(23, "Photo-atomic interaction cross sections") {}
- ~NdbPhotonInteractionXS() {}
+ NdbPhotonInteractionXS()
+ : NdbMF(23, "Photo-atomic interaction cross sections") {}
+ ~NdbPhotonInteractionXS() {}
- ClassDef(NdbPhotonInteractionXS,1)
+ ClassDef(NdbPhotonInteractionXS,1)
}; // NdbPhotonInteractionXS
#endif
diff --git a/test/periodic/NdbPhotonMult.h b/test/periodic/NdbPhotonMult.h
index 2cb4f2250f8..f954a6429e8 100644
--- a/test/periodic/NdbPhotonMult.h
+++ b/test/periodic/NdbPhotonMult.h
@@ -9,11 +9,11 @@ class NdbPhotonMult : public NdbMF
protected:
public:
- NdbPhotonMult()
- : NdbMF(12, "Multiplicities for photon production") {}
- ~NdbPhotonMult() {}
+ NdbPhotonMult()
+ : NdbMF(12, "Multiplicities for photon production") {}
+ ~NdbPhotonMult() {}
- ClassDef(NdbPhotonMult,1)
+ ClassDef(NdbPhotonMult,1)
}; // NdbPhotonMult
#endif
diff --git a/test/periodic/NdbPhotonProdXS.h b/test/periodic/NdbPhotonProdXS.h
index 0c169d1157e..ad4f8381888 100644
--- a/test/periodic/NdbPhotonProdXS.h
+++ b/test/periodic/NdbPhotonProdXS.h
@@ -9,12 +9,12 @@ class NdbPhotonProdXS : public NdbMF
protected:
public:
- NdbPhotonProdXS()
- : NdbMF(13, "Cross sections for photon production") {}
+ NdbPhotonProdXS()
+ : NdbMF(13, "Cross sections for photon production") {}
- ~NdbPhotonProdXS() {}
+ ~NdbPhotonProdXS() {}
- ClassDef(NdbPhotonProdXS,1)
+ ClassDef(NdbPhotonProdXS,1)
}; // NdbPhotonProdXS
#endif
diff --git a/test/periodic/NdbRadioMult.h b/test/periodic/NdbRadioMult.h
index 56e0ab8fe31..86ed460bb2b 100644
--- a/test/periodic/NdbRadioMult.h
+++ b/test/periodic/NdbRadioMult.h
@@ -4,16 +4,16 @@
#include "NdbMF.h"
/* ========= NdbRadioMult ============ */
-class NdbRadioMult : public NdbMF
+class NdbRad ioMult : public NdbMF
{
protected:
public:
- NdbRadioMult()
- : NdbMF(9, "Multiplicities for radioactive nuclide production") {}
- ~NdbRadioMult() {}
+ NdbRadioMult()
+ : NdbMF(9, "Multiplicities for radioactive nuclide production") {}
+ ~NdbRadioMult() {}
- ClassDef(NdbRadioMult,1)
+ ClassDef(NdbRadioMult,1)
}; // NdbRadioMult
#endif
diff --git a/test/periodic/NdbRadioXS.h b/test/periodic/NdbRadioXS.h
index 52b617e7e28..00c71af84f8 100644
--- a/test/periodic/NdbRadioXS.h
+++ b/test/periodic/NdbRadioXS.h
@@ -9,12 +9,12 @@ class NdbRadioXS : public NdbMF
protected:
public:
- NdbRadioXS()
- : NdbMF(10, "Cross section for radioactive nuclide production") {}
+ NdbRadioXS()
+ : NdbMF(10, "Cross section for radioactive nuclide production") {}
- ~NdbRadioXS() {}
+ ~NdbRadioXS() {}
- ClassDef(NdbRadioXS,1)
+ ClassDef(NdbRadioXS,1)
}; // NdbRadioXS
#endif
diff --git a/test/periodic/NdbReaction.h b/test/periodic/NdbReaction.h
index 50251ab99d9..71727cd2550 100644
--- a/test/periodic/NdbReaction.h
+++ b/test/periodic/NdbReaction.h
@@ -11,15 +11,15 @@
class NdbReaction : public NdbMF
{
protected:
- TObjArray reac; // List of reaction Cross Sections
+ TObjArray reac; // List of reaction Cross Sections
public:
- NdbReaction()
- : NdbMF(3, "Reaction cross sections"),
- reac() { }
- ~NdbReaction() {}
+ NdbReaction()
+ : NdbMF(3, "Reaction cross sections"),
+ reac() { }
+ ~NdbReaction() {}
- ClassDef(NdbReaction,1)
+ ClassDef(NdbReaction,1)
}; // NdbReaction
#endif
diff --git a/test/periodic/NdbResParam.h b/test/periodic/NdbResParam.h
index dc91fe2b59d..e54db38dfc4 100644
--- a/test/periodic/NdbResParam.h
+++ b/test/periodic/NdbResParam.h
@@ -9,11 +9,11 @@ class NdbResParam : public NdbMF
protected:
public:
- NdbResParam()
- : NdbMF(2, "Resonance prameter data") {}
- ~NdbResParam() {}
+ NdbResParam()
+ : NdbMF(2, "Resonance prameter data") {}
+ ~NdbResParam() {}
- ClassDef(NdbResParam,1)
+ ClassDef(NdbResParam,1)
}; // NdbResParam
#endif
diff --git a/test/periodic/NdbThermalNeutron.h b/test/periodic/NdbThermalNeutron.h
index ac2e54e0290..8fd61b2650d 100644
--- a/test/periodic/NdbThermalNeutron.h
+++ b/test/periodic/NdbThermalNeutron.h
@@ -9,12 +9,12 @@ class NdbThermalNeutron : public NdbMF
protected:
public:
- NdbThermalNeutron()
- : NdbMF(7, "Thermal neutron scattering law data") {}
+ NdbThermalNeutron()
+ : NdbMF(7, "Thermal neutron scattering law data") {}
- ~NdbThermalNeutron() {}
+ ~NdbThermalNeutron() {}
- ClassDef(NdbThermalNeutron,1)
+ ClassDef(NdbThermalNeutron,1)
}; // NdbThermalNeutron
#endif
diff --git a/test/periodic/XSElementDlg.cxx b/test/periodic/XSElementDlg.cxx
index 8f5c9b94edd..4577f57572b 100644
--- a/test/periodic/XSElementDlg.cxx
+++ b/test/periodic/XSElementDlg.cxx
@@ -20,212 +20,212 @@
//ClassImp(XSElementDlg)
enum XSElementDlgEnum {
- ELEM_OK=900,
- ELEM_CANCEL
- };
+ ELEM_OK=900,
+ ELEM_CANCEL
+ };
static Int_t activeTab=0; // Remember last active Tab
-static Int_t LastWinX = -1;
-static Int_t LastWinY = -1;
+static Int_t LastWinX = -1;
+static Int_t LastWinY = -1;
/* ----- XSElementDlg ----- */
XSElementDlg::XSElementDlg( const TGWindow *p, const TGWindow *main,
- UInt_t *retZ, UInt_t w, UInt_t h)
- : TGTransientFrame(p,main,w,h)
+ UInt_t *retZ, UInt_t w, UInt_t h)
+ : TGTransientFrame(p,main,w,h)
{
- selectedZ = retZ; // Save Address
-
- lHints = new TGLayoutHints( kLHintsTop | kLHintsLeft |
- kLHintsExpandX | kLHintsExpandY,
- 2, 2, 2, 2);
-
- buttonFrame = new TGHorizontalFrame(this, 120, 20, kFixedWidth);
- okButton = new TGTextButton(buttonFrame, "&Ok", ELEM_OK);
- okButton->Associate(this);
- closeButton = new TGTextButton(buttonFrame, "&Close", ELEM_CANCEL);
- closeButton->Associate(this);
-
- buttonLayoutHints = new TGLayoutHints(
- kLHintsTop | kLHintsLeft | kLHintsExpandX,
- 2, 2, 5, 1);
- buttonFrame->AddFrame(okButton, buttonLayoutHints);
- buttonFrame->AddFrame(closeButton, buttonLayoutHints);
-
- frameLayoutHints = new TGLayoutHints(kLHintsBottom | kLHintsRight,
- 2, 2, 2, 2);
- AddFrame(buttonFrame, frameLayoutHints);
-
- // ---------- Add Periodic table -------------
- TGCompositeFrame *tf;
- tabMenu = new TGTab(this, w, h);
-
- tf = tabMenu->AddTab("Periodic Table");
-
- pTable = new XSPeriodicTable(this,tf,w,h);
- pTable->SelectZ(*selectedZ);
- tf->AddFrame(pTable, lHints);
-
- // ------------- Table Sorted by Name ------------
- tf = tabMenu->AddTab("Name");
-
- nameFrame = new TGCompositeFrame(tf,w,h, kVerticalFrame);
- nameListBox = new XSElementList(nameFrame,XSEL_SORTBY_NAME);
- nameListBox->SelectZ(*selectedZ);
- nameFrame->AddFrame(nameListBox,lHints);
-
- tf->AddFrame(nameFrame,lHints);
-
- // ------------- Table Sorted by Mnemonic -------------
- tf = tabMenu->AddTab("Mnemonic");
-
- mnemonicFrame = new TGCompositeFrame(tf,w,h,kVerticalFrame);
- mnemonicListBox = new XSElementList(mnemonicFrame,XSEL_SORTBY_MNEMONIC);
- mnemonicListBox->SelectZ(*selectedZ);
- mnemonicFrame->AddFrame(mnemonicListBox, lHints);
-
- tf->AddFrame(mnemonicFrame, lHints);
-
- // ------------- Table Sorted by Charge -------------
- tf = tabMenu->AddTab("Z (Charge)");
-
- zFrame = new TGCompositeFrame(tf,w,h,kVerticalFrame);
- zListBox = new XSElementList(zFrame,XSEL_SORTBY_Z);
- zListBox->SelectZ(*selectedZ);
- zFrame->AddFrame(zListBox, lHints);
- tf->AddFrame(zFrame, lHints);
-
- // ------------- Finalise settings -----------------
- lHints2 = new TGLayoutHints(
- kLHintsBottom | kLHintsExpandX | kLHintsExpandY,
- 2, 2, 5, 1);
- AddFrame(tabMenu, lHints2);
-
- tabMenu->SetTab(activeTab);
-
- /* --------- Set Windows Position --------- */
- int ax, ay;
- if (LastWinX == -1) { // Go to the middle of parent window
- Window_t wdum;
- gVirtualX->TranslateCoordinates(main->GetId(), GetParent()->GetId(),
- (((TGFrame *) main)->GetWidth() - fWidth) >> 1,
- (((TGFrame *) main)->GetHeight() - fHeight) >> 1,
- ax, ay, wdum);
- } else {
- ax = LastWinX;
- ay = LastWinY;
- }
- Move(ax,ay);
- SetWMPosition(ax,ay);
-
- MapSubwindows();
- Resize(GetDefaultSize());
- SetWindowName("Select Element");
- MapWindow();
-
- fClient->WaitFor(this);
+ selectedZ = retZ; // Save Address
+
+ lHints = new TGLayoutHints( kLHintsTop | kLHintsLeft |
+ kLHintsExpandX | kLHintsExpandY,
+ 2, 2, 2, 2);
+
+ buttonFrame = new TGHorizontalFrame(this, 120, 20, kFixedWidth);
+ okButton = new TGTextButton(buttonFrame, "&Ok", ELEM_OK);
+ okButton->Associate(this);
+ closeButton = new TGTextButton(buttonFrame, "&Close", ELEM_CANCEL);
+ closeButton->Associate(this);
+
+ buttonLayoutHints = new TGLayoutHints(
+ kLHintsTop | kLHintsLeft | kLHintsExpandX,
+ 2, 2, 5, 1);
+ buttonFrame->AddFrame(okButton, buttonLayoutHints);
+ buttonFrame->AddFrame(closeButton, buttonLayoutHints);
+
+ frameLayoutHints = new TGLayoutHints(kLHintsBottom | kLHintsRight,
+ 2, 2, 2, 2);
+ AddFrame(buttonFrame, frameLayoutHints);
+
+ // ---------- Add Periodic table -------------
+ TGCompositeFrame *tf;
+ tabMenu = new TGTab(this, w, h);
+
+ tf = tabMenu->AddTab("Periodic Table");
+
+ pTable = new XSPeriodicTable(this,tf,w,h);
+ pTable->SelectZ(*selectedZ);
+ tf->AddFrame(pTable, lHints);
+
+ // ------------- Table Sorted by Name ------------
+ tf = tabMenu->AddTab("Name");
+
+ nameFrame = new TGCompositeFrame(tf,w,h, kVerticalFrame);
+ nameListBox = new XSElementList(nameFrame,XSEL_SORTBY_NAME);
+ nameListBox->SelectZ(*selectedZ);
+ nameFrame->AddFrame(nameListBox,lHints);
+
+ tf->AddFrame(nameFrame,lHints);
+
+ // ------------- Table Sorted by Mnemonic -------------
+ tf = tabMenu->AddTab("Mnemonic");
+
+ mnemonicFrame = new TGCompositeFrame(tf,w,h,kVerticalFrame);
+ mnemonicListBox = new XSElementList(mnemonicFrame,XSEL_SORTBY_MNEMONIC);
+ mnemonicListBox->SelectZ(*selectedZ);
+ mnemonicFrame->AddFrame(mnemonicListBox, lHints);
+
+ tf->AddFrame(mnemonicFrame, lHints);
+
+ // ------------- Table Sorted by Charge -------------
+ tf = tabMenu->AddTab("Z (Charge)");
+
+ zFrame = new TGCompositeFrame(tf,w,h,kVerticalFrame);
+ zListBox = new XSElementList(zFrame,XSEL_SORTBY_Z);
+ zListBox->SelectZ(*selectedZ);
+ zFrame->AddFrame(zListBox, lHints);
+ tf->AddFrame(zFrame, lHints);
+
+ // ------------- Finalise settings -----------------
+ lHints2 = new TGLayoutHints(
+ kLHintsBottom | kLHintsExpandX | kLHintsExpandY,
+ 2, 2, 5, 1);
+ AddFrame(tabMenu, lHints2);
+
+ tabMenu->SetTab(activeTab);
+
+ /* --------- Set Windows Position --------- */
+ int ax, ay;
+ if (LastWinX == -1) { // Go to the middle of parent window
+ Window_t wdum;
+ gVirtualX->TranslateCoordinates(main->GetId(), GetParent()->GetId(),
+ (((TGFrame *) main)->GetWidth() - fWidth) >> 1,
+ (((TGFrame *) main)->GetHeight() - fHeight) >> 1,
+ ax, ay, wdum);
+ } else {
+ ax = LastWinX;
+ ay = LastWinY;
+ }
+ Move(ax,ay);
+ SetWMPosition(ax,ay);
+
+ MapSubwindows();
+ Resize(GetDefaultSize());
+ SetWindowName("Select Element");
+ MapWindow();
+
+ fClient->WaitFor(this);
} // XSElementDlg
/* ----- ~XSElementDlg ----- */
XSElementDlg::~XSElementDlg()
{
- activeTab = tabMenu->GetCurrent();
-
- delete closeButton;
- delete buttonFrame;
- delete buttonLayoutHints;
- delete frameLayoutHints;
- delete lHints;
- delete tabMenu;
- delete pTable;
- delete nameListBox;
- delete nameFrame;
- delete mnemonicListBox;
- delete mnemonicFrame;
- delete zListBox;
- delete zFrame;
- delete lHints2;
+ activeTab = tabMenu->GetCurrent();
+
+ delete closeButton;
+ delete buttonFrame;
+ delete buttonLayoutHints;
+ delete frameLayoutHints;
+ delete lHints;
+ delete tabMenu;
+ delete pTable;
+ delete nameListBox;
+ delete nameFrame;
+ delete mnemonicListBox;
+ delete mnemonicFrame;
+ delete zListBox;
+ delete zFrame;
+ delete lHints2;
} // ~XSElementDlg
/* ----- CloseWindow ----- */
void
XSElementDlg::CloseWindow()
{
- // --- Remember old position ---
- Window_t wdum;
- gVirtualX->TranslateCoordinates(GetId(), GetParent()->GetId(),
- 0, 0, LastWinX, LastWinY, wdum);
+ // --- Remember old position ---
+ Window_t wdum;
+ gVirtualX->TranslateCoordinates(GetId(), GetParent()->GetId(),
+ 0, 0, LastWinX, LastWinY, wdum);
- delete this;
+ delete this;
} // CloseWindow
/* ----- ProcessButton ----- */
Bool_t
XSElementDlg::ProcessButton(Long_t param)
{
- Int_t activeTab;
-
- switch (param) {
- case ELEM_OK:
- // Find active Tab
- activeTab = tabMenu->GetCurrent();
- if (activeTab==0)
- goto LERROR;
- else {
- switch (activeTab) {
- case 1:
- *selectedZ =
- nameListBox->CurrentZ();
- break;
- case 2:
- *selectedZ =
- mnemonicListBox->CurrentZ();
- break;
- case 3:
- *selectedZ =
- zListBox->CurrentZ();
- break;
- }
- if (*selectedZ==0)
- goto LERROR;
- }
- break;
-
- case ELEM_CANCEL:
- *selectedZ = 0;
- break;
- default:
- *selectedZ = param;
- break;
- }
- CloseWindow();
- return kTRUE;
+ Int_t activeTab;
+
+ switch (param) {
+ case ELEM_OK:
+ // Find active Tab
+ activeTab = tabMenu->GetCurrent();
+ if (activeTab==0)
+ goto LERROR;
+ else {
+ switch (activeTab) {
+ case 1:
+ *selectedZ =
+ nameListBox->CurrentZ();
+ break;
+ case 2:
+ *selectedZ =
+ mnemonicListBox->CurrentZ();
+ break;
+ case 3:
+ *selectedZ =
+ zListBox->CurrentZ();
+ break;
+ }
+ if (*selectedZ==0)
+ goto LERROR;
+ }
+ break;
+
+ case ELEM_CANCEL:
+ *selectedZ = 0;
+ break;
+ default:
+ *selectedZ = param;
+ break;
+ }
+ CloseWindow();
+ return kTRUE;
LERROR:
- // Issue a message to select an Element
- int retval;
- new TGMsgBox(fClient->GetRoot(), this, "Info",
- "Please Select one Element!",
- kMBIconAsterisk, kMBOk, &retval );
- return kFALSE;
+ // Issue a message to select an Element
+ int retval;
+ new TGMsgBox(fClient->GetRoot(), this, "Info",
+ "Please Select one Element!",
+ kMBIconAsterisk, kMBOk, &retval );
+ return kFALSE;
} // ProcessButton
/* ----- ProcessMessage ----- */
Bool_t
XSElementDlg::ProcessMessage(Long_t msg, Long_t param1, Long_t /*param2*/)
{
- switch (GET_MSG(msg)) {
- case kC_COMMAND:
- switch (GET_SUBMSG(msg)) {
- case kCM_BUTTON:
- ProcessButton(param1);
- break;
-
- default:
- break;
- }
- default:
- break;
- }
- return kTRUE;
+ switch (GET_MSG(msg)) {
+ case kC_COMMAND:
+ switch (GET_SUBMSG(msg)) {
+ case kCM_BUTTON:
+ ProcessButton(param1);
+ break;
+
+ default:
+ break;
+ }
+ default:
+ break;
+ }
+ return kTRUE;
} // ProcessMessage
diff --git a/test/periodic/XSElementDlg.h b/test/periodic/XSElementDlg.h
index 900b5340ed7..2152bc02376 100644
--- a/test/periodic/XSElementDlg.h
+++ b/test/periodic/XSElementDlg.h
@@ -18,35 +18,35 @@
class XSElementDlg : public TGTransientFrame
{
private:
- UInt_t *selectedZ;
-
- XSPeriodicTable *pTable;
- TGTab *tabMenu;
- TGButton *okButton,
- *closeButton;
- TGCompositeFrame *buttonFrame,
- *nameFrame,
- *mnemonicFrame,
- *zFrame;
- XSElementList *nameListBox,
- *mnemonicListBox,
- *zListBox;
- TGLayoutHints *buttonLayoutHints,
- *frameLayoutHints,
- *lHints,
- *lHints2;
+ UInt_t *selectedZ;
+
+ XSPeriodicTable *pTable;
+ TGTab *tabMenu;
+ TGButton *okButton,
+ *closeButton;
+ TGCompositeFrame *buttonFrame,
+ *nameFrame,
+ *mnemonicFrame,
+ *zFrame;
+ XSElementList *nameListBox,
+ *mnemonicListBox,
+ *zListBox;
+ TGLayoutHints *buttonLayoutHints,
+ *frameLayoutHints,
+ *lHints,
+ *lHints2;
public:
- XSElementDlg(const TGWindow *p, const TGWindow *main,
- UInt_t *retZ, UInt_t w=600, UInt_t h=350);
- ~XSElementDlg();
+ XSElementDlg(const TGWindow *p, const TGWindow *main,
+ UInt_t *retZ, UInt_t w=600, UInt_t h=350);
+ ~XSElementDlg();
- virtual void CloseWindow();
- virtual Bool_t ProcessButton(Long_t param);
- virtual Bool_t ProcessMessage(Long_t msg,
- Long_t param1, Long_t param2);
+ virtual void CloseWindow();
+ virtual Bool_t ProcessButton(Long_t param);
+ virtual Bool_t ProcessMessage(Long_t msg,
+ Long_t param1, Long_t param2);
- //ClassDef(XSElementDlg,1)
+ //ClassDef(XSElementDlg,1)
}; // XSElementDlg
#endif
diff --git a/test/periodic/XSElementList.cxx b/test/periodic/XSElementList.cxx
index 32f0ecae267..24b32f94b0f 100644
--- a/test/periodic/XSElementList.cxx
+++ b/test/periodic/XSElementList.cxx
@@ -22,34 +22,34 @@
/* ----- XSElementList ----- */
XSElementList::XSElementList(TGWindow* p, Int_t sortby)
- : TGListBox(p,50,50)
+ : TGListBox(p,50,50)
{
- UInt_t i;
- int *index = new int[XSelements->GetSize()];
+ UInt_t i;
+ int *index = new int[XSelements->GetSize()];
- sortBy = sortby;
+ sortBy = sortby;
- for (i=0; i<XSelements->GetSize(); i++)
- index[i] = i;
+ for (i=0; i<XSelements->GetSize(); i++)
+ index[i] = i;
- Sort(index);
+ Sort(index);
- for (i=0; i<XSelements->GetSize(); i++) {
- char str[100];
- Int_t Z = ElementString(index[i]+1, str);
- TGString *tgstr = new TGString(str);
- TGTextLBEntry *lbe = new TGTextLBEntry(fLbc,tgstr,Z,
- fixedGC,fixedFontStruct);
+ for (i=0; i<XSelements->GetSize(); i++) {
+ char str[100];
+ Int_t Z = ElementString(index[i]+1, str);
+ TGString *tgstr = new TGString(str);
+ TGTextLBEntry *lbe = new TGTextLBEntry(fLbc,tgstr,Z,
+ fixedGC,fixedFontStruct);
- TGLayoutHints *lhints = new TGLayoutHints(
- kLHintsExpandX | kLHintsTop);
+ TGLayoutHints *lhints = new TGLayoutHints(
+ kLHintsExpandX | kLHintsTop);
- fItemVsize = TMath::Max(fItemVsize, lbe->GetDefaultHeight());
+ fItemVsize = TMath::Max(fItemVsize, lbe->GetDefaultHeight());
- AddEntry((TGLBEntry*)lbe, lhints);
- }
+ AddEntry((TGLBEntry*)lbe, lhints);
+ }
- delete [] index;
+ delete [] index;
} // XSElementList
/* ----- ~XSElementList ----- */
@@ -61,116 +61,116 @@ XSElementList::~XSElementList()
Int_t
XSElementList::Compare(int i, int j) const
{
- switch (sortBy) {
- case XSEL_SORTBY_NAME:
- return strcmp(XSelements->Name(i+1),
- XSelements->Name(j+1));
+ switch (sortBy) {
+ case XSEL_SORTBY_NAME:
+ return strcmp(XSelements->Name(i+1),
+ XSelements->Name(j+1));
- case XSEL_SORTBY_MNEMONIC:
- return strcmp(XSelements->Mnemonic(i+1),
- XSelements->Mnemonic(j+1));
+ case XSEL_SORTBY_MNEMONIC:
+ return strcmp(XSelements->Mnemonic(i+1),
+ XSelements->Mnemonic(j+1));
- case XSEL_SORTBY_Z:
- return (i<j? -1 : i>j? 1 : 0);
+ case XSEL_SORTBY_Z:
+ return (i<j? -1 : i>j? 1 : 0);
- default:
- return 0;
- }
+ default:
+ return 0;
+ }
} // Compare
/* ----- Sort ----- */
void
XSElementList::Sort(int *index)
{
- // --- Perform a bubble sort ---
- for (UInt_t i=0; i<XSelements->GetSize(); i++) {
- int change = 0;
- for (UInt_t j=XSelements->GetSize()-1; j>i; j--) {
- if (Compare(index[j],index[j-1]) < 0) {
- int t = index[j];
- index[j] = index[j-1];
- index[j-1] = t;
- change = 1;
- }
- }
- if (!change)
- return;
- }
+ // --- Perform a bubble sort ---
+ for (UInt_t i=0; i<XSelements->GetSize(); i++) {
+ int change = 0;
+ for (UInt_t j=XSelements->GetSize()-1; j>i; j--) {
+ if (Compare(index[j],index[j-1]) < 0) {
+ int t = index[j];
+ index[j] = index[j-1];
+ index[j-1] = t;
+ change = 1;
+ }
+ }
+ if (!change)
+ return;
+ }
} // Sort
/* ----- ElementString ----- */
Int_t
XSElementList::ElementString(Int_t Z, char *buf)
{
- switch (sortBy) {
- case XSEL_SORTBY_NAME:
- sprintf(buf,"%-20s %-4s %d",
- XSelements->Name(Z),
- XSelements->Mnemonic(Z),
- Z);
- break;
-
- case XSEL_SORTBY_MNEMONIC:
- sprintf(buf,"%-4s %-20s %d",
- XSelements->Mnemonic(Z),
- XSelements->Name(Z),
- Z);
- break;
-
- case XSEL_SORTBY_Z:
- sprintf(buf,"%3d %-4s %-20s",
- Z,
- XSelements->Mnemonic(Z),
- XSelements->Name(Z));
- break;
- }
- return Z;
+ switch (sortBy) {
+ case XSEL_SORTBY_NAME:
+ sprintf(buf,"%-20s %-4s %d",
+ XSelements->Name(Z),
+ XSelements->Mnemonic(Z),
+ Z);
+ break;
+
+ case XSEL_SORTBY_MNEMONIC:
+ sprintf(buf,"%-4s %-20s %d",
+ XSelements->Mnemonic(Z),
+ XSelements->Name(Z),
+ Z);
+ break;
+
+ case XSEL_SORTBY_Z:
+ sprintf(buf,"%3d %-4s %-20s",
+ Z,
+ XSelements->Mnemonic(Z),
+ XSelements->Name(Z));
+ break;
+ }
+ return Z;
} // ElementString
/* ----- GetZ ------- */
UInt_t
XSElementList::GetZ( TGTextLBEntry *entry )
{
- if (entry == NULL) return 0;
+ if (entry == NULL) return 0;
- const TGString *txt = entry->GetText();
- if (txt == NULL) return 0;
+ const TGString *txt = entry->GetText();
+ if (txt == NULL) return 0;
- const char *str = txt->GetString();
- if (str == NULL) return 0;
+ const char *str = txt->GetString();
+ if (str == NULL) return 0;
- // Search the string for the Z
- while (*str && !isdigit(*str))
- str++;
- return atol(str);
+ // Search the string for the Z
+ while (*str && !isdigit(*str))
+ str++;
+ return atol(str);
} // GetZ
/* ----- SelectZ ----- */
void
XSElementList::SelectZ( UInt_t Z )
{
- TGTextLBEntry *f;
- TGFrameElement *el;
-
- if (Z<1 || Z>XSelements->GetSize()) return;
-
- TGLBContainer *ct = (TGLBContainer *) fVport->GetContainer();
-
- TIter next(ct->GetList());
- while ((el = (TGFrameElement *) next())) {
- f = (TGTextLBEntry *) el->fFrame;
- if (GetZ(f) == Z) {
- f->Activate(kTRUE);
- return;
- }
- }
- return;
+ TGTextLBEntry *f;
+ TGFrameElement *el;
+
+ if (Z<1 || Z>XSelements->GetSize()) return;
+
+ TGLBContainer *ct = (TGLBContainer *) fVport->GetContainer();
+
+ TIter next(ct->GetList());
+ while ((el = (TGFrameElement *) next())) {
+ f = (TGTextLBEntry *) el->fFrame;
+ if (GetZ(f) == Z) {
+ f->Activate(kTRUE);
+ return;
+ }
+ }
+ return;
} // SelectZ
/* ----- CurrentZ ----- */
UInt_t
XSElementList::CurrentZ( )
{
- TGTextLBEntry *entry = (TGTextLBEntry*)(GetSelectedEntry());
- return GetZ(entry);
+ TGTextLBEntry *entry = (TGTextLBEntry*)(GetSelectedEntry());
+ return GetZ(entry);
} // CurrentZ
diff --git a/test/periodic/XSElementList.h b/test/periodic/XSElementList.h
index b28a7048604..dd06640afc9 100644
--- a/test/periodic/XSElementList.h
+++ b/test/periodic/XSElementList.h
@@ -10,31 +10,31 @@
#include <TGListBox.h>
-#define XSEL_SORTBY_NAME 0
-#define XSEL_SORTBY_MNEMONIC 1
-#define XSEL_SORTBY_Z 2
+#define XSEL_SORTBY_NAME 0
+#define XSEL_SORTBY_MNEMONIC 1
+#define XSEL_SORTBY_Z 2
/* =================== XSElementList ===================== */
class XSElementList : public TGListBox
{
protected:
- Int_t sortBy;
+ Int_t sortBy;
public:
- XSElementList(TGWindow *p, Int_t sortby = XSEL_SORTBY_NAME);
- ~XSElementList();
+ XSElementList(TGWindow *p, Int_t sortby = XSEL_SORTBY_NAME);
+ ~XSElementList();
- void SelectZ(UInt_t Z);
- UInt_t CurrentZ();
+ void SelectZ(UInt_t Z);
+ UInt_t CurrentZ();
protected:
- Int_t Compare(int i, int j) const;
- Int_t Compare(const TObject *o) const { return TObject::Compare(o); }
- UInt_t GetZ( TGTextLBEntry *entry );
- void Sort(int *index);
- Int_t ElementString(Int_t idx, char *buf);
+ Int_t Compare(int i, int j) const;
+ Int_t Compare(const TObject *o) const { return TObject::Compare(o); }
+ UInt_t GetZ( TGTextLBEntry *entry );
+ void Sort(int *index);
+ Int_t ElementString(Int_t idx, char *buf);
- //ClassDef(XSElementList,1)
+ //ClassDef(XSElementList,1)
}; // XSElementList
#endif
diff --git a/test/periodic/XSElements.cxx b/test/periodic/XSElements.cxx
index cb5abe4c932..e8ca5a27829 100644
--- a/test/periodic/XSElements.cxx
+++ b/test/periodic/XSElements.cxx
@@ -15,35 +15,35 @@
/* =================== XSElement ===================== */
XSElement::XSElement()
{
- z = 0;
- name = NULL;
- symbol = NULL;
- isotope = NULL;
- atomic_weight = NULL;
- density = NULL;
- melting_point = NULL;
- boiling_point = NULL;
- oxidation_states = NULL;
- isotope = NULL;
+ z = 0;
+ name = NULL;
+ symbol = NULL;
+ isotope = NULL;
+ atomic_weight = NULL;
+ density = NULL;
+ melting_point = NULL;
+ boiling_point = NULL;
+ oxidation_states = NULL;
+ isotope = NULL;
} // XSElement
/* ---------- ~XSElement ----------- */
XSElement::~XSElement()
{
- if (name) free(name);
- if (symbol) free(symbol);
- if (atomic_weight) free(atomic_weight);
- if (density) free(density);
- if (melting_point) free(melting_point);
- if (boiling_point) free(boiling_point);
- if (oxidation_states) free(oxidation_states);
- for (int i=0; i<ni; i++) {
- free(isotope[i]);
- free(isotope_info[i]);
- }
- free(isotope);
- free(isotope_info);
- free(isotope_stable);
+ if (name) free(name);
+ if (symbol) free(symbol);
+ if (atomic_weight) free(atomic_weight);
+ if (density) free(density);
+ if (melting_point) free(melting_point);
+ if (boiling_point) free(boiling_point);
+ if (oxidation_states) free(oxidation_states);
+ for (int i=0; i<ni; i++) {
+ free(isotope[i]);
+ free(isotope_info[i]);
+ }
+ free(isotope);
+ free(isotope_info);
+ free(isotope_stable);
} // ~XSElement
/* ------- IsotopeInfo ------- */
@@ -51,11 +51,11 @@ XSElement::~XSElement()
const char*
XSElement::IsotopeInfo( const char *isot )
{
- for (int i=0; i<ni; i++)
- if (!strcmp(isotope[i],isot))
- return isotope_info[i];
+ for (int i=0; i<ni; i++)
+ if (!strcmp(isotope[i],isot))
+ return isotope_info[i];
- return "-";
+ return "-";
} // IsotopeInfo
/* ------- ReadLine ------- */
@@ -63,60 +63,60 @@ XSElement::IsotopeInfo( const char *isot )
char *
XSElement::ReadLine(FILE *f)
{
- char buf[256];
- char *p=buf;
- char ch;
-
- /* skip leading spaces */
- do {
- ch=fgetc(f);
- } while (isspace(ch));
-
- do {
- *p++ = ch;
- ch = fgetc(f);
- } while (ch != '\n');
- *p = 0;
- return strdup(buf);
+ char buf[256];
+ char *p=buf;
+ char ch;
+
+ /* skip leading spaces */
+ do {
+ ch=fgetc(f);
+ } while (isspace(ch));
+
+ do {
+ *p++ = ch;
+ ch = fgetc(f);
+ } while (ch != '\n');
+ *p = 0;
+ return strdup(buf);
} /* ReadLine */
/* ------- Read -------- */
void
XSElement::Read(FILE *f)
{
- char tmpsym[5], tmpname[30];
- fscanf(f,"%d %s %s %d",&z,tmpsym,tmpname,&ni);
+ char tmpsym[5], tmpname[30];
+ fscanf(f,"%d %s %s %d",&z,tmpsym,tmpname,&ni);
- symbol = strdup(tmpsym);
- name = strdup(tmpname);
+ symbol = strdup(tmpsym);
+ name = strdup(tmpname);
- if (ni==0) return;
+ if (ni==0) return;
- atomic_weight = ReadLine(f);
- density = ReadLine(f);
- melting_point = ReadLine(f);
- boiling_point = ReadLine(f);
- oxidation_states = ReadLine(f);
+ atomic_weight = ReadLine(f);
+ density = ReadLine(f);
+ melting_point = ReadLine(f);
+ boiling_point = ReadLine(f);
+ oxidation_states = ReadLine(f);
- isotope = (char **)malloc(ni*sizeof(char*));
- isotope_info = (char **)malloc(ni*sizeof(char*));
- isotope_stable = (Bool_t *)malloc(ni*sizeof(Bool_t));
+ isotope = (char **)malloc(ni*sizeof(char*));
+ isotope_info = (char **)malloc(ni*sizeof(char*));
+ isotope_stable = (Bool_t *)malloc(ni*sizeof(Bool_t));
- for (int i=0; i<ni; i++) {
- char ch;
- char buf[30];
+ for (int i=0; i<ni; i++) {
+ char ch;
+ char buf[30];
- /* get first character */
- ch = fgetc(f);
- if (ch != '*')
- ungetc(ch,f); // Put it back
+ /* get first character */
+ ch = fgetc(f);
+ if (ch != '*')
+ ungetc(ch,f); // Put it back
- fscanf(f,"%s",buf);
- isotope[i] = strdup(buf);
- isotope_info[i] = ReadLine(f);
+ fscanf(f,"%s",buf);
+ isotope[i] = strdup(buf);
+ isotope_info[i] = ReadLine(f);
- isotope_stable[i] = (ch=='*');
- }
+ isotope_stable[i] = (ch=='*');
+ }
} // Read
/* =================== XSElements ===================== */
@@ -124,38 +124,38 @@ XSElement::Read(FILE *f)
XSElements::XSElements(const char *filename)
{
- FILE *f;
+ FILE *f;
- if ((f=fopen(filename,"r"))==NULL) {
- fprintf(stderr,"XSElements::XSElements: Error opening file %s\n",filename);
- exit(0);
- }
+ if ((f=fopen(filename,"r"))==NULL) {
+ fprintf(stderr,"XSElements::XSElements: Error opening file %s\n",filename);
+ exit(0);
+ }
- fscanf(f,"%d",&NElements);
- elements = new TObjArray(NElements);
+ fscanf(f,"%d",&NElements);
+ elements = new TObjArray(NElements);
- for (UInt_t i=0; i<NElements; i++) {
- elements->Add(new XSElement());
- ((XSElement*)(*elements)[i])->Read(f);
- }
- fclose(f);
+ for (UInt_t i=0; i<NElements; i++) {
+ elements->Add(new XSElement());
+ ((XSElement*)(*elements)[i])->Read(f);
+ }
+ fclose(f);
} // XSElements
/* --------- ~XSElements ---------- */
XSElements::~XSElements()
{
- delete elements;
+ delete elements;
} // ~XSElements
/* --------- Find ----------- */
UInt_t
XSElements::Find(const char *str)
{
- for (UInt_t z=1; z<=NElements; z++) {
- if (!strcmp(str,Name(z)))
- return z;
- if (!strcmp(str,Mnemonic(z)))
- return z;
- }
- return 0;
+ for (UInt_t z=1; z<=NElements; z++) {
+ if (!strcmp(str,Name(z)))
+ return z;
+ if (!strcmp(str,Mnemonic(z)))
+ return z;
+ }
+ return 0;
} // Find
diff --git a/test/periodic/XSElements.h b/test/periodic/XSElements.h
index c6d862d461f..f657932d93c 100644
--- a/test/periodic/XSElements.h
+++ b/test/periodic/XSElements.h
@@ -10,82 +10,82 @@
#include <TObjArray.h>
enum Element_State {
- Element_GroundState,
- Element_Metastable,
- Element_SecondMetastable
+ Element_GroundState,
+ Element_Metastable,
+ Element_SecondMetastable
};
/* =================== XSElement ===================== */
class XSElement : public TObject
{
protected:
- Int_t z;
- char *name;
- char *symbol;
+ Int_t z;
+ char *name;
+ char *symbol;
- char *atomic_weight;
- char *density;
- char *melting_point;
- char *boiling_point;
- char *oxidation_states;
+ char *atomic_weight;
+ char *density;
+ char *melting_point;
+ char *boiling_point;
+ char *oxidation_states;
- Int_t ni;
- char **isotope;
- char **isotope_info;
- Bool_t *isotope_stable;
+ Int_t ni;
+ char **isotope;
+ char **isotope_info;
+ Bool_t *isotope_stable;
public:
- XSElement();
- ~XSElement();
-
- inline char* Name() const { return name; }
- inline char* Mnemonic() const { return symbol; }
- inline char* Symbol() const { return symbol; }
- inline char* AtomicWeight() const { return atomic_weight; }
- inline char* Density() const { return density; }
- inline char* MeltingPt() const { return melting_point; }
- inline char* BoilingPt() const { return boiling_point; }
- inline char* Oxidation() const { return oxidation_states; }
- inline Int_t Isotopes() const { return ni; }
- inline char* Isotope(int i) const { return isotope[i]; }
- const char* IsotopeInfo(const char *isotope);
- inline char* IsotopeInfo(int i)
- const { return isotope_info[i]; }
- inline Bool_t IsStable(int i) const { return isotope_stable[i]; }
-
- void Read(FILE *f);
- Int_t Read(const char *name) { return TObject::Read(name); }
+ XSElement();
+ ~XSElement();
+
+ inline char* Name() const { return name; }
+ inline char* Mnemonic() const { return symbol; }
+ inline char* Symbol() const { return symbol; }
+ inline char* AtomicWeight() const { return atomic_weight; }
+ inline char* Density() const { return density; }
+ inline char* MeltingPt() const { return melting_point; }
+ inline char* BoilingPt() const { return boiling_point; }
+ inline char* Oxidation() const { return oxidation_states; }
+ inline Int_t Isotopes() const { return ni; }
+ inline char* Isotope(int i) const { return isotope[i]; }
+ const char* IsotopeInfo(const char *isotope);
+ inline char* IsotopeInfo(int i)
+ const { return isotope_info[i]; }
+ inline Bool_t IsStable(int i) const { return isotope_stable[i]; }
+
+ void Read(FILE *f);
+ Int_t Read(const char *name) { return TObject::Read(name); }
protected:
- char* ReadLine(FILE *f);
- //ClassDef(XSElement,1)
+ char* ReadLine(FILE *f);
+ //ClassDef(XSElement,1)
}; // XSElement
/* =================== XSElements ===================== */
class XSElements : public TObject
{
protected:
- UInt_t NElements;
- TObjArray *elements;
+ UInt_t NElements;
+ TObjArray *elements;
public:
- XSElements( const char *filename );
- ~XSElements();
+ XSElements( const char *filename );
+ ~XSElements();
- inline UInt_t GetSize() const { return NElements; }
+ inline UInt_t GetSize() const { return NElements; }
- inline char* Name(Int_t Z)
- { return ((XSElement*)((*elements)[Z-1]))->Name(); }
+ inline char* Name(Int_t Z)
+ { return ((XSElement*)((*elements)[Z-1]))->Name(); }
- inline char* Mnemonic(Int_t Z)
- { return ((XSElement*)((*elements)[Z-1]))->Mnemonic(); }
+ inline char* Mnemonic(Int_t Z)
+ { return ((XSElement*)((*elements)[Z-1]))->Mnemonic(); }
- inline XSElement *Elem(Int_t Z)
- { return ((XSElement*)((*elements)[Z-1])); }
+ inline XSElement *Elem(Int_t Z)
+ { return ((XSElement*)((*elements)[Z-1])); }
- // Search for element either by name or mnemonic
- UInt_t Find(const char *str);
+ // Search for element either by name or mnemonic
+ UInt_t Find(const char *str);
- //ClassDef(XSElements,1)
+ //ClassDef(XSElements,1)
}; // XSElements
#endif
diff --git a/test/periodic/XSGraph.cxx b/test/periodic/XSGraph.cxx
index 099ebff372c..234fea90041 100644
--- a/test/periodic/XSGraph.cxx
+++ b/test/periodic/XSGraph.cxx
@@ -3,25 +3,25 @@
/* ===================== XSGraph ================= */
XSGraph::XSGraph( NdbMTReactionXS *reac )
{
- N = reac->Pairs();
+ N = reac->Pairs();
- X = new Float_t[N];
- Y = new Float_t[N];
+ X = new Float_t[N];
+ Y = new Float_t[N];
- for (int i=0; i<N; i++) {
- X[i] = reac->Energy(i);
- Y[i] = reac->XS(i);
- }
-
- graph = new TGraph(N,X,Y);
+ for (int i=0; i<N; i++) {
+ X[i] = reac->Energy(i);
+ Y[i] = reac->XS(i);
+ }
+
+ graph = new TGraph(N,X,Y);
} // XSGraph
/* ---------- ~XSGraph --------- */
XSGraph::~XSGraph()
{
- if (N) {
- delete [] X;
- delete [] Y;
- delete graph;
- }
+ if (N) {
+ delete [] X;
+ delete [] Y;
+ delete graph;
+ }
} // ~XSGraph
diff --git a/test/periodic/XSGraph.h b/test/periodic/XSGraph.h
index f75fe377082..4d156f0b731 100644
--- a/test/periodic/XSGraph.h
+++ b/test/periodic/XSGraph.h
@@ -15,30 +15,30 @@
class XSGraph : public TObject
{
protected:
- TString desc;
- Int_t Z;
- Int_t A;
+ TString desc;
+ Int_t Z;
+ Int_t A;
- Int_t N;
- Float_t *X;
- Float_t *Y;
+ Int_t N;
+ Float_t *X;
+ Float_t *Y;
- TGraph *graph;
+ TGraph *graph;
public:
- XSGraph()
- {
- N = 0;
- X = Y = NULL;
- graph = NULL;
- }
+ XSGraph()
+ {
+ N = 0;
+ X = Y = NULL;
+ graph = NULL;
+ }
- XSGraph( NdbMTReactionXS *reac );
- ~XSGraph();
+ XSGraph( NdbMTReactionXS *reac );
+ ~XSGraph();
- inline TGraph* GetGraph() { return graph; }
+ inline TGraph* GetGraph() { return graph; }
- //ClassDef(XSGraph,1)
+ //ClassDef(XSGraph,1)
}; // XSGraph
#endif
diff --git a/test/periodic/XSGui.cxx b/test/periodic/XSGui.cxx
index adee1839f54..fd2e5d6644c 100644
--- a/test/periodic/XSGui.cxx
+++ b/test/periodic/XSGui.cxx
@@ -25,217 +25,217 @@
//ClassImp(XSGui)
-const char *filetypes[] = { "All files", "*",
- "Data file", "*.dat",
- "ENDF files", "*.endf",
- 0, 0 };
+const char *filetypes[] = { "All files", "*",
+ "Data file", "*.dat",
+ "ENDF files", "*.endf",
+ 0, 0 };
/* ----- XSGui ----- */
XSGui::XSGui(const TGWindow *p, UInt_t w, UInt_t h)
- : TGMainFrame(p, w, h)
+: TGMainFrame(p, w, h)
{
- // Create the main frame. A TGMainFrame is a top level window.
-
- // Create menubar and popup menus. The hint objects are used to place
- // and group the different menu widgets with respect to eachother.
- menuBarLayout = new TGLayoutHints(
- kLHintsTop | kLHintsLeft | kLHintsExpandX,
- 0, 0, 1, 1);
- menuBarItemLayout = new TGLayoutHints(kLHintsTop | kLHintsLeft,
- 0, 4, 0, 0);
- menuBarHelpLayout = new TGLayoutHints(kLHintsTop | kLHintsRight);
-
- // Build up the menus
- // First the Main (FILE) menu
- fileMenu = new TGPopupMenu(fClient->GetRoot());
- fileMenu->AddEntry("&Open...", M_FILE_OPEN);
- fileMenu->AddEntry("&Save", M_FILE_SAVE);
- fileMenu->AddEntry("S&ave as...", M_FILE_SAVEAS);
- fileMenu->AddEntry("&Close", M_FILE_CLOSE);
- fileMenu->AddSeparator();
- fileMenu->AddEntry("&Print", M_FILE_PRINT);
- fileMenu->AddEntry("P&rint setup...", M_FILE_PRINT_SETUP);
- fileMenu->AddSeparator();
- fileMenu->AddEntry("E&xit", M_FILE_EXIT);
-
- fileMenu->DisableEntry(M_FILE_SAVEAS);
- fileMenu->DisableEntry(M_FILE_CLOSE);
-
- // The database menu and the current elements in graph
- elemMenu = new TGPopupMenu(fClient->GetRoot());
- elemMenu->AddEntry("&Reaction", M_ELEM_REACTION);
- elemMenu->AddEntry("&Modify", M_ELEM_MODIFY);
- elemMenu->AddEntry("&Clear", M_ELEM_CLEAR);
- elemMenu->AddSeparator();
- elemMenu->AddLabel("Current Elements in Graph");
-
- // The Currently Editing elements menu
- optMenu = new TGPopupMenu(fClient->GetRoot());
- optMenu->AddEntry("&Zoom", -1);
- optMenu->AddEntry("&Options", -1);
-
- // The Help Menu
- helpMenu = new TGPopupMenu(fClient->GetRoot());
- helpMenu->AddEntry("&About",M_HELP_ABOUT);
-
- // Menu button messages are handled by the main frame (i.e. "this")
- // ProcessMessage() method.
- fileMenu->Associate(this);
- elemMenu->Associate(this);
- optMenu->Associate(this);
- helpMenu->Associate(this);
-
- menuBar = new TGMenuBar(this, 1, 1, kHorizontalFrame);
- menuBar->AddPopup("&File", fileMenu, menuBarItemLayout);
- menuBar->AddPopup("&Element", elemMenu, menuBarItemLayout);
- menuBar->AddPopup("&Options", optMenu, menuBarItemLayout);
- menuBar->AddPopup("&Help", helpMenu, menuBarHelpLayout);
-
- AddFrame(menuBar, menuBarLayout);
-
- // Create a ROOT Canvas used for drawing...
- canvasWindow = new TRootEmbeddedCanvas("Canvas",this,
- 600,400);
-
- // Initialise the canvas
- canvas = canvasWindow->GetCanvas();
- canvas->SetFillColor(42);
- canvas->SetGrid();
- canvas->GetFrame()->SetFillColor(21);
- canvas->GetFrame()->SetBorderSize(6);
- canvas->SetLogx();
- canvas->SetLogy();
- canvas->Update();
-
- AddFrame(canvasWindow,
- new TGLayoutHints(kLHintsExpandX | kLHintsExpandY,
- 0, 0, 2, 2));
-
- statusBar = new TGStatusBar(this, 60, 20);
- AddFrame(statusBar, new TGLayoutHints(kLHintsBottom | kLHintsExpandX,
- 0, 0, 1, 0));
- statusBar->SetText(PRGNAME);
-
- SetWindowName(PRGNAME);
-
- MapSubwindows();
-
- // we need to use GetDefault...() to initialize the layout algorithm...
- Resize(GetDefaultSize());
-
- MapWindow();
+ // Create the main frame. A TGMainFrame is a top level window.
+
+ // Create menubar and popup menus. The hint objects are used to place
+ // and group the different menu widgets with respect to eachother.
+ menuBarLayout = new TGLayoutHints(
+ kLHintsTop | kLHintsLeft | kLHintsExpandX,
+ 0, 0, 1, 1);
+ menuBarItemLayout = new TGLayoutHints(kLHintsTop | kLHintsLeft,
+ 0, 4, 0, 0);
+ menuBarHelpLayout = new TGLayoutHints(kLHintsTop | kLHintsRight);
+
+ // Build up the menus
+ // First the Main (FILE) menu
+ fileMenu = new TGPopupMenu(fClient->GetRoot());
+ fileMenu->AddEntry("&Open...", M_FILE_OPEN);
+ fileMenu->AddEntry("&Save", M_FILE_SAVE);
+ fileMenu->AddEntry("S&ave as...", M_FILE_SAVEAS);
+ fileMenu->AddEntry("&Close", M_FILE_CLOSE);
+ fileMenu->AddSeparator();
+ fileMenu->AddEntry("&Print", M_FILE_PRINT);
+ fileMenu->AddEntry("P&rint setup...", M_FILE_PRINT_SETUP);
+ fileMenu->AddSeparator();
+ fileMenu->AddEntry("E&xit", M_FILE_EXIT);
+
+ fileMenu->DisableEntry(M_FILE_SAVEAS);
+ fileMenu->DisableEntry(M_FILE_CLOSE);
+
+ // The database menu and the current elements in graph
+ elemMenu = new TGPopupMenu(fClient->GetRoot());
+ elemMenu->AddEntry("&Reaction", M_ELEM_REACTION);
+ elemMenu->AddEntry("&Modify", M_ELEM_MODIFY);
+ elemMenu->AddEntry("&Clear", M_ELEM_CLEAR);
+ elemMenu->AddSeparator();
+ elemMenu->AddLabel("Current Elements in Graph");
+
+ // The Currently Editing elements menu
+ optMenu = new TGPopupMenu(fClient->GetRoot());
+ optMenu->AddEntry("&Zoom", -1);
+ optMenu->AddEntry("&Options", -1);
+
+ // The Help Menu
+ helpMenu = new TGPopupMenu(fClient->GetRoot());
+ helpMenu->AddEntry("&About",M_HELP_ABOUT);
+
+ // Menu button messages are handled by the main frame (i.e. "this")
+ // ProcessMessage() method.
+ fileMenu->Associate(this);
+ elemMenu->Associate(this);
+ optMenu->Associate(this);
+ helpMenu->Associate(this);
+
+ menuBar = new TGMenuBar(this, 1, 1, kHorizontalFrame);
+ menuBar->AddPopup("&File", fileMenu, menuBarItemLayout);
+ menuBar->AddPopup("&Element", elemMenu, menuBarItemLayout);
+ menuBar->AddPopup("&Options", optMenu, menuBarItemLayout);
+ menuBar->AddPopup("&Help", helpMenu, menuBarHelpLayout);
+
+ AddFrame(menuBar, menuBarLayout);
+
+ // Create a ROOT Canvas used for drawing...
+ canvasWindow = new TRootEmbeddedCanvas("Canvas",this,
+ 600,400);
+
+ // Initialise the canvas
+ canvas = canvasWindow->GetCanvas();
+ canvas->SetFillColor(42);
+ canvas->SetGrid();
+ canvas->GetFrame()->SetFillColor(21);
+ canvas->GetFrame()->SetBorderSize(6);
+ canvas->SetLogx();
+ canvas->SetLogy();
+ canvas->Update();
+
+ AddFrame(canvasWindow,
+ new TGLayoutHints(kLHintsExpandX | kLHintsExpandY,
+ 0, 0, 2, 2));
+
+ statusBar = new TGStatusBar(this, 60, 20);
+ AddFrame(statusBar, new TGLayoutHints(kLHintsBottom | kLHintsExpandX,
+ 0, 0, 1, 0));
+ statusBar->SetText(PRGNAME);
+
+ SetWindowName(PRGNAME);
+
+ MapSubwindows();
+
+ // we need to use GetDefault...() to initialize the layout algorithm...
+ Resize(GetDefaultSize());
+
+ MapWindow();
} // XSGui
/* ----- ~XSGui ----- */
XSGui::~XSGui()
{
- // Delete all created widgets.
- delete menuBarLayout;
- delete menuBarItemLayout;
- delete menuBarHelpLayout;
-
- delete fileMenu;
- delete elemMenu;
- delete optMenu;
- delete helpMenu;
-
- delete statusBar;
- delete canvasWindow;
+ // Delete all created widgets.
+ delete menuBarLayout;
+ delete menuBarItemLayout;
+ delete menuBarHelpLayout;
+
+ delete fileMenu;
+ delete elemMenu;
+ delete optMenu;
+ delete helpMenu;
+
+ delete statusBar;
+ delete canvasWindow;
} // ~XSGui
/* ----- CloseWindow ----- */
void
XSGui::CloseWindow()
{
- // Got close message for this MainFrame. Calls parent CloseWindow()
- // (which destroys the window) and terminate the application.
- // The close message is generated by the window manager when its close
- // window menu item is selected.
+ // Got close message for this MainFrame. Calls parent CloseWindow()
+ // (which destroys the window) and terminate the application.
+ // The close message is generated by the window manager when its close
+ // window menu item is selected.
- TGMainFrame::CloseWindow();
- gApplication->Terminate(0);
+ TGMainFrame::CloseWindow();
+ gApplication->Terminate(0);
} // CloseWindow
/* ----- ProcessMenuMessage ----- */
Bool_t
XSGui::ProcessMenuMessage( Long_t param )
{
- switch (param) {
- case M_FILE_OPEN:
- {
- static TString dir(".");
- TGFileInfo fi;
- fi.fFileTypes = filetypes;
- fi.fIniDir = StrDup(dir);
- new TGFileDialog(fClient->GetRoot(), this, kFDOpen, &fi);
- dir = fi.fIniDir;
- }
- break;
-
- case M_FILE_SAVE:
- printf("M_FILE_SAVE\n");
- break;
-
- case M_FILE_EXIT:
- // this also terminates theApp
- CloseWindow();
- break;
-
- case M_ELEM_REACTION:
- new XSReactionDlg(fClient->GetRoot(), this, 1, 500,600);
- break;
-
- case M_HELP_ABOUT:
- // About();
- int retval;
- new TGMsgBox(fClient->GetRoot(), this,
- "About", "About....",
- kMBIconAsterisk, kMBOk, &retval );
- break;
-
- default:
- break;
- }
- return kTRUE;
+ switch (param) {
+ case M_FILE_OPEN:
+ {
+ static TString dir(".");
+ TGFileInfo fi;
+ fi.fFileTypes = filetypes;
+ fi.fIniDir = StrDup(dir);
+ new TGFileDialog(fClient->GetRoot(), this, kFDOpen, &fi);
+ dir = fi.fIniDir;
+ }
+ break;
+
+ case M_FILE_SAVE:
+ printf("M_FILE_SAVE\n");
+ break;
+
+ case M_FILE_EXIT:
+ // this also terminates theApp
+ CloseWindow();
+ break;
+
+ case M_ELEM_REACTION:
+ new XSReactionDlg(fClient->GetRoot(), this, 1, 500,600);
+ break;
+
+ case M_HELP_ABOUT:
+ // About();
+ int retval;
+ new TGMsgBox(fClient->GetRoot(), this,
+ "About", "About....",
+ kMBIconAsterisk, kMBOk, &retval );
+ break;
+
+ default:
+ break;
+ }
+ return kTRUE;
} // ProcessMenuMessage
/* ----- ProcessMessage ----- */
Bool_t
XSGui::ProcessMessage(Long_t msg, Long_t param1, Long_t)
{
- // Handle messages send to the XSGui object.
- char str[100];
-
- switch (GET_MSG(msg)) {
-
- case kC_COMMAND:
- switch (GET_SUBMSG(msg)) {
-
- case kCM_BUTTON:
- snprintf(str,100,
- "Button was pressed, id = %ld\n",
- param1);
- statusBar->SetText(str);
- break;
-
- case kCM_MENUSELECT:
- if (param1>=0)
- statusBar->SetText(menuTip[param1]);
- else
- statusBar->SetText("Undefined Menu!");
- break;
-
- case kCM_MENU:
- ProcessMenuMessage(param1);
- break;
-
- default:
- break;
- }
- default:
- break;
- }
- return kTRUE;
+ // Handle messages send to the XSGui object.
+ char str[100];
+
+ switch (GET_MSG(msg)) {
+
+ case kC_COMMAND:
+ switch (GET_SUBMSG(msg)) {
+
+ case kCM_BUTTON:
+ snprintf(str,100,
+ "Button was pressed, id = %ld\n",
+ param1);
+ statusBar->SetText(str);
+ break;
+
+ case kCM_MENUSELECT:
+ if (param1>=0)
+ statusBar->SetText(menuTip[param1]);
+ else
+ statusBar->SetText("Undefined Menu!");
+ break;
+
+ case kCM_MENU:
+ ProcessMenuMessage(param1);
+ break;
+
+ default:
+ break;
+ }
+ default:
+ break;
+ }
+ return kTRUE;
} // ProcessMessage
//---- Main program ----------------------------------------------------------
@@ -245,14 +245,14 @@ TROOT root("GUI", "GUI test environment");
/* ----- main ----- */
int main(int ac, char *av[])
{
- TApplication theApp("App", &ac, av);
-
- XSGui mainWindow(gClient->GetRoot(), 400, 220);
-
- XSinitialise();
-
- theApp.Run();
-
- XSfinalise();
- return 0;
+ TApplication theApp("App", &ac, av);
+
+ XSGui mainWindow(gClient->GetRoot(), 400, 220);
+
+ XSinitialise();
+
+ theApp.Run();
+
+ XSfinalise();
+ return 0;
} // main
diff --git a/test/periodic/XSGui.h b/test/periodic/XSGui.h
index cd1dfd8fb11..46627329038 100644
--- a/test/periodic/XSGui.h
+++ b/test/periodic/XSGui.h
@@ -18,56 +18,56 @@
#include <TGTextEntry.h>
#include <TGFileDialog.h>
-#define PRGNAME "XSGui"
+#define PRGNAME "XSGui"
#define VERSION "1.0a"
-#define AUTHOR "V.Vlachoudis"
-#define DATE "Jun-1999"
-#define EMAIL "V.Vlachoudis@cern.ch"
+#define AUTHOR "V.Vlachoudis"
+#define DATE "Jun-1999"
+#define EMAIL "V.Vlachoudis@cern.ch"
-#define ABOUT PRGNAME" " VERSION"\n" \
- AUTHOR" " DATE \
- EMAIL
+#define ABOUT PRGNAME" "VERSION"\n" \
+ AUTHOR" "DATE \
+ EMAIL
/* ---- Define all the available commands ----- */
enum TCommandIdentifiers {
- M_FILE_OPEN,
- M_FILE_SAVE,
- M_FILE_SAVEAS,
- M_FILE_CLOSE,
- M_FILE_PRINT,
- M_FILE_PRINT_SETUP,
- M_FILE_EXIT,
-
- M_ELEM_REACTION,
- M_ELEM_MODIFY,
- M_ELEM_CLEAR,
-
- M_OPTION_ZOOM,
- M_OPTION_SETUP,
-
- M_HELP_ABOUT,
+ M_FILE_OPEN,
+ M_FILE_SAVE,
+ M_FILE_SAVEAS,
+ M_FILE_CLOSE,
+ M_FILE_PRINT,
+ M_FILE_PRINT_SETUP,
+ M_FILE_EXIT,
+
+ M_ELEM_REACTION,
+ M_ELEM_MODIFY,
+ M_ELEM_CLEAR,
+
+ M_OPTION_ZOOM,
+ M_OPTION_SETUP,
+
+ M_HELP_ABOUT,
};
/* --- Define the Help for each menu item --- */
// WARNING!!! MUST BE IN ALIGN WITH TCommandsIdentifiers
#ifdef __XSGUI_CXX
-static const char *menuTip[] = {
- "Open a file",
- "Save drawing",
- "Save drawing as",
- "Close current drawing",
- "Print drawing",
- "Printer Setup",
- "Exit from program",
-
- "Select a Reaction",
- "Edit/Modify/Delete the current graphs",
- "Clear Current Graph",
-
- "Zoom current image",
- "General graphic options",
-
- "About the program"
+static const char *menuTip[] = {
+ "Open a file",
+ "Save drawing",
+ "Save drawing as",
+ "Close current drawing",
+ "Print drawing",
+ "Printer Setup",
+ "Exit from program",
+
+ "Select a Reaction",
+ "Edit/Modify/Delete the current graphs",
+ "Clear Current Graph",
+
+ "Zoom current image",
+ "General graphic options",
+
+ "About the program"
};
#endif
@@ -75,29 +75,29 @@ static const char *menuTip[] = {
class XSGui : public TGMainFrame
{
private:
- TGMenuBar *menuBar;
+ TGMenuBar *menuBar;
- TGPopupMenu *fileMenu,
- *elemMenu,
- *optMenu,
- *helpMenu;
+ TGPopupMenu *fileMenu,
+ *elemMenu,
+ *optMenu,
+ *helpMenu;
- TGLayoutHints *menuBarLayout,
- *menuBarItemLayout,
- *menuBarHelpLayout;
+ TGLayoutHints *menuBarLayout,
+ *menuBarItemLayout,
+ *menuBarHelpLayout;
- TGStatusBar *statusBar;
+ TGStatusBar *statusBar;
public:
- XSGui(const TGWindow *p, UInt_t w, UInt_t h);
- virtual ~XSGui();
+ XSGui(const TGWindow *p, UInt_t w, UInt_t h);
+ virtual ~XSGui();
- virtual void CloseWindow();
- virtual Bool_t ProcessMessage(Long_t msg, Long_t param, Long_t);
+ virtual void CloseWindow();
+ virtual Bool_t ProcessMessage(Long_t msg, Long_t param, Long_t);
- Bool_t ProcessMenuMessage( Long_t param );
+ Bool_t ProcessMenuMessage( Long_t param );
- //ClassDef(XSGui,1)
+ //ClassDef(XSGui,1)
}; // XSGui
#endif
diff --git a/test/periodic/XSPeriodicTable.cxx b/test/periodic/XSPeriodicTable.cxx
index 44337de5da5..39688a6b121 100644
--- a/test/periodic/XSPeriodicTable.cxx
+++ b/test/periodic/XSPeriodicTable.cxx
@@ -17,95 +17,95 @@
/* =========== XSTblElement ============== */
XSTblElement::XSTblElement(const TGWindow *p, Int_t z, UInt_t color)
- : TGButton(p,z)
+ : TGButton(p,z)
{
- Z = z;
+ Z = z;
- char str[5];
- snprintf(str,5,"%d",Z);
- lZ = new TGLabel(this,str);
- lName = new TGLabel(this,XSelements->Mnemonic(Z), blueBoldGC);
+ char str[5];
+ snprintf(str,5,"%d",Z);
+ lZ = new TGLabel(this,str);
+ lName = new TGLabel(this,XSelements->Mnemonic(Z), blueBoldGC);
- ChangeBackground(color);
+ ChangeBackground(color);
- tpZ = NULL;
- tpName = NULL;
+ tpZ = NULL;
+ tpName = NULL;
} // XSTblElement
/* ----- ~XSTblElement ----- */
XSTblElement::~XSTblElement()
{
- delete lZ;
- delete lName;
- delete tpZ;
- delete tpName;
+ delete lZ;
+ delete lName;
+ delete tpZ;
+ delete tpName;
} // ~XSTblElement
/* ----- Layout ----- */
void
XSTblElement::Layout()
{
- int w = GetWidth() - 2*fBorderWidth;
- int h = (GetHeight() - 2*fBorderWidth) / 2;
+ int w = GetWidth() - 2*fBorderWidth;
+ int h = (GetHeight() - 2*fBorderWidth) / 2;
- lZ->MoveResize(fBorderWidth, fBorderWidth, w, h);
- lZ->MapWindow();
+ lZ->MoveResize(fBorderWidth, fBorderWidth, w, h);
+ lZ->MapWindow();
- lName->MoveResize(fBorderWidth, fBorderWidth+h, w, h);
- lName->MapWindow();
+ lName->MoveResize(fBorderWidth, fBorderWidth+h, w, h);
+ lName->MapWindow();
- if (tpZ == NULL) {
- tpZ = new TGToolTip(fClient->GetRoot(),
- lZ, XSelements->Name(Z), 1000);
- tpName = new TGToolTip(fClient->GetRoot(),
- lName, XSelements->Name(Z), 1000);
- }
+ if (tpZ == NULL) {
+ tpZ = new TGToolTip(fClient->GetRoot(),
+ lZ, XSelements->Name(Z), 1000);
+ tpName = new TGToolTip(fClient->GetRoot(),
+ lName, XSelements->Name(Z), 1000);
+ }
- TGButton::Layout();
+ TGButton::Layout();
} // Layout
/* ------ SetState ------ */
void
XSTblElement::SetState(EButtonState state, Bool_t emit)
{
- if (state != fState) {
- if (state==kButtonDown /*|| state==kButtonEngaged*/) {
- lZ->Move(lZ->GetX()+1, lZ->GetY()+1);
- lName->Move(lName->GetX()+1, lName->GetY()+1);
- } else
- if (state == kButtonUp) {
- lZ->Move(lZ->GetX()-1, lZ->GetY()-1);
- lName->Move(lName->GetX()-1, lName->GetY()-1);
- }
- }
-
- TGButton::SetState(state, emit);
+ if (state != fState) {
+ if (state==kButtonDown /*|| state==kButtonEngaged*/) {
+ lZ->Move(lZ->GetX()+1, lZ->GetY()+1);
+ lName->Move(lName->GetX()+1, lName->GetY()+1);
+ } else
+ if (state == kButtonUp) {
+ lZ->Move(lZ->GetX()-1, lZ->GetY()-1);
+ lName->Move(lName->GetX()-1, lName->GetY()-1);
+ }
+ }
+
+ TGButton::SetState(state, emit);
} // SetState
/* ------ SetState ------ */
void
XSTblElement::ChangeBackground( ULong_t color )
{
- lZ->ChangeBackground(color);
- lName->ChangeBackground(color);
+ lZ->ChangeBackground(color);
+ lName->ChangeBackground(color);
} // ChangeBackground
/////////////////////////////////////////////////////////////////////
//ClassImp(XSPeriodicTable)
-static Int_t colwidth[XSPTBL_COLS] =
- { 8, 5, 5, 2, 5,
- 5, 5, 5, 5, 5,
- 5, 5, 5, 5, 5,
- 5, 5, 5, 5, 5 };
-static Int_t colsum;
-static Int_t rowheight[XSPTBL_ROWS] =
- { 5, 5, 10, 10, 10, 10, 10, 10, 10, 3, 10, 10 };
-static Int_t rowsum;
-
-#define A(x) (Long_t)(char *)(x)
-static Long_t ptable[XSPTBL_ROWS][XSPTBL_COLS] = {
+static Int_t colwidth[XSPTBL_COLS] =
+ { 8, 5, 5, 2, 5,
+ 5, 5, 5, 5, 5,
+ 5, 5, 5, 5, 5,
+ 5, 5, 5, 5, 5 };
+static Int_t colsum;
+static Int_t rowheight[XSPTBL_ROWS] =
+ { 5, 5, 10, 10, 10, 10, 10, 10, 10, 3, 10, 10 };
+static Int_t rowsum;
+
+#define A(x) (Long_t)(char *)(x)
+static Long_t ptable[XSPTBL_ROWS][XSPTBL_COLS] = {
{ A("Group"), A("1"), A("2"), 0, A("3"), A("4"), A("5"), A("6"), A("7"),
A("8"), A("9"), A("10"), A("11"), A("12"), A("13"), A("14"), A("15"),
A("16"), A("17"), A("18") },
@@ -124,43 +124,43 @@ static Long_t ptable[XSPTBL_ROWS][XSPTBL_COLS] = {
#undef A
-#define COLORS 7
+#define COLORS 7
-//#define w 0xFFFFFFL // White
-//#define A 0xCCCCCCL // Gray
-//#define B 0xCCCCFFL // Blue
-//#define Y 0xFFFFCCL // Yellow
-//#define O 0xFFCCCCL // Orange
-//#define G 0xCCFFCCL // Green
+//#define w 0xFFFFFFL // White
+//#define A 0xCCCCCCL // Gray
+//#define B 0xCCCCFFL // Blue
+//#define Y 0xFFFFCCL // Yellow
+//#define O 0xFFCCCCL // Orange
+//#define G 0xCCFFCCL // Green
-#define w 0
-#define A 1
-#define B 2
-#define Y 3
-#define O 4
-#define G 5
+#define w 0
+#define A 1
+#define B 2
+#define Y 3
+#define O 4
+#define G 5
static const char *colorName[COLORS] = {
- "White",
- "#CCCCCC",
- "#CCCCFF",
- "#FFFFCC",
- "#FFCCCC",
- "#CCFFCC",
- "yellow",
+ "White",
+ "#CCCCCC",
+ "#CCCCFF",
+ "#FFFFCC",
+ "#FFCCCC",
+ "#CCFFCC",
+ "yellow",
/******
- "White",
- "LightGrey",
- "LightSteelBlue1",
- "lemon chiffon",
- "pink",
- "DarkSeaGreen1",
- "yellow",
+ "White",
+ "LightGrey",
+ "LightSteelBlue1",
+ "lemon chiffon",
+ "pink",
+ "DarkSeaGreen1",
+ "yellow",
*******/
- };
+ };
-static ULong_t colorPixels[COLORS];
+static ULong_t colorPixels[COLORS];
-static Byte_t ecolor[XSPTBL_ROWS][XSPTBL_COLS] = {
+static Byte_t ecolor[XSPTBL_ROWS][XSPTBL_COLS] = {
{ A,A,A,w,A, A,A,A,A,A, A,A,A,A,A, A,A,A,A,A },
{ A,w,w,w,w, w,w,w,w,w, w,w,w,w,w, w,w,w,w,w },
{ A,B,w,w,w, w,w,w,w,w, w,w,w,w,w, w,w,w,w,Y },
@@ -183,131 +183,131 @@ static Byte_t ecolor[XSPTBL_ROWS][XSPTBL_COLS] = {
/* ----- XSPeriodicTable ----- */
XSPeriodicTable::XSPeriodicTable(const TGWindow *msgWnd, const TGWindow* p,
- UInt_t w, UInt_t h)
- : TGCompositeFrame(p,w,h, kFitWidth | kFitHeight | kSunkenFrame)
+ UInt_t w, UInt_t h)
+ : TGCompositeFrame(p,w,h, kFitWidth | kFitHeight | kSunkenFrame)
{
- int i, j;
-
- rowsum = 0;
- for (j=0; j<XSPTBL_ROWS; j++)
- rowsum += rowheight[j];
-
- colsum = 0;
- for (j=0; j<XSPTBL_COLS; j++)
- colsum += colwidth[j];
-
- /** Initialise colors **/
- for (i=0; i<COLORS; i++)
- gClient->GetColorByName(colorName[i], colorPixels[i]);
-
- for (j=0; j<XSPTBL_ROWS; j++)
- for (i=0; i<XSPTBL_COLS; i++) {
- long val = ptable[j][i];
- int col = colorPixels[ecolor[j][i]];
- if (val) {
- if (val < 120) {
- elem[j][i] = new XSTblElement(this,
- val,col);
- ((XSTblElement*)elem[j][i])->Associate(msgWnd);
- } else {
- elem[j][i] = new TGLabel(this,
- (char*)val);
- elem[j][i]->ChangeBackground(col);
- }
- } else
- elem[j][i] = NULL;
- }
- ChangeBackground(colorPixels[0]);
-
- width = w;
- height = h;
+ int i, j;
+
+ rowsum = 0;
+ for (j=0; j<XSPTBL_ROWS; j++)
+ rowsum += rowheight[j];
+
+ colsum = 0;
+ for (j=0; j<XSPTBL_COLS; j++)
+ colsum += colwidth[j];
+
+ /** Initialise colors **/
+ for (i=0; i<COLORS; i++)
+ gClient->GetColorByName(colorName[i], colorPixels[i]);
+
+ for (j=0; j<XSPTBL_ROWS; j++)
+ for (i=0; i<XSPTBL_COLS; i++) {
+ long val = ptable[j][i];
+ int col = colorPixels[ecolor[j][i]];
+ if (val) {
+ if (val < 120) {
+ elem[j][i] = new XSTblElement(this,
+ val,col);
+ ((XSTblElement*)elem[j][i])->Associate(msgWnd);
+ } else {
+ elem[j][i] = new TGLabel(this,
+ (char*)val);
+ elem[j][i]->ChangeBackground(col);
+ }
+ } else
+ elem[j][i] = NULL;
+ }
+ ChangeBackground(colorPixels[0]);
+
+ width = w;
+ height = h;
} // XSPeriodicTable
/* ----- ~XSPeriodicTable ----- */
XSPeriodicTable::~XSPeriodicTable()
{
- for (int j=0; j<XSPTBL_ROWS; j++)
- for (int i=0; i<XSPTBL_COLS; i++)
- if (elem[j][i])
- delete elem[j][i];
+ for (int j=0; j<XSPTBL_ROWS; j++)
+ for (int i=0; i<XSPTBL_COLS; i++)
+ if (elem[j][i])
+ delete elem[j][i];
} // ~XSPeriodicTable
/* ----- Layout ----- */
void
XSPeriodicTable::Layout()
{
- int w, h;
- Float_t cwidth[XSPTBL_COLS];
- Float_t rheight[XSPTBL_ROWS];
-
- TGCompositeFrame::Layout();
-
- w = GetWidth() - 2*fBorderWidth - 4;
- h = GetHeight() - 2*fBorderWidth - 4;
-
- // --- Normalise height and widths ---
- for (int i=0; i<XSPTBL_COLS; i++) {
- cwidth[i] = (Float_t)(colwidth[i]*w)/(Float_t)colsum;
- }
-
- for (int i=0; i<XSPTBL_ROWS; i++) {
- rheight[i] = (Float_t)(rowheight[i]*h)/(Float_t)rowsum;
- }
-
- Float_t yt = fBorderWidth+2;
- for (int j=0; j<XSPTBL_ROWS; j++) {
- Float_t xl = fBorderWidth+2;
- for (int i=0; i<XSPTBL_COLS; i++) {
- if (j<10) {
- if (elem[j][i]) {
- elem[j][i]->MoveResize(
- (int)xl,
- (int)yt,
- (int)cwidth[i]-1,
- (int)rheight[j]-1);
- elem[j][i]->MapWindow();
- }
- xl += cwidth[i];
- } else {
- if (i<3) {
- Float_t w = cwidth[0]+cwidth[1]+
- cwidth[2];
- if (elem[j][0]) {
- elem[j][0]->MoveResize(
- (int)xl,
- (int)yt,
- (int)w-1,
- (int)rheight[j]-1);
- elem[j][0]->MapWindow();
- }
- xl += w;
- i = 2;
- } else {
- if (elem[j][i]) {
- elem[j][i]->MoveResize(
- (int)xl,
- (int)yt,
- (int)cwidth[i]-1,
- (int)rheight[j]-1);
- elem[j][i]->MapWindow();
- }
- xl += cwidth[i];
- }
- }
- }
- yt += rheight[j];
- }
+ int w, h;
+ Float_t cwidth[XSPTBL_COLS];
+ Float_t rheight[XSPTBL_ROWS];
+
+ TGCompositeFrame::Layout();
+
+ w = GetWidth() - 2*fBorderWidth - 4;
+ h = GetHeight() - 2*fBorderWidth - 4;
+
+ // --- Normalise height and widths ---
+ for (int i=0; i<XSPTBL_COLS; i++) {
+ cwidth[i] = (Float_t)(colwidth[i]*w)/(Float_t)colsum;
+ }
+
+ for (int i=0; i<XSPTBL_ROWS; i++) {
+ rheight[i] = (Float_t)(rowheight[i]*h)/(Float_t)rowsum;
+ }
+
+ Float_t yt = fBorderWidth+2;
+ for (int j=0; j<XSPTBL_ROWS; j++) {
+ Float_t xl = fBorderWidth+2;
+ for (int i=0; i<XSPTBL_COLS; i++) {
+ if (j<10) {
+ if (elem[j][i]) {
+ elem[j][i]->MoveResize(
+ (int)xl,
+ (int)yt,
+ (int)cwidth[i]-1,
+ (int)rheight[j]-1);
+ elem[j][i]->MapWindow();
+ }
+ xl += cwidth[i];
+ } else {
+ if (i<3) {
+ Float_t w = cwidth[0]+cwidth[1]+
+ cwidth[2];
+ if (elem[j][0]) {
+ elem[j][0]->MoveResize(
+ (int)xl,
+ (int)yt,
+ (int)w-1,
+ (int)rheight[j]-1);
+ elem[j][0]->MapWindow();
+ }
+ xl += w;
+ i = 2;
+ } else {
+ if (elem[j][i]) {
+ elem[j][i]->MoveResize(
+ (int)xl,
+ (int)yt,
+ (int)cwidth[i]-1,
+ (int)rheight[j]-1);
+ elem[j][i]->MapWindow();
+ }
+ xl += cwidth[i];
+ }
+ }
+ }
+ yt += rheight[j];
+ }
} // Layout
/* ----- SelectZ ----- */
void
XSPeriodicTable::SelectZ( ULong_t Z )
{
- // Find the selection and change the color
- for (int j=0; j<XSPTBL_ROWS; j++)
- for (int i=0; i<XSPTBL_COLS; i++)
- if ((ULong_t)ptable[j][i] == Z) {
- // Setting the background
- elem[j][i]->ChangeBackground(colorPixels[6]);
- }
+ // Find the selection and change the color
+ for (int j=0; j<XSPTBL_ROWS; j++)
+ for (int i=0; i<XSPTBL_COLS; i++)
+ if ((ULong_t)ptable[j][i] == Z) {
+ // Setting the background
+ elem[j][i]->ChangeBackground(colorPixels[6]);
+ }
} // SelectZ
diff --git a/test/periodic/XSPeriodicTable.h b/test/periodic/XSPeriodicTable.h
index 683eb6e73a1..686d9922ad4 100644
--- a/test/periodic/XSPeriodicTable.h
+++ b/test/periodic/XSPeriodicTable.h
@@ -17,50 +17,50 @@ class XSTblElement : public TGButton
friend class TGClient;
private:
- Int_t Z;
- TGLabel *lZ;
- TGToolTip *tpZ;
- TGLabel *lName;
- TGToolTip *tpName;
+ Int_t Z;
+ TGLabel *lZ;
+ TGToolTip *tpZ;
+ TGLabel *lName;
+ TGToolTip *tpName;
public:
- XSTblElement( const TGWindow *p, Int_t z, UInt_t color);
- ~XSTblElement();
- virtual void Layout();
- virtual TGDimension GetDefaultSize() const
- { return TGDimension(20,20); }
+ XSTblElement( const TGWindow *p, Int_t z, UInt_t color);
+ ~XSTblElement();
+ virtual void Layout();
+ virtual TGDimension GetDefaultSize() const
+ { return TGDimension(20,20); }
- virtual void SetState(EButtonState state, Bool_t emit = kFALSE);
+ virtual void SetState(EButtonState state, Bool_t emit = kFALSE);
- Int_t GetZ() const { return Z; }
- virtual void ChangeBackground( ULong_t color );
+ Int_t GetZ() const { return Z; }
+ virtual void ChangeBackground( ULong_t color );
- //ClassDef(XSTblElement,1)
+ //ClassDef(XSTblElement,1)
}; // XSTblElement
//////////////////////////////////////////////////////////////
-#define XSPTBL_ROWS 12
-#define XSPTBL_COLS 20
+#define XSPTBL_ROWS 12
+#define XSPTBL_COLS 20
/* ================== XSPeriodicTable ===================== */
class XSPeriodicTable : public TGCompositeFrame
{
private:
- Int_t width, height;
- TGFrame *elem[XSPTBL_ROWS][XSPTBL_COLS];
+ Int_t width, height;
+ TGFrame *elem[XSPTBL_ROWS][XSPTBL_COLS];
public:
- XSPeriodicTable(const TGWindow *msgWnd, const TGWindow* p,
- UInt_t w, UInt_t h);
- virtual ~XSPeriodicTable();
+ XSPeriodicTable(const TGWindow *msgWnd, const TGWindow* p,
+ UInt_t w, UInt_t h);
+ virtual ~XSPeriodicTable();
- virtual void SelectZ( ULong_t Z );
- virtual void Layout();
- virtual TGDimension GetDefaultSize() const
- { return TGDimension(width,height); }
+ virtual void SelectZ( ULong_t Z );
+ virtual void Layout();
+ virtual TGDimension GetDefaultSize() const
+ { return TGDimension(width,height); }
- //ClassDef(XSPeriodicTable,1)
+ //ClassDef(XSPeriodicTable,1)
}; // XSPeriodicTable
#endif
diff --git a/test/periodic/XSReactionDlg.cxx b/test/periodic/XSReactionDlg.cxx
index b97fb11ab5d..d9876798d57 100644
--- a/test/periodic/XSReactionDlg.cxx
+++ b/test/periodic/XSReactionDlg.cxx
@@ -25,632 +25,632 @@
//ClassImp(XSReactionDlg)
// Options for filling containers
-enum DirOptions {
- DIROnlyFiles,
- DIROnlyDirectories,
- DIRBoth
- };
+enum DirOptions {
+ DIROnlyFiles,
+ DIROnlyDirectories,
+ DIRBoth
+ };
// Options for creating the path
-enum PathOptions {
- PATHIsotope,
- PATHProjectile,
- PATHDatabase,
- PATHFile
- };
-
-enum XSReactionMessages {
- REAC_ELEMENT_STEP,
- REAC_TABLE,
- REAC_OK,
- REAC_EXEC,
- REAC_CLOSE,
- REAC_RESET,
- REAC_PTABLE
- };
-
-enum ComboIds {
- ISOTOPE_COMBO,
- PROJECTILE_COMBO,
- TEMPERATURE_COMBO,
- DATABASE_COMBO,
- LINE_WIDTH_COMBO,
- LINE_COLOR_COMBO,
- MARKER_STYLE_COMBO,
- MARKER_COLOR_COMBO,
- MARKER_SIZE_COMBO,
- ERRORBAR_COLOR_COMBO,
- REACTION_LISTBOX,
- };
-
-static Int_t LastWinX = -1;
-static Int_t LastWinY = -1;
+enum PathOptions {
+ PATHIsotope,
+ PATHProjectile,
+ PATHDatabase,
+ PATHFile
+ };
+
+enum XSReactionMessages {
+ REAC_ELEMENT_STEP,
+ REAC_TABLE,
+ REAC_OK,
+ REAC_EXEC,
+ REAC_CLOSE,
+ REAC_RESET,
+ REAC_PTABLE
+ };
+
+enum ComboIds {
+ ISOTOPE_COMBO,
+ PROJECTILE_COMBO,
+ TEMPERATURE_COMBO,
+ DATABASE_COMBO,
+ LINE_WIDTH_COMBO,
+ LINE_COLOR_COMBO,
+ MARKER_STYLE_COMBO,
+ MARKER_COLOR_COMBO,
+ MARKER_SIZE_COMBO,
+ ERRORBAR_COLOR_COMBO,
+ REACTION_LISTBOX,
+ };
+
+static Int_t LastWinX = -1;
+static Int_t LastWinY = -1;
/* ----- XSReactionDlg ----- */
XSReactionDlg::XSReactionDlg( const TGWindow *p,
- const TGWindow *main, UInt_t initZ, UInt_t w, UInt_t h)
- : TGTransientFrame(p,main,w,h)
+ const TGWindow *main, UInt_t initZ, UInt_t w, UInt_t h)
+ : TGTransientFrame(p,main,w,h)
{
- // Remember the main window
- mainWindow = main;
-
- /* ---------- Prepare the Layout Hints ------- */
- lHFixed = new TGLayoutHints(kLHintsTop | kLHintsLeft,
- 3, 3, 2, 2);
- lHExpX = new TGLayoutHints(kLHintsTop | kLHintsLeft | kLHintsExpandX,
- 3, 3, 2, 2);
- lHExpY = new TGLayoutHints(kLHintsTop | kLHintsLeft | kLHintsExpandY,
- 3, 3, 2, 2);
- lHExpXY = new TGLayoutHints(kLHintsTop | kLHintsLeft |
- kLHintsExpandX | kLHintsExpandY,
- 3, 3, 2, 2);
- lHBot = new TGLayoutHints(kLHintsBottom | kLHintsRight,
- 3, 3, 2, 2);
-
- lHExpXCen = new TGLayoutHints( kLHintsTop | kLHintsLeft |
- kLHintsExpandX | kLHintsCenterY,
- 5, 5, 2, 2);
- lHFixedCen = new TGLayoutHints( kLHintsTop | kLHintsLeft |
- kLHintsCenterY,
- 5, 5, 2, 2);
-
- /* --------- Create the Dialog -------------- */
- buttonFrame = new TGHorizontalFrame(this, 240, 20, kFixedWidth);
- okButton = new TGTextButton(buttonFrame, "&Ok", REAC_OK);
- okButton->Associate(this);
- execButton = new TGTextButton(buttonFrame, "&Execute", REAC_EXEC);
- execButton->Associate(this);
- resetButton = new TGTextButton(buttonFrame, "&Reset", REAC_RESET);
- resetButton->Associate(this);
- closeButton = new TGTextButton(buttonFrame, "&Close", REAC_CLOSE);
- closeButton->Associate(this);
-
- buttonFrame->AddFrame(okButton, lHExpX);
- buttonFrame->AddFrame(execButton, lHExpX);
- buttonFrame->AddFrame(resetButton, lHExpX);
- buttonFrame->AddFrame(closeButton, lHExpX);
- AddFrame(buttonFrame, lHBot);
-
- /* ------------ Material --------------- */
- materialGroup = new TGGroupFrame(this,"Material",kVerticalFrame);
-
- /* ----- First Sub-Frame ---- */
- frm1 = new TGHorizontalFrame(
- materialGroup, w, 36,
- kChildFrame|kFitWidth );
- frm1->ChangeBackground(0xFF00);
-
- elementLbl = new TGLabel(frm1,"Element:");
- elementLbl->SetTextJustify(kTextRight | kTextCenterY);
- frm1->AddFrame(elementLbl,lHFixedCen);
-
- elementBuf = new TGTextBuffer(20);
- elementText = new TGTextEntry(frm1,elementBuf);
- elementText->Resize(50, elementText->GetDefaultHeight());
- elementText->Associate(this);
- frm1->AddFrame(elementText,lHFixedCen);
-
- elementStep = new XSStepButton(frm1,REAC_ELEMENT_STEP);
- elementStep->Associate(this);
- frm1->AddFrame(elementStep,lHFixedCen);
-
- nameLbl = new TGLabel(frm1,"X",blueBoldGC);
- nameLbl->SetTextJustify(kTextLeft | kTextCenterY);
- frm1->AddFrame(nameLbl,lHExpXCen);
-
- ptableButton = new TGPictureButton(frm1,
- fClient->GetPicture(PTBL_ICON),
- REAC_PTABLE);
- ptableButton->SetToolTipText(
- "Choose the Element from the Periodic Table");
- ptableButton->Associate(this);
- frm1->AddFrame(ptableButton,lHFixedCen);
-
- materialGroup->AddFrame(frm1,lHExpX);
-
- /* ----- Second Sub-Frame ---- */
- frm2 = new TGHorizontalFrame(materialGroup,w,20,
- kChildFrame|kFitWidth);
-
- Vfrm1 = new TGCompositeFrame(frm2, w, 70,
- kChildFrame|kFitHeight|kFitWidth);
- Vfrm1->SetLayoutManager(new TGMatrixLayout(Vfrm1,0,4));
-
- chargeLbl = new TGLabel(Vfrm1,"Charge (Z):");
- chargeLbl->SetTextJustify(kTextRight | kTextCenterY);
- Vfrm1->AddFrame(chargeLbl);
-
- zLbl = new TGLabel(Vfrm1,"ZZZZZZZZ",blueBoldGC);
- zLbl->SetTextJustify(kTextLeft | kTextCenterY);
- Vfrm1->AddFrame(zLbl);
-
- massLbl = new TGLabel(Vfrm1,"Atomic Mass:");
- massLbl->SetTextJustify(kTextRight | kTextCenterY);
- Vfrm1->AddFrame(massLbl);
-
- massValLbl = new TGLabel(Vfrm1,"ZZZZZZZZ",blueBoldGC);
- massValLbl->SetTextJustify(kTextLeft | kTextCenterY);
- Vfrm1->AddFrame(massValLbl);
-
- densityLbl = new TGLabel(Vfrm1,"Density:");
- densityLbl->SetTextJustify(kTextRight | kTextCenterY);
- Vfrm1->AddFrame(densityLbl);
-
- densityValLbl = new TGLabel(Vfrm1,"ZZZZZZZZ",blueBoldGC);
- densityValLbl->SetTextJustify(kTextLeft | kTextCenterY);
- Vfrm1->AddFrame(densityValLbl);
-
- oxidationLbl = new TGLabel(Vfrm1,"Oxidation:");
- oxidationLbl->SetTextJustify(kTextRight | kTextCenterY);
- Vfrm1->AddFrame(oxidationLbl);
-
- oxidationValLbl = new TGLabel(Vfrm1,"ZZZZZZZZ",blueBoldGC);
- oxidationValLbl->SetTextJustify(kTextLeft | kTextCenterY);
- Vfrm1->AddFrame(oxidationValLbl);
-
- meltingPtLbl = new TGLabel(Vfrm1,"Melting Pt (C):");
- meltingPtLbl->SetTextJustify(kTextRight | kTextCenterY);
- Vfrm1->AddFrame(meltingPtLbl);
-
- meltingValLbl = new TGLabel(Vfrm1,"ZZZZZZZZ",blueBoldGC);
- meltingValLbl->SetTextJustify(kTextLeft | kTextCenterY);
- Vfrm1->AddFrame(meltingValLbl);
-
- boilingPtLbl = new TGLabel(Vfrm1,"Boiling Pt (C):");
- boilingPtLbl->SetTextJustify(kTextRight | kTextCenterY);
- Vfrm1->AddFrame(boilingPtLbl);
+ // Remember the main window
+ mainWindow = main;
+
+ /* ---------- Prepare the Layout Hints ------- */
+ lHFixed = new TGLayoutHints(kLHintsTop | kLHintsLeft,
+ 3, 3, 2, 2);
+ lHExpX = new TGLayoutHints(kLHintsTop | kLHintsLeft | kLHintsExpandX,
+ 3, 3, 2, 2);
+ lHExpY = new TGLayoutHints(kLHintsTop | kLHintsLeft | kLHintsExpandY,
+ 3, 3, 2, 2);
+ lHExpXY = new TGLayoutHints(kLHintsTop | kLHintsLeft |
+ kLHintsExpandX | kLHintsExpandY,
+ 3, 3, 2, 2);
+ lHBot = new TGLayoutHints(kLHintsBottom | kLHintsRight,
+ 3, 3, 2, 2);
+
+ lHExpXCen = new TGLayoutHints( kLHintsTop | kLHintsLeft |
+ kLHintsExpandX | kLHintsCenterY,
+ 5, 5, 2, 2);
+ lHFixedCen = new TGLayoutHints( kLHintsTop | kLHintsLeft |
+ kLHintsCenterY,
+ 5, 5, 2, 2);
+
+ /* --------- Create the Dialog -------------- */
+ buttonFrame = new TGHorizontalFrame(this, 240, 20, kFixedWidth);
+ okButton = new TGTextButton(buttonFrame, "&Ok", REAC_OK);
+ okButton->Associate(this);
+ execButton = new TGTextButton(buttonFrame, "&Execute", REAC_EXEC);
+ execButton->Associate(this);
+ resetButton = new TGTextButton(buttonFrame, "&Reset", REAC_RESET);
+ resetButton->Associate(this);
+ closeButton = new TGTextButton(buttonFrame, "&Close", REAC_CLOSE);
+ closeButton->Associate(this);
+
+ buttonFrame->AddFrame(okButton, lHExpX);
+ buttonFrame->AddFrame(execButton, lHExpX);
+ buttonFrame->AddFrame(resetButton, lHExpX);
+ buttonFrame->AddFrame(closeButton, lHExpX);
+ AddFrame(buttonFrame, lHBot);
+
+ /* ------------ Material --------------- */
+ materialGroup = new TGGroupFrame(this,"Material",kVerticalFrame);
+
+ /* ----- First Sub-Frame ---- */
+ frm1 = new TGHorizontalFrame(
+ materialGroup, w, 36,
+ kChildFrame|kFitWidth );
+ frm1->ChangeBackground(0xFF00);
+
+ elementLbl = new TGLabel(frm1,"Element:");
+ elementLbl->SetTextJustify(kTextRight | kTextCenterY);
+ frm1->AddFrame(elementLbl,lHFixedCen);
+
+ elementBuf = new TGTextBuffer(20);
+ elementText = new TGTextEntry(frm1,elementBuf);
+ elementText->Resize(50, elementText->GetDefaultHeight());
+ elementText->Associate(this);
+ frm1->AddFrame(elementText,lHFixedCen);
+
+ elementStep = new XSStepButton(frm1,REAC_ELEMENT_STEP);
+ elementStep->Associate(this);
+ frm1->AddFrame(elementStep,lHFixedCen);
+
+ nameLbl = new TGLabel(frm1,"X",blueBoldGC);
+ nameLbl->SetTextJustify(kTextLeft | kTextCenterY);
+ frm1->AddFrame(nameLbl,lHExpXCen);
+
+ ptableButton = new TGPictureButton(frm1,
+ fClient->GetPicture(PTBL_ICON),
+ REAC_PTABLE);
+ ptableButton->SetToolTipText(
+ "Choose the Element from the Periodic Table");
+ ptableButton->Associate(this);
+ frm1->AddFrame(ptableButton,lHFixedCen);
+
+ materialGroup->AddFrame(frm1,lHExpX);
+
+ /* ----- Second Sub-Frame ---- */
+ frm2 = new TGHorizontalFrame(materialGroup,w,20,
+ kChildFrame|kFitWidth);
+
+ Vfrm1 = new TGCompositeFrame(frm2, w, 70,
+ kChildFrame|kFitHeight|kFitWidth);
+ Vfrm1->SetLayoutManager(new TGMatrixLayout(Vfrm1,0,4));
+
+ chargeLbl = new TGLabel(Vfrm1,"Charge (Z):");
+ chargeLbl->SetTextJustify(kTextRight | kTextCenterY);
+ Vfrm1->AddFrame(chargeLbl);
+
+ zLbl = new TGLabel(Vfrm1,"ZZZZZZZZ",blueBoldGC);
+ zLbl->SetTextJustify(kTextLeft | kTextCenterY);
+ Vfrm1->AddFrame(zLbl);
+
+ massLbl = new TGLabel(Vfrm1,"Atomic Mass:");
+ massLbl->SetTextJustify(kTextRight | kTextCenterY);
+ Vfrm1->AddFrame(massLbl);
+
+ massValLbl = new TGLabel(Vfrm1,"ZZZZZZZZ",blueBoldGC);
+ massValLbl->SetTextJustify(kTextLeft | kTextCenterY);
+ Vfrm1->AddFrame(massValLbl);
+
+ densityLbl = new TGLabel(Vfrm1,"Density:");
+ densityLbl->SetTextJustify(kTextRight | kTextCenterY);
+ Vfrm1->AddFrame(densityLbl);
+
+ densityValLbl = new TGLabel(Vfrm1,"ZZZZZZZZ",blueBoldGC);
+ densityValLbl->SetTextJustify(kTextLeft | kTextCenterY);
+ Vfrm1->AddFrame(densityValLbl);
+
+ oxidationLbl = new TGLabel(Vfrm1,"Oxidation:");
+ oxidationLbl->SetTextJustify(kTextRight | kTextCenterY);
+ Vfrm1->AddFrame(oxidationLbl);
+
+ oxidationValLbl = new TGLabel(Vfrm1,"ZZZZZZZZ",blueBoldGC);
+ oxidationValLbl->SetTextJustify(kTextLeft | kTextCenterY);
+ Vfrm1->AddFrame(oxidationValLbl);
+
+ meltingPtLbl = new TGLabel(Vfrm1,"Melting Pt (C):");
+ meltingPtLbl->SetTextJustify(kTextRight | kTextCenterY);
+ Vfrm1->AddFrame(meltingPtLbl);
+
+ meltingValLbl = new TGLabel(Vfrm1,"ZZZZZZZZ",blueBoldGC);
+ meltingValLbl->SetTextJustify(kTextLeft | kTextCenterY);
+ Vfrm1->AddFrame(meltingValLbl);
+
+ boilingPtLbl = new TGLabel(Vfrm1,"Boiling Pt (C):");
+ boilingPtLbl->SetTextJustify(kTextRight | kTextCenterY);
+ Vfrm1->AddFrame(boilingPtLbl);
- boilingValLbl = new TGLabel(Vfrm1,"ZZZZZZZZ",blueBoldGC);
- boilingValLbl->SetTextJustify(kTextLeft | kTextCenterY);
- Vfrm1->AddFrame(boilingValLbl);
+ boilingValLbl = new TGLabel(Vfrm1,"ZZZZZZZZ",blueBoldGC);
+ boilingValLbl->SetTextJustify(kTextLeft | kTextCenterY);
+ Vfrm1->AddFrame(boilingValLbl);
- frm2->AddFrame(Vfrm1,lHExpX);
- materialGroup->AddFrame(frm2,lHExpX);
+ frm2->AddFrame(Vfrm1,lHExpX);
+ materialGroup->AddFrame(frm2,lHExpX);
- /* ----- Fourth Sub-Frame ---- */
- frm3 = new TGHorizontalFrame(materialGroup,w,20,
- kChildFrame|kFitWidth);
+ /* ----- Fourth Sub-Frame ---- */
+ frm3 = new TGHorizontalFrame(materialGroup,w,20,
+ kChildFrame|kFitWidth);
- isotopeLbl = new TGLabel(frm3,"Isotope (A):");
- isotopeLbl->SetTextJustify(kTextRight | kTextCenterY);
- frm3->AddFrame(isotopeLbl,lHFixedCen);
+ isotopeLbl = new TGLabel(frm3,"Isotope (A):");
+ isotopeLbl->SetTextJustify(kTextRight | kTextCenterY);
+ frm3->AddFrame(isotopeLbl,lHFixedCen);
- isotopeCombo = new TGComboBox(frm3,ISOTOPE_COMBO);
- isotopeCombo->Resize(80,20);
- isotopeCombo->Associate(this);
- frm3->AddFrame(isotopeCombo,lHFixedCen);
+ isotopeCombo = new TGComboBox(frm3,ISOTOPE_COMBO);
+ isotopeCombo->Resize(80,20);
+ isotopeCombo->Associate(this);
+ frm3->AddFrame(isotopeCombo,lHFixedCen);
- isotopeInfoLbl = new TGLabel(frm3,"Isotope Info:");
- isotopeInfoLbl->SetTextJustify(kTextRight | kTextCenterY);
- frm3->AddFrame(isotopeInfoLbl,lHFixedCen);
+ isotopeInfoLbl = new TGLabel(frm3,"Isotope Info:");
+ isotopeInfoLbl->SetTextJustify(kTextRight | kTextCenterY);
+ frm3->AddFrame(isotopeInfoLbl,lHFixedCen);
- isotopeInfoValLbl = new TGLabel(frm3,"MMMM",blueBoldGC);
- isotopeInfoValLbl->SetTextJustify(kTextLeft | kTextCenterY);
- frm3->AddFrame(isotopeInfoValLbl,lHExpXCen);
+ isotopeInfoValLbl = new TGLabel(frm3,"MMMM",blueBoldGC);
+ isotopeInfoValLbl->SetTextJustify(kTextLeft | kTextCenterY);
+ frm3->AddFrame(isotopeInfoValLbl,lHExpXCen);
- materialGroup->AddFrame(frm3,lHExpX);
+ materialGroup->AddFrame(frm3,lHExpX);
- AddFrame(materialGroup,lHExpX);
+ AddFrame(materialGroup,lHExpX);
- /* --------------- Reaction ------------------ */
- reactionGroup = new TGGroupFrame(this,"Reaction",kVerticalFrame);
+ /* --------------- Reaction ------------------ */
+ reactionGroup = new TGGroupFrame(this,"Reaction",kVerticalFrame);
- frm4 = new TGHorizontalFrame(reactionGroup,w,60,
- kChildFrame|kFitWidth);
+ frm4 = new TGHorizontalFrame(reactionGroup,w,60,
+ kChildFrame|kFitWidth);
- Vfrm2 = new TGCompositeFrame(frm4, 160, 70,
- kChildFrame|kFitHeight|kFitWidth);
+ Vfrm2 = new TGCompositeFrame(frm4, 160, 70,
+ kChildFrame|kFitHeight|kFitWidth);
- Vfrm2->SetLayoutManager(new TGMatrixLayout(Vfrm2,0,2));
+ Vfrm2->SetLayoutManager(new TGMatrixLayout(Vfrm2,0,2));
- projectileLbl = new TGLabel(Vfrm2,"Projectile:");
- projectileLbl->SetTextJustify(kTextRight | kTextCenterY);
- Vfrm2->AddFrame(projectileLbl);
+ projectileLbl = new TGLabel(Vfrm2,"Projectile:");
+ projectileLbl->SetTextJustify(kTextRight | kTextCenterY);
+ Vfrm2->AddFrame(projectileLbl);
- projectileCombo = new TGComboBox(Vfrm2,PROJECTILE_COMBO);
- projectileCombo->Resize(90,20);
- projectileCombo->Associate(this);
- Vfrm2->AddFrame(projectileCombo);
+ projectileCombo = new TGComboBox(Vfrm2,PROJECTILE_COMBO);
+ projectileCombo->Resize(90,20);
+ projectileCombo->Associate(this);
+ Vfrm2->AddFrame(projectileCombo);
- temperatureLbl = new TGLabel(Vfrm2,"Temperature:");
- temperatureLbl->SetTextJustify(kTextRight | kTextCenterY);
- Vfrm2->AddFrame(temperatureLbl);
+ temperatureLbl = new TGLabel(Vfrm2,"Temperature:");
+ temperatureLbl->SetTextJustify(kTextRight | kTextCenterY);
+ Vfrm2->AddFrame(temperatureLbl);
- temperatureCombo = new TGComboBox(Vfrm2,TEMPERATURE_COMBO);
- temperatureCombo->Resize(90,20);
- temperatureCombo->Associate(this);
- Vfrm2->AddFrame(temperatureCombo);
+ temperatureCombo = new TGComboBox(Vfrm2,TEMPERATURE_COMBO);
+ temperatureCombo->Resize(90,20);
+ temperatureCombo->Associate(this);
+ Vfrm2->AddFrame(temperatureCombo);
- databaseLbl = new TGLabel(Vfrm2,"Database:");
- databaseLbl->SetTextJustify(kTextRight | kTextCenterY);
- Vfrm2->AddFrame(databaseLbl);
+ databaseLbl = new TGLabel(Vfrm2,"Database:");
+ databaseLbl->SetTextJustify(kTextRight | kTextCenterY);
+ Vfrm2->AddFrame(databaseLbl);
- databaseCombo = new TGComboBox(Vfrm2,DATABASE_COMBO);
- databaseCombo->Resize(90,20);
- databaseCombo->Associate(this);
- Vfrm2->AddFrame(databaseCombo);
+ databaseCombo = new TGComboBox(Vfrm2,DATABASE_COMBO);
+ databaseCombo->Resize(90,20);
+ databaseCombo->Associate(this);
+ Vfrm2->AddFrame(databaseCombo);
- frm4->AddFrame(Vfrm2,lHExpXCen);
+ frm4->AddFrame(Vfrm2,lHExpXCen);
- reactionLbl = new TGLabel(frm4,"Reaction:");
- reactionLbl->SetTextJustify(kTextLeft | kTextCenterY);
- frm4->AddFrame(reactionLbl,lHFixedCen);
+ reactionLbl = new TGLabel(frm4,"Reaction:");
+ reactionLbl->SetTextJustify(kTextLeft | kTextCenterY);
+ frm4->AddFrame(reactionLbl,lHFixedCen);
- reactionList = new TGListBox(frm4,REACTION_LISTBOX);
- reactionList->Resize(70,80);
- //reactionList->SetMultipleSelections(kTRUE);
- reactionList->Associate(this);
- frm4->AddFrame(reactionList,lHExpXCen);
+ reactionList = new TGListBox(frm4,REACTION_LISTBOX);
+ reactionList->Resize(70,80);
+ //reactionList->SetMultipleSelections(kTRUE);
+ reactionList->Associate(this);
+ frm4->AddFrame(reactionList,lHExpXCen);
- reactionGroup->AddFrame(frm4,lHExpX);
+ reactionGroup->AddFrame(frm4,lHExpX);
- // --- Second sub frame ---
- frm5 = new TGHorizontalFrame(reactionGroup,w,20,
- kChildFrame|kFitWidth);
- reactionInfoLbl = new TGLabel(frm5,"Reaction Info:");
- reactionInfoLbl->SetTextJustify(kTextRight | kTextCenterY);
- frm5->AddFrame(reactionInfoLbl,lHFixedCen);
+ // --- Second sub frame ---
+ frm5 = new TGHorizontalFrame(reactionGroup,w,20,
+ kChildFrame|kFitWidth);
+ reactionInfoLbl = new TGLabel(frm5,"Reaction Info:");
+ reactionInfoLbl->SetTextJustify(kTextRight | kTextCenterY);
+ frm5->AddFrame(reactionInfoLbl,lHFixedCen);
- reactionInfoValLbl = new TGLabel(frm5,"-",blueBoldGC);
- reactionInfoValLbl->SetTextJustify(kTextLeft | kTextCenterY);
- frm5->AddFrame(reactionInfoValLbl,lHExpXCen);
+ reactionInfoValLbl = new TGLabel(frm5,"-",blueBoldGC);
+ reactionInfoValLbl->SetTextJustify(kTextLeft | kTextCenterY);
+ frm5->AddFrame(reactionInfoValLbl,lHExpXCen);
- reactionGroup->AddFrame(frm5,lHExpX);
+ reactionGroup->AddFrame(frm5,lHExpX);
- AddFrame(reactionGroup,lHExpX);
+ AddFrame(reactionGroup,lHExpX);
- /* --------------- Options ------------------ */
- optionGroup = new TGGroupFrame(this,"Options",kVerticalFrame);
+ /* --------------- Options ------------------ */
+ optionGroup = new TGGroupFrame(this,"Options",kVerticalFrame);
- Vfrm3 = new TGCompositeFrame(optionGroup, w, 70,
- kChildFrame|kFitHeight|kFitWidth);
+ Vfrm3 = new TGCompositeFrame(optionGroup, w, 70,
+ kChildFrame|kFitHeight|kFitWidth);
- Vfrm3->SetLayoutManager(new TGMatrixLayout(Vfrm3,0,4));
+ Vfrm3->SetLayoutManager(new TGMatrixLayout(Vfrm3,0,4));
- lineWidthLbl = new TGLabel(Vfrm3,"Line Width:");
- lineWidthLbl->SetTextJustify(kTextLeft | kTextCenterY);
- Vfrm3->AddFrame(lineWidthLbl);
+ lineWidthLbl = new TGLabel(Vfrm3,"Line Width:");
+ lineWidthLbl->SetTextJustify(kTextLeft | kTextCenterY);
+ Vfrm3->AddFrame(lineWidthLbl);
- lineWidthCombo = new TGComboBox(Vfrm3,LINE_WIDTH_COMBO);
- lineWidthCombo->Resize(100,20);
- lineWidthCombo->Associate(this);
- Vfrm3->AddFrame(lineWidthCombo);
+ lineWidthCombo = new TGComboBox(Vfrm3,LINE_WIDTH_COMBO);
+ lineWidthCombo->Resize(100,20);
+ lineWidthCombo->Associate(this);
+ Vfrm3->AddFrame(lineWidthCombo);
- lineColorLbl = new TGLabel(Vfrm3," Line Color:");
- lineColorLbl->SetTextJustify(kTextLeft | kTextCenterY);
- Vfrm3->AddFrame(lineColorLbl);
+ lineColorLbl = new TGLabel(Vfrm3," Line Color:");
+ lineColorLbl->SetTextJustify(kTextLeft | kTextCenterY);
+ Vfrm3->AddFrame(lineColorLbl);
- lineColorCombo = new TGComboBox(Vfrm3,LINE_COLOR_COMBO);
- lineColorCombo->Resize(100,20);
- lineColorCombo->Associate(this);
- Vfrm3->AddFrame(lineColorCombo);
+ lineColorCombo = new TGComboBox(Vfrm3,LINE_COLOR_COMBO);
+ lineColorCombo->Resize(100,20);
+ lineColorCombo->Associate(this);
+ Vfrm3->AddFrame(lineColorCombo);
- markerStyleLbl = new TGLabel(Vfrm3,"Marker Style:");
- markerStyleLbl->SetTextJustify(kTextLeft | kTextCenterY);
- Vfrm3->AddFrame(markerStyleLbl);
+ markerStyleLbl = new TGLabel(Vfrm3,"Marker Style:");
+ markerStyleLbl->SetTextJustify(kTextLeft | kTextCenterY);
+ Vfrm3->AddFrame(markerStyleLbl);
- markerStyleCombo = new TGComboBox(Vfrm3,MARKER_STYLE_COMBO);
- markerStyleCombo->Resize(100,20);
- markerStyleCombo->Associate(this);
- Vfrm3->AddFrame(markerStyleCombo);
+ markerStyleCombo = new TGComboBox(Vfrm3,MARKER_STYLE_COMBO);
+ markerStyleCombo->Resize(100,20);
+ markerStyleCombo->Associate(this);
+ Vfrm3->AddFrame(markerStyleCombo);
- markerColorLbl = new TGLabel(Vfrm3," Marker Color:");
- markerColorLbl->SetTextJustify(kTextLeft | kTextCenterY);
- Vfrm3->AddFrame(markerColorLbl);
+ markerColorLbl = new TGLabel(Vfrm3," Marker Color:");
+ markerColorLbl->SetTextJustify(kTextLeft | kTextCenterY);
+ Vfrm3->AddFrame(markerColorLbl);
- markerColorCombo = new TGComboBox(Vfrm3, MARKER_COLOR_COMBO);
- markerColorCombo->Resize(100,20);
- markerColorCombo->Associate(this);
- Vfrm3->AddFrame(markerColorCombo);
-
- markerSizeLbl = new TGLabel(Vfrm3,"Marker Size:");
- markerSizeLbl->SetTextJustify(kTextLeft | kTextCenterY);
- Vfrm3->AddFrame(markerSizeLbl);
-
- markerSizeCombo = new TGComboBox(Vfrm3, MARKER_SIZE_COMBO);
- markerSizeCombo->Resize(100,20);
- markerSizeCombo->Associate(this);
- Vfrm3->AddFrame(markerSizeCombo);
-
- errorbarColorLbl = new TGLabel(Vfrm3," ErrorBar Color:");
- errorbarColorLbl->SetTextJustify(kTextLeft | kTextCenterY);
- Vfrm3->AddFrame(errorbarColorLbl);
-
- errorbarColorCombo = new TGComboBox(Vfrm3,ERRORBAR_COLOR_COMBO);
- errorbarColorCombo->Resize(100,20);
- errorbarColorCombo->Associate(this);
- Vfrm3->AddFrame(errorbarColorCombo);
+ markerColorCombo = new TGComboBox(Vfrm3, MARKER_COLOR_COMBO);
+ markerColorCombo->Resize(100,20);
+ markerColorCombo->Associate(this);
+ Vfrm3->AddFrame(markerColorCombo);
+
+ markerSizeLbl = new TGLabel(Vfrm3,"Marker Size:");
+ markerSizeLbl->SetTextJustify(kTextLeft | kTextCenterY);
+ Vfrm3->AddFrame(markerSizeLbl);
+
+ markerSizeCombo = new TGComboBox(Vfrm3, MARKER_SIZE_COMBO);
+ markerSizeCombo->Resize(100,20);
+ markerSizeCombo->Associate(this);
+ Vfrm3->AddFrame(markerSizeCombo);
+
+ errorbarColorLbl = new TGLabel(Vfrm3," ErrorBar Color:");
+ errorbarColorLbl->SetTextJustify(kTextLeft | kTextCenterY);
+ Vfrm3->AddFrame(errorbarColorLbl);
+
+ errorbarColorCombo = new TGComboBox(Vfrm3,ERRORBAR_COLOR_COMBO);
+ errorbarColorCombo->Resize(100,20);
+ errorbarColorCombo->Associate(this);
+ Vfrm3->AddFrame(errorbarColorCombo);
- optionGroup->AddFrame(Vfrm3,lHExpX);
- AddFrame(optionGroup,lHExpX);
-
- /* -------------- Information ------------------ */
- infoGroup = new TGGroupFrame(this,"Information",kVerticalFrame);
-
- infoView = new TGTextView(infoGroup, 200, 100,
- kChildFrame | kSunkenFrame);
- infoGroup->AddFrame(infoView,lHExpXY);
-
- AddFrame(infoGroup, lHExpXY);
-
- /* --------- Initialize layout algorithm with Resize() -------- */
- MapSubwindows();
- Resize(GetDefaultSize());
-
- /* --------- Initialise with Element Z ---------- */
- SetElement(initZ);
- InitCombos();
+ optionGroup->AddFrame(Vfrm3,lHExpX);
+ AddFrame(optionGroup,lHExpX);
+
+ /* -------------- Information ------------------ */
+ infoGroup = new TGGroupFrame(this,"Information",kVerticalFrame);
+
+ infoView = new TGTextView(infoGroup, 200, 100,
+ kChildFrame | kSunkenFrame);
+ infoGroup->AddFrame(infoView,lHExpXY);
+
+ AddFrame(infoGroup, lHExpXY);
+
+ /* --------- Initialize layout algorithm with Resize() -------- */
+ MapSubwindows();
+ Resize(GetDefaultSize());
+
+ /* --------- Initialise with Element Z ---------- */
+ SetElement(initZ);
+ InitCombos();
- /* --------- Set Windows Position --------- */
- int ax, ay;
-
- if (LastWinX == -1) { // Go to the middle of parent window
- Window_t wdum;
- gVirtualX->TranslateCoordinates(main->GetId(), GetParent()->GetId(),
- (((TGFrame *) main)->GetWidth() - fWidth) >> 1,
- (((TGFrame *) main)->GetHeight() - fHeight) >> 1,
- ax, ay, wdum);
- ax = MAX(ax,0);
- ay = MAX(ay,0);
- } else {
- ax = LastWinX;
- ay = LastWinY;
- }
- Move(ax,ay);
- SetWMPosition(ax,ay);
-
- /* --------- Map everything -------- */
- SetWindowName("Select Element/Reaction");
- MapWindow();
+ /* --------- Set Windows Position --------- */
+ int ax, ay;
+
+ if (LastWinX == -1) { // Go to the middle of parent window
+ Window_t wdum;
+ gVirtualX->TranslateCoordinates(main->GetId(), GetParent()->GetId(),
+ (((TGFrame *) main)->GetWidth() - fWidth) >> 1,
+ (((TGFrame *) main)->GetHeight() - fHeight) >> 1,
+ ax, ay, wdum);
+ ax = MAX(ax,0);
+ ay = MAX(ay,0);
+ } else {
+ ax = LastWinX;
+ ay = LastWinY;
+ }
+ Move(ax,ay);
+ SetWMPosition(ax,ay);
+
+ /* --------- Map everything -------- */
+ SetWindowName("Select Element/Reaction");
+ MapWindow();
} // XSReactionDlg
/* ----- ~XSReactionDlg ----- */
XSReactionDlg::~XSReactionDlg()
{
- // --- Delete Layout Hints ---
- delete lHFixed;
- delete lHExpX;
- delete lHExpY;
- delete lHExpXY;
- delete lHFixedCen;
- delete lHExpXCen;
-
- // --- Delete Material Group ----
- delete elementLbl;
- delete elementText;
- delete elementStep;
- delete ptableButton;
- delete chargeLbl;
- delete zLbl;
- delete nameLbl;
- delete massLbl;
- delete massValLbl;
- delete densityLbl;
- delete densityValLbl;
- delete meltingPtLbl;
- delete meltingValLbl;
- delete boilingPtLbl;
- delete boilingValLbl;
- delete oxidationLbl;
- delete oxidationValLbl;
- delete isotopeInfoLbl;
- delete isotopeInfoValLbl;
- delete isotopeLbl;
- delete isotopeCombo;
- delete materialGroup;
-
- // --- Delete Reaction group ---
- delete projectileLbl;
- delete projectileCombo;
- delete temperatureLbl;
- delete temperatureCombo;
- delete databaseLbl;
- delete databaseCombo;
- delete reactionLbl;
- delete reactionList;
- delete reactionInfoLbl;
- delete reactionInfoValLbl;
- delete reactionGroup;
-
- // --- Option Group ----
- delete lineWidthLbl;
- delete lineColorLbl;
- delete markerStyleLbl;
- delete markerColorLbl;
- delete markerSizeLbl;
- delete errorbarColorLbl;
-
- delete lineWidthCombo;
- delete lineColorCombo;
- delete markerStyleCombo;
- delete markerColorCombo;
- delete markerSizeCombo;
- delete errorbarColorCombo;
-
- delete optionGroup;
-
- // --- Info Group ----
- delete infoView;
- delete infoGroup;
-
- // --- Frames ---
- delete frm1;
- delete frm2;
- delete frm3;
- delete frm4;
- delete frm5;
-
- delete Vfrm1;
- delete Vfrm2;
- delete Vfrm3;
-
- // --- Buttons ---
- delete okButton;
- delete execButton;
- delete resetButton;
- delete closeButton;
- delete buttonFrame;
+ // --- Delete Layout Hints ---
+ delete lHFixed;
+ delete lHExpX;
+ delete lHExpY;
+ delete lHExpXY;
+ delete lHFixedCen;
+ delete lHExpXCen;
+
+ // --- Delete Material Group ----
+ delete elementLbl;
+ delete elementText;
+ delete elementStep;
+ delete ptableButton;
+ delete chargeLbl;
+ delete zLbl;
+ delete nameLbl;
+ delete massLbl;
+ delete massValLbl;
+ delete densityLbl;
+ delete densityValLbl;
+ delete meltingPtLbl;
+ delete meltingValLbl;
+ delete boilingPtLbl;
+ delete boilingValLbl;
+ delete oxidationLbl;
+ delete oxidationValLbl;
+ delete isotopeInfoLbl;
+ delete isotopeInfoValLbl;
+ delete isotopeLbl;
+ delete isotopeCombo;
+ delete materialGroup;
+
+ // --- Delete Reaction group ---
+ delete projectileLbl;
+ delete projectileCombo;
+ delete temperatureLbl;
+ delete temperatureCombo;
+ delete databaseLbl;
+ delete databaseCombo;
+ delete reactionLbl;
+ delete reactionList;
+ delete reactionInfoLbl;
+ delete reactionInfoValLbl;
+ delete reactionGroup;
+
+ // --- Option Group ----
+ delete lineWidthLbl;
+ delete lineColorLbl;
+ delete markerStyleLbl;
+ delete markerColorLbl;
+ delete markerSizeLbl;
+ delete errorbarColorLbl;
+
+ delete lineWidthCombo;
+ delete lineColorCombo;
+ delete markerStyleCombo;
+ delete markerColorCombo;
+ delete markerSizeCombo;
+ delete errorbarColorCombo;
+
+ delete optionGroup;
+
+ // --- Info Group ----
+ delete infoView;
+ delete infoGroup;
+
+ // --- Frames ---
+ delete frm1;
+ delete frm2;
+ delete frm3;
+ delete frm4;
+ delete frm5;
+
+ delete Vfrm1;
+ delete Vfrm2;
+ delete Vfrm3;
+
+ // --- Buttons ---
+ delete okButton;
+ delete execButton;
+ delete resetButton;
+ delete closeButton;
+ delete buttonFrame;
} // ~XSReactionDlg
/* ----- InitColorCombo ----- */
void
XSReactionDlg::InitColorCombo(TGComboBox *cb)
{
- // Normaly this should be filled with color entries!!!
-
- cb->AddEntry("Black",0);
- cb->AddEntry("Red",1);
- cb->AddEntry("Green",2);
- cb->AddEntry("Blue",3);
- cb->AddEntry("Yellow",4);
- cb->AddEntry("Magenta",5);
- cb->AddEntry("Cyan",6);
- // .......
- cb->Select(0); // <<<< Should find the correct color...
+ // Normaly this should be filled with color entries!!!
+
+ cb->AddEntry("Black",0);
+ cb->AddEntry("Red",1);
+ cb->AddEntry("Green",2);
+ cb->AddEntry("Blue",3);
+ cb->AddEntry("Yellow",4);
+ cb->AddEntry("Magenta",5);
+ cb->AddEntry("Cyan",6);
+ // .......
+ cb->Select(0); // <<<< Should find the correct color...
} // InitColorCombos
/* ----- InitCombos ----- */
void
XSReactionDlg::InitCombos()
{
- InitColorCombo(lineColorCombo);
- InitColorCombo(markerColorCombo);
- InitColorCombo(errorbarColorCombo);
-
- /* ---- Line Widths ----- */
- lineWidthCombo->AddEntry("None",0);
- lineWidthCombo->AddEntry("1",1);
- lineWidthCombo->AddEntry("2",2);
- lineWidthCombo->AddEntry("3",3);
- lineWidthCombo->AddEntry("4",4);
- lineWidthCombo->AddEntry("5",5);
- lineWidthCombo->AddEntry("6",6);
- lineWidthCombo->AddEntry("7",7);
- lineWidthCombo->AddEntry("8",8);
- lineWidthCombo->AddEntry("9",9);
- lineWidthCombo->AddEntry("10",10);
- lineWidthCombo->Select(1);
- // --- Select the correct one ---
-
- /* ---- Marker Style ----- */
- markerStyleCombo->AddEntry("None",0);
- markerStyleCombo->AddEntry("Bullet",1);
- markerStyleCombo->AddEntry("Triangle Up",2);
- markerStyleCombo->AddEntry("Triangle Down",3);
- markerStyleCombo->AddEntry("Square",4);
- markerStyleCombo->AddEntry("Diamond",5);
- markerStyleCombo->AddEntry("Star",6);
- markerStyleCombo->AddEntry("Empty Bullet",7);
- markerStyleCombo->AddEntry("Empty Tri-Up",8);
- markerStyleCombo->AddEntry("Empty Tri-Down",9);
- markerStyleCombo->AddEntry("Empty Square",10);
- markerStyleCombo->Select(0);
- // --- Select the correct one ---
-
- /* ---- Marker Size ----- */
- markerSizeCombo->AddEntry("None",0);
- markerSizeCombo->AddEntry("0.1",1);
- markerSizeCombo->AddEntry("0.2",2);
- markerSizeCombo->AddEntry("0.3",3);
- markerSizeCombo->AddEntry("0.4",4);
- markerSizeCombo->AddEntry("0.5",5);
- markerSizeCombo->AddEntry("0.6",6);
- markerSizeCombo->AddEntry("0.7",7);
- markerSizeCombo->AddEntry("0.8",8);
- markerSizeCombo->AddEntry("0.9",9);
- markerSizeCombo->AddEntry("1.0",10);
- markerSizeCombo->Select(0);
-
- // --- Select the correct one ---
+ InitColorCombo(lineColorCombo);
+ InitColorCombo(markerColorCombo);
+ InitColorCombo(errorbarColorCombo);
+
+ /* ---- Line Widths ----- */
+ lineWidthCombo->AddEntry("None",0);
+ lineWidthCombo->AddEntry("1",1);
+ lineWidthCombo->AddEntry("2",2);
+ lineWidthCombo->AddEntry("3",3);
+ lineWidthCombo->AddEntry("4",4);
+ lineWidthCombo->AddEntry("5",5);
+ lineWidthCombo->AddEntry("6",6);
+ lineWidthCombo->AddEntry("7",7);
+ lineWidthCombo->AddEntry("8",8);
+ lineWidthCombo->AddEntry("9",9);
+ lineWidthCombo->AddEntry("10",10);
+ lineWidthCombo->Select(1);
+ // --- Select the correct one ---
+
+ /* ---- Marker Style ----- */
+ markerStyleCombo->AddEntry("None",0);
+ markerStyleCombo->AddEntry("Bullet",1);
+ markerStyleCombo->AddEntry("Triangle Up",2);
+ markerStyleCombo->AddEntry("Triangle Down",3);
+ markerStyleCombo->AddEntry("Square",4);
+ markerStyleCombo->AddEntry("Diamond",5);
+ markerStyleCombo->AddEntry("Star",6);
+ markerStyleCombo->AddEntry("Empty Bullet",7);
+ markerStyleCombo->AddEntry("Empty Tri-Up",8);
+ markerStyleCombo->AddEntry("Empty Tri-Down",9);
+ markerStyleCombo->AddEntry("Empty Square",10);
+ markerStyleCombo->Select(0);
+ // --- Select the correct one ---
+
+ /* ---- Marker Size ----- */
+ markerSizeCombo->AddEntry("None",0);
+ markerSizeCombo->AddEntry("0.1",1);
+ markerSizeCombo->AddEntry("0.2",2);
+ markerSizeCombo->AddEntry("0.3",3);
+ markerSizeCombo->AddEntry("0.4",4);
+ markerSizeCombo->AddEntry("0.5",5);
+ markerSizeCombo->AddEntry("0.6",6);
+ markerSizeCombo->AddEntry("0.7",7);
+ markerSizeCombo->AddEntry("0.8",8);
+ markerSizeCombo->AddEntry("0.9",9);
+ markerSizeCombo->AddEntry("1.0",10);
+ markerSizeCombo->Select(0);
+
+ // --- Select the correct one ---
} // InitCombos
/* ----- GetString ------- */
const char *
XSReactionDlg::GetString( int box )
{
- const TGLBEntry *entry;
- switch (box) {
- case ISOTOPE_COMBO:
- entry = isotopeCombo->GetSelectedEntry();
- break;
-
- case PROJECTILE_COMBO:
- entry = projectileCombo->GetSelectedEntry();
- break;
-
- case TEMPERATURE_COMBO:
- entry = temperatureCombo->GetSelectedEntry();
- break;
-
- case DATABASE_COMBO:
- entry = databaseCombo->GetSelectedEntry();
- break;
-
- case LINE_WIDTH_COMBO:
- entry = lineWidthCombo->GetSelectedEntry();
- break;
-
- case LINE_COLOR_COMBO:
- entry = lineColorCombo->GetSelectedEntry();
- break;
-
- case MARKER_STYLE_COMBO:
- entry = markerStyleCombo->GetSelectedEntry();
- break;
-
- case MARKER_COLOR_COMBO:
- entry = markerColorCombo->GetSelectedEntry();
- break;
-
- case MARKER_SIZE_COMBO:
- entry = markerSizeCombo->GetSelectedEntry();
- break;
-
- case ERRORBAR_COLOR_COMBO:
- entry = errorbarColorCombo->GetSelectedEntry();
- break;
-
- case REACTION_LISTBOX:
- entry = reactionList->GetSelectedEntry();
- break;
-
- default:
- entry = NULL;
- }
- if (entry==NULL) return NULL;
-
- return ((TGTextLBEntry*)entry)->GetText()->GetString();
+ const TGLBEntry *entry;
+ switch (box) {
+ case ISOTOPE_COMBO:
+ entry = isotopeCombo->GetSelectedEntry();
+ break;
+
+ case PROJECTILE_COMBO:
+ entry = projectileCombo->GetSelectedEntry();
+ break;
+
+ case TEMPERATURE_COMBO:
+ entry = temperatureCombo->GetSelectedEntry();
+ break;
+
+ case DATABASE_COMBO:
+ entry = databaseCombo->GetSelectedEntry();
+ break;
+
+ case LINE_WIDTH_COMBO:
+ entry = lineWidthCombo->GetSelectedEntry();
+ break;
+
+ case LINE_COLOR_COMBO:
+ entry = lineColorCombo->GetSelectedEntry();
+ break;
+
+ case MARKER_STYLE_COMBO:
+ entry = markerStyleCombo->GetSelectedEntry();
+ break;
+
+ case MARKER_COLOR_COMBO:
+ entry = markerColorCombo->GetSelectedEntry();
+ break;
+
+ case MARKER_SIZE_COMBO:
+ entry = markerSizeCombo->GetSelectedEntry();
+ break;
+
+ case ERRORBAR_COLOR_COMBO:
+ entry = errorbarColorCombo->GetSelectedEntry();
+ break;
+
+ case REACTION_LISTBOX:
+ entry = reactionList->GetSelectedEntry();
+ break;
+
+ default:
+ entry = NULL;
+ }
+ if (entry==NULL) return NULL;
+
+ return ((TGTextLBEntry*)entry)->GetText()->GetString();
} // GetString
/* ----- CreatePath ------ */
char*
XSReactionDlg::CreatePath( int option )
{
- static char path[256];
+ static char path[256];
- strlcpy(path, DBDIR,256); // Initialise directory
- strlcat(path, XSelements->Mnemonic(Z),256);
- strlcat(path, PATHSEP,256);
+ strlcpy(path, DBDIR,256); // Initialise directory
+ strlcat(path, XSelements->Mnemonic(Z),256);
+ strlcat(path, PATHSEP,256);
- if (option == PATHIsotope) return path;
+ if (option == PATHIsotope) return path;
- /* --- add the selected isotope --- */
- strlcat(path, GetString(ISOTOPE_COMBO),256);
- strlcat(path, PATHSEP,256);
+ /* --- add the selected isotope --- */
+ strlcat(path, GetString(ISOTOPE_COMBO),256);
+ strlcat(path, PATHSEP,256);
- if (option == PATHProjectile) return path;
+ if (option == PATHProjectile) return path;
- /* --- add the selected projectile --- */
- strlcat(path, GetString(PROJECTILE_COMBO),256);
- strlcat(path, PATHSEP,256);
+ /* --- add the selected projectile --- */
+ strlcat(path, GetString(PROJECTILE_COMBO),256);
+ strlcat(path, PATHSEP,256);
- if (option == PATHDatabase) return path;
+ if (option == PATHDatabase) return path;
- /* --- finally add the file --- */
- strlcat(path, GetString(DATABASE_COMBO),256);
+ /* --- finally add the file --- */
+ strlcat(path, GetString(DATABASE_COMBO),256);
- return path;
+ return path;
} // CreatePath
/* ----- UpdateContainer ----- */
@@ -660,274 +660,274 @@ XSReactionDlg::UpdateContainer( TGListBox *lb, char *path, int option)
const char *entry;
FileStat_t st;
- // --- First Remove everything ---
- lb->RemoveEntries(0,1000);
+ // --- First Remove everything ---
+ lb->RemoveEntries(0,1000);
- // Scan directory to update the combo box
+ // Scan directory to update the combo box
void *dirp = gSystem->OpenDirectory(path);
- if (dirp==NULL) {
- lb->AddEntry("-",0);
- return kTRUE; // Ooops not found
- }
-
- int i=0;
- while ((entry = gSystem->GetDirEntry(dirp))) {
- // Skip the . and .* directory entries
- if (entry[0] == '.') continue;
-
- char fn[256];
- strlcpy(fn,path,256);
- strlcat(fn,entry,256);
-
- gSystem->GetPathInfo(fn, st);
- if (((option == DIROnlyFiles) && !R_ISDIR(st.fMode)) ||
- ((option == DIROnlyDirectories) && R_ISDIR(st.fMode)) ||
- (option == DIRBoth)) {
- lb->AddEntry(entry,i++);
- }
- }
+ if (dirp==NULL) {
+ lb->AddEntry("-",0);
+ return kTRUE; // Ooops not found
+ }
+
+ int i=0;
+ while ((entry = gSystem->GetDirEntry(dirp))) {
+ // Skip the . and .* directory entries
+ if (entry[0] == '.') continue;
+
+ char fn[256];
+ strlcpy(fn,path,256);
+ strlcat(fn,entry,256);
+
+ gSystem->GetPathInfo(fn, st);
+ if (((option == DIROnlyFiles) && !R_ISDIR(st.fMode)) ||
+ ((option == DIROnlyDirectories) && R_ISDIR(st.fMode)) ||
+ (option == DIRBoth)) {
+ lb->AddEntry(entry,i++);
+ }
+ }
gSystem->FreeDirectory(dirp);
- if (i==0) {
- lb->AddEntry("None",0);
- return kTRUE; // Ooops not found
- }
- return kFALSE;
+ if (i==0) {
+ lb->AddEntry("None",0);
+ return kTRUE; // Ooops not found
+ }
+ return kFALSE;
} // UpdateContainer
/* ----- UpdateIsotopes ------ */
void
XSReactionDlg::UpdateIsotopes()
{
- // --- Update the isotopes ---
- UpdateContainer(
- isotopeCombo->GetListBox(),
- CreatePath(PATHIsotope),
- DIROnlyDirectories);
- isotopeCombo->Select(0);
+ // --- Update the isotopes ---
+ UpdateContainer(
+ isotopeCombo->GetListBox(),
+ CreatePath(PATHIsotope),
+ DIROnlyDirectories);
+ isotopeCombo->Select(0);
} // UpdateIsotopes
/* ----- UpdateProjectile ------ */
void
XSReactionDlg::UpdateProjectile()
{
- // --- Update the projectiles ---
- UpdateContainer(
- projectileCombo->GetListBox(),
- CreatePath(PATHProjectile),
- DIROnlyDirectories);
- projectileCombo->Select(0);
+ // --- Update the projectiles ---
+ UpdateContainer(
+ projectileCombo->GetListBox(),
+ CreatePath(PATHProjectile),
+ DIROnlyDirectories);
+ projectileCombo->Select(0);
} // UpdateProjectile
/* ----- UpdateDatabase ------ */
void
XSReactionDlg::UpdateDatabase()
{
- // --- Update the databases ---
- UpdateContainer(
- databaseCombo->GetListBox(),
- CreatePath(PATHDatabase),
- DIRBoth);
- databaseCombo->Select(0);
+ // --- Update the databases ---
+ UpdateContainer(
+ databaseCombo->GetListBox(),
+ CreatePath(PATHDatabase),
+ DIRBoth);
+ databaseCombo->Select(0);
} // UpdateDatabase
/* ----- UpdateReactions ------ */
void
XSReactionDlg::UpdateReactions()
{
- NdbMTDir elemDir;
+ NdbMTDir elemDir;
- reactionList->RemoveEntries(0,1000);
- infoView->Clear();
+ reactionList->RemoveEntries(0,1000);
+ infoView->Clear();
- if (elemDir.LoadENDF(CreatePath(PATHFile)))
- return;
+ if (elemDir.LoadENDF(CreatePath(PATHFile)))
+ return;
- int id = 0;
- for (int i=0; i<elemDir.Sections(); i++) {
- if (elemDir.DIRMF(i) == 3)
- reactionList->AddEntry(
- XSReactionDesc->GetShort(elemDir.DIRMT(i)),
- id++);
- }
+ int id = 0;
+ for (int i=0; i<elemDir.Sections(); i++) {
+ if (elemDir.DIRMF(i) == 3)
+ reactionList->AddEntry(
+ XSReactionDesc->GetShort(elemDir.DIRMT(i)),
+ id++);
+ }
reactionList->MapSubwindows();
- reactionList->Select(0);
+ reactionList->Select(0);
- // ------------------------------------------
- // Prepare a string with information
- TString info;
+ // ------------------------------------------
+ // Prepare a string with information
+ TString info;
- info.Append("Symbol name:\t\t");
- info.Append(elemDir.SymbolName());
+ info.Append("Symbol name:\t\t");
+ info.Append(elemDir.SymbolName());
- info.Append("\nLaboratory:\t\t");
- info.Append(elemDir.Laboratory());
+ info.Append("\nLaboratory:\t\t");
+ info.Append(elemDir.Laboratory());
- info.Append("\nEvaluation Date:\t");
- info.Append(elemDir.EvaluationDate());
+ info.Append("\nEvaluation Date:\t");
+ info.Append(elemDir.EvaluationDate());
- info.Append("\nAuthor(s):\t\t");
- info.Append(elemDir.Author());
+ info.Append("\nAuthor(s):\t\t");
+ info.Append(elemDir.Author());
- info.Append("\nReference:\t\t");
- info.Append(elemDir.Reference());
+ info.Append("\nReference:\t\t");
+ info.Append(elemDir.Reference());
- info.Append("\nDistribution Date:\t");
- info.Append(elemDir.DistributionDate());
- info.Append("\nLast Revision Date:\t");
- info.Append(elemDir.LastRevisionDate());
- info.Append("\nMaster Entry Date:\t");
- info.Append(elemDir.MasterEntryDate());
- info.Append("\n\n");
- info.Append(elemDir.GetInfo());
+ info.Append("\nDistribution Date:\t");
+ info.Append(elemDir.DistributionDate());
+ info.Append("\nLast Revision Date:\t");
+ info.Append(elemDir.LastRevisionDate());
+ info.Append("\nMaster Entry Date:\t");
+ info.Append(elemDir.MasterEntryDate());
+ info.Append("\n\n");
+ info.Append(elemDir.GetInfo());
- infoView->LoadBuffer(info.Data());
+ infoView->LoadBuffer(info.Data());
} // UpdateReactions
/* ----- UpdateCurIsotope ----- */
void
XSReactionDlg::UpdateCurIsotope()
{
- XSElement *elem = XSelements->Elem(Z);
-
- const char *str = GetString(ISOTOPE_COMBO);
- if (str)
- isotopeInfoValLbl->SetText(
- new TGString(elem->IsotopeInfo(str)));
- else
- isotopeInfoValLbl->SetText(new TGString("-"));
-
- // --- Update combos depending on isotope ---
- UpdateProjectile();
- UpdateDatabase();
- UpdateReactions();
+ XSElement *elem = XSelements->Elem(Z);
+
+ const char *str = GetString(ISOTOPE_COMBO);
+ if (str)
+ isotopeInfoValLbl->SetText(
+ new TGString(elem->IsotopeInfo(str)));
+ else
+ isotopeInfoValLbl->SetText(new TGString("-"));
+
+ // --- Update combos depending on isotope ---
+ UpdateProjectile();
+ UpdateDatabase();
+ UpdateReactions();
} // UpdateCurIsotope
/* ----- SetElement ----- */
void
XSReactionDlg::SetElement(UInt_t aZ)
{
- char str[5];
-
- Z = aZ;
- if (Z<1)
- Z = 1;
- else
- if (Z>XSelements->GetSize())
- Z = XSelements->GetSize();
-
-
- XSElement *elem = XSelements->Elem(Z);
-
- elementBuf->Clear();
- elementBuf->AddText(0,elem->Symbol());
- fClient->NeedRedraw(elementText);
- nameLbl->SetText(new TGString(elem->Name()));
-
- snprintf(str,5,"%d",Z);
- zLbl->SetText(new TGString(str));
-
- // --- Update several values for element ---
- massValLbl->SetText(new TGString(elem->AtomicWeight()));
- densityValLbl->SetText(new TGString(elem->Density()));
- densityValLbl->SetText(new TGString(elem->Density()));
- meltingValLbl->SetText(new TGString(elem->MeltingPt()));
- boilingValLbl->SetText(new TGString(elem->BoilingPt()));
- oxidationValLbl->SetText(new TGString(elem->Oxidation()));
-
- // --------------------------------
- UpdateIsotopes();
- UpdateCurIsotope();
-
- // --------------------------------
- // ---Update the rest of combos ---
- // --------------------------------
- temperatureCombo->RemoveEntries(0,1000);
- temperatureCombo->AddEntry("0",0);
- temperatureCombo->AddEntry("293",1);
- temperatureCombo->AddEntry("900",2);
- temperatureCombo->AddEntry("1000",3);
- temperatureCombo->Select(1);
-
-
- // Redraw everything
- fClient->NeedRedraw(this);
- Layout();
+ char str[5];
+
+ Z = aZ;
+ if (Z<1)
+ Z = 1;
+ else
+ if (Z>XSelements->GetSize())
+ Z = XSelements->GetSize();
+
+
+ XSElement *elem = XSelements->Elem(Z);
+
+ elementBuf->Clear();
+ elementBuf->AddText(0,elem->Symbol());
+ fClient->NeedRedraw(elementText);
+ nameLbl->SetText(new TGString(elem->Name()));
+
+ snprintf(str,5,"%d",Z);
+ zLbl->SetText(new TGString(str));
+
+ // --- Update several values for element ---
+ massValLbl->SetText(new TGString(elem->AtomicWeight()));
+ densityValLbl->SetText(new TGString(elem->Density()));
+ densityValLbl->SetText(new TGString(elem->Density()));
+ meltingValLbl->SetText(new TGString(elem->MeltingPt()));
+ boilingValLbl->SetText(new TGString(elem->BoilingPt()));
+ oxidationValLbl->SetText(new TGString(elem->Oxidation()));
+
+ // --------------------------------
+ UpdateIsotopes();
+ UpdateCurIsotope();
+
+ // --------------------------------
+ // ---Update the rest of combos ---
+ // --------------------------------
+ temperatureCombo->RemoveEntries(0,1000);
+ temperatureCombo->AddEntry("0",0);
+ temperatureCombo->AddEntry("293",1);
+ temperatureCombo->AddEntry("900",2);
+ temperatureCombo->AddEntry("1000",3);
+ temperatureCombo->Select(1);
+
+
+ // Redraw everything
+ fClient->NeedRedraw(this);
+ Layout();
} // SetElement
/* ----- CloseWindow ----- */
void
XSReactionDlg::CloseWindow()
{
- // --- Remember old position ---
- Window_t wdum;
- gVirtualX->TranslateCoordinates(GetId(), GetParent()->GetId(),
- 0, 0, LastWinX, LastWinY, wdum);
+ // --- Remember old position ---
+ Window_t wdum;
+ gVirtualX->TranslateCoordinates(GetId(), GetParent()->GetId(),
+ 0, 0, LastWinX, LastWinY, wdum);
- delete this;
+ delete this;
} // CloseWindow
/* ----- elementEntryChanged ---- */
void
XSReactionDlg::ElementEntryChanged()
{
- const char *name;
- UInt_t newZ;
-
- /* --- get contents --- */
- name = elementBuf->GetString();
-
- /* --- check if it is a number --- */
- newZ = atoi(name);
- if ((newZ>0) && (newZ<=XSelements->GetSize())) {
- SetElement(newZ);
- return;
- }
-
- /* Search for the specific element */
- newZ = XSelements->Find(name);
-
- if (newZ == 0) {
- // --- Error Entry ---
- // issue message and put the old one
- char msg[256];
- int retval;
- snprintf(msg,256,"Element %s not found!", elementBuf->GetString());
- new TGMsgBox(fClient->GetRoot(),this,"Not found",msg,
- kMBIconAsterisk,kMBOk,&retval);
- SetElement(Z);
- } else
- SetElement(newZ);
+ const char *name;
+ UInt_t newZ;
+
+ /* --- get contents --- */
+ name = elementBuf->GetString();
+
+ /* --- check if it is a number --- */
+ newZ = atoi(name);
+ if ((newZ>0) && (newZ<=XSelements->GetSize())) {
+ SetElement(newZ);
+ return;
+ }
+
+ /* Search for the specific element */
+ newZ = XSelements->Find(name);
+
+ if (newZ == 0) {
+ // --- Error Entry ---
+ // issue message and put the old one
+ char msg[256];
+ int retval;
+ snprintf(msg,256,"Element %s not found!", elementBuf->GetString());
+ new TGMsgBox(fClient->GetRoot(),this,"Not found",msg,
+ kMBIconAsterisk,kMBOk,&retval);
+ SetElement(Z);
+ } else
+ SetElement(newZ);
} // ElementEntryChanged
/* ----- UpdateGraph ---- */
void
XSReactionDlg::UpdateGraph( NdbMTReactionXS *xs )
{
- char title[256];
-
- //!!! --- Only if new ---
- //!!! --- Else update the old one ---
- XSGraph *gr = new XSGraph(xs);
-
- // Prepare the title
- snprintf(title,256,"%s-%s %s",
- XSelements->Mnemonic(Z),
- GetString(ISOTOPE_COMBO),
- xs->Description().Data()
- );
-
- gr->GetGraph()->SetTitle(title);
- gr->GetGraph()->SetFillColor(19);
- gr->GetGraph()->SetLineColor(2);
- gr->GetGraph()->SetLineWidth(2);
- gr->GetGraph()->Draw("ALW");
-
-// gr->GetGraph()->GetHistogram()->SetXTitle(TString("Energy (eV)"));
-// gr->GetGraph()->GetHistogram()->SetYTitle(TString("Cross Section (barn)"));
-
- Add2GraphList(gr);
- fClient->NeedRedraw(canvasWindow);
- fClient->NeedRedraw(const_cast<TGWindow*>(mainWindow));
+ char title[256];
+
+ //!!! --- Only if new ---
+ //!!! --- Else update the old one ---
+ XSGraph *gr = new XSGraph(xs);
+
+ // Prepare the title
+ snprintf(title,256,"%s-%s %s",
+ XSelements->Mnemonic(Z),
+ GetString(ISOTOPE_COMBO),
+ xs->Description().Data()
+ );
+
+ gr->GetGraph()->SetTitle(title);
+ gr->GetGraph()->SetFillColor(19);
+ gr->GetGraph()->SetLineColor(2);
+ gr->GetGraph()->SetLineWidth(2);
+ gr->GetGraph()->Draw("ALW");
+
+// gr->GetGraph()->GetHistogram()->SetXTitle(TString("Energy (eV)"));
+// gr->GetGraph()->GetHistogram()->SetYTitle(TString("Cross Section (barn)"));
+
+ Add2GraphList(gr);
+ fClient->NeedRedraw(canvasWindow);
+ fClient->NeedRedraw(const_cast<TGWindow*>(mainWindow));
canvas->Update();
} // UpdateGraph
@@ -935,142 +935,142 @@ XSReactionDlg::UpdateGraph( NdbMTReactionXS *xs )
Bool_t
XSReactionDlg::ExecCommand()
{
- // --- Load the data base ---
- NdbMTDir el;
- if (el.LoadENDF(CreatePath(PATHFile)))
- return kTRUE;
-
- // --- Get the selected reaction ---
- const char *reacstr = GetString(REACTION_LISTBOX);
-
- // --- Search for the reaction ---
- for (int i=0; i<el.Sections(); i++) {
- if (el.DIRMF(i) == 3 && XSReactionDesc->GetShort(el.DIRMT(i))) {
- if (reacstr && !strcmp(reacstr,
- XSReactionDesc->GetShort(el.DIRMT(i)))) {
- NdbMTReactionXS xs(el.DIRMT(i), reacstr);
- xs.LoadENDF(CreatePath(PATHFile));
-
- UpdateGraph(&xs);
- }
+ // --- Load the data base ---
+ NdbMTDir el;
+ if (el.LoadENDF(CreatePath(PATHFile)))
+ return kTRUE;
+
+ // --- Get the selected reaction ---
+ const char *reacstr = GetString(REACTION_LISTBOX);
+
+ // --- Search for the reaction ---
+ for (int i=0; i<el.Sections(); i++) {
+ if (el.DIRMF(i) == 3 && XSReactionDesc->GetShort(el.DIRMT(i))) {
+ if (reacstr && !strcmp(reacstr,
+ XSReactionDesc->GetShort(el.DIRMT(i)))) {
+ NdbMTReactionXS xs(el.DIRMT(i), reacstr);
+ xs.LoadENDF(CreatePath(PATHFile));
+
+ UpdateGraph(&xs);
+ }
}
}
- return kFALSE;
+ return kFALSE;
} // ExecCommand
/* ----- ProcessButton ----- */
Bool_t
XSReactionDlg::ProcessButton(Long_t param1, Long_t param2)
{
- UInt_t newZ;
- switch (param1) {
- case REAC_ELEMENT_STEP:
- if (param2==XSSTEPBUTTON_UP) {
- newZ = Z+1;
- if (newZ > XSelements->GetSize()) Z = 1;
- } else {
- newZ = Z-1;
- if (newZ<1) Z = XSelements->GetSize();
- }
- SetElement(newZ);
- break;
-
- case REAC_OK:
- // Execute the command and close the window
- if (!ExecCommand())
- CloseWindow();
- break;
-
- case REAC_EXEC:
- // Execute the command, but don't close the window
- ExecCommand();
- break;
-
- case REAC_RESET:
- SetElement(1);
- break;
-
- case REAC_CLOSE:
- CloseWindow();
- break;
-
- case REAC_PTABLE:
- newZ = Z;
- new XSElementDlg(fClient->GetRoot(), this, &newZ);
- if (newZ>0)
- SetElement(newZ);
- break;
-
- default:
- break;
- }
- return kTRUE;
+ UInt_t newZ;
+ switch (param1) {
+ case REAC_ELEMENT_STEP:
+ if (param2==XSSTEPBUTTON_UP) {
+ newZ = Z+1;
+ if (newZ > XSelements->GetSize()) Z = 1;
+ } else {
+ newZ = Z-1;
+ if (newZ<1) Z = XSelements->GetSize();
+ }
+ SetElement(newZ);
+ break;
+
+ case REAC_OK:
+ // Execute the command and close the window
+ if (!ExecCommand())
+ CloseWindow();
+ break;
+
+ case REAC_EXEC:
+ // Execute the command, but don't close the window
+ ExecCommand();
+ break;
+
+ case REAC_RESET:
+ SetElement(1);
+ break;
+
+ case REAC_CLOSE:
+ CloseWindow();
+ break;
+
+ case REAC_PTABLE:
+ newZ = Z;
+ new XSElementDlg(fClient->GetRoot(), this, &newZ);
+ if (newZ>0)
+ SetElement(newZ);
+ break;
+
+ default:
+ break;
+ }
+ return kTRUE;
} // ProcessButton
/* ----- ProcessCombo ------ */
Bool_t
XSReactionDlg::ProcessCombo( Long_t param1, Long_t param2 )
{
- printf("ComboMessage %ld %ld\n",param1,param2);
-
- switch (param1) {
- case ISOTOPE_COMBO:
- UpdateCurIsotope();
- break;
-
- case PROJECTILE_COMBO:
- UpdateDatabase();
- UpdateReactions();
- break;
-
- case DATABASE_COMBO:
- UpdateReactions();
- break;
-
- case REACTION_LISTBOX:
-////// reactionInfoValLbl->SetText(
-////// new TGString(elem->IsotopeInfo(str)));
- break;
-
- default:
- // Ooops an error in the code
- break;
- }
+ printf("ComboMessage %ld %ld\n",param1,param2);
+
+ switch (param1) {
+ case ISOTOPE_COMBO:
+ UpdateCurIsotope();
+ break;
+
+ case PROJECTILE_COMBO:
+ UpdateDatabase();
+ UpdateReactions();
+ break;
+
+ case DATABASE_COMBO:
+ UpdateReactions();
+ break;
+
+ case REACTION_LISTBOX:
+////// reactionInfoValLbl->SetText(
+////// new TGString(elem->IsotopeInfo(str)));
+ break;
+
+ default:
+ // Ooops an error in the code
+ break;
+ }
- return kTRUE;
+ return kTRUE;
} // ProcessCombo
/* ----- ProcessMessage ----- */
Bool_t
XSReactionDlg::ProcessMessage(Long_t msg, Long_t param1, Long_t param2)
{
- printf("Message = %d (%d)\n", GET_MSG(msg), GET_SUBMSG(msg));
-
- switch (GET_MSG(msg)) {
- case kC_COMMAND:
- switch (GET_SUBMSG(msg)) {
- case kCM_BUTTON:
- ProcessButton(param1,param2);
- break;
-
- case kCM_COMBOBOX:
- ProcessCombo(param1,param2);
- break;
-
- default:
- break;
- }
- case kC_TEXTENTRY:
- switch (GET_SUBMSG(msg)) {
- case kTE_ENTER:
- ElementEntryChanged();
- break;
- default:
- break;
- }
- default:
-// printf("Message = %d (%d)\n", GET_MSG(msg), GET_SUBMSG(msg));
- break;
- }
- return kTRUE;
+ printf("Message = %d (%d)\n", GET_MSG(msg), GET_SUBMSG(msg));
+
+ switch (GET_MSG(msg)) {
+ case kC_COMMAND:
+ switch (GET_SUBMSG(msg)) {
+ case kCM_BUTTON:
+ ProcessButton(param1,param2);
+ break;
+
+ case kCM_COMBOBOX:
+ ProcessCombo(param1,param2);
+ break;
+
+ default:
+ break;
+ }
+ case kC_TEXTENTRY:
+ switch (GET_SUBMSG(msg)) {
+ case kTE_ENTER:
+ ElementEntryChanged();
+ break;
+ default:
+ break;
+ }
+ default:
+// printf("Message = %d (%d)\n", GET_MSG(msg), GET_SUBMSG(msg));
+ break;
+ }
+ return kTRUE;
} // ProcessMessage
diff --git a/test/periodic/XSReactionDlg.h b/test/periodic/XSReactionDlg.h
index 3b061ba255c..6aad2a0826f 100644
--- a/test/periodic/XSReactionDlg.h
+++ b/test/periodic/XSReactionDlg.h
@@ -26,141 +26,141 @@ class XSReactionDlg : public TGTransientFrame
{
protected:
- UInt_t Z;
+ UInt_t Z;
- const TGWindow *mainWindow;
+ const TGWindow *mainWindow;
- TGHorizontalFrame *frm1,
- *frm2,
- *frm3,
- *frm4,
- *frm5;
+ TGHorizontalFrame *frm1,
+ *frm2,
+ *frm3,
+ *frm4,
+ *frm5;
- TGCompositeFrame *Vfrm1,
- *Vfrm2,
- *Vfrm3;
+ TGCompositeFrame *Vfrm1,
+ *Vfrm2,
+ *Vfrm3;
- TGLayoutHints *lHFixed,
- *lHExpX,
- *lHExpY,
- *lHExpXY,
- *lHBot,
- *lHExpXCen,
- *lHFixedCen;
+ TGLayoutHints *lHFixed,
+ *lHExpX,
+ *lHExpY,
+ *lHExpXY,
+ *lHBot,
+ *lHExpXCen,
+ *lHFixedCen;
- // ---- Material Items ----
- TGGroupFrame *materialGroup;
+ // ---- Material Items ----
+ TGGroupFrame *materialGroup;
- TGLabel *elementLbl;
- TGTextBuffer *elementBuf; //!
- TGTextEntry *elementText;
- XSStepButton *elementStep;
+ TGLabel *elementLbl;
+ TGTextBuffer *elementBuf; //!
+ TGTextEntry *elementText;
+ XSStepButton *elementStep;
- TGLabel *nameLbl,
- *mnemonicLbl,
+ TGLabel *nameLbl,
+ *mnemonicLbl,
- *chargeLbl,
- *zLbl,
+ *chargeLbl,
+ *zLbl,
- *massLbl,
- *massValLbl,
+ *massLbl,
+ *massValLbl,
- *isotopeLbl,
+ *isotopeLbl,
- *densityLbl,
- *densityValLbl,
+ *densityLbl,
+ *densityValLbl,
- *meltingPtLbl,
- *meltingValLbl,
- *boilingPtLbl,
- *boilingValLbl,
+ *meltingPtLbl,
+ *meltingValLbl,
+ *boilingPtLbl,
+ *boilingValLbl,
- *oxidationLbl,
- *oxidationValLbl,
+ *oxidationLbl,
+ *oxidationValLbl,
- *isotopeInfoLbl,
- *isotopeInfoValLbl;
+ *isotopeInfoLbl,
+ *isotopeInfoValLbl;
- TGButton *ptableButton;
+ TGButton *ptableButton;
- TGComboBox *isotopeCombo;
+ TGComboBox *isotopeCombo;
- // ----- Reaction ----
- TGGroupFrame *reactionGroup;
+ // ----- Reaction ----
+ TGGroupFrame *reactionGroup;
- TGLabel *projectileLbl,
- *temperatureLbl,
- *databaseLbl,
- *reactionLbl,
- *reactionInfoLbl,
- *reactionInfoValLbl;
+ TGLabel *projectileLbl,
+ *temperatureLbl,
+ *databaseLbl,
+ *reactionLbl,
+ *reactionInfoLbl,
+ *reactionInfoValLbl;
- TGComboBox *projectileCombo,
- *temperatureCombo,
- *databaseCombo;
+ TGComboBox *projectileCombo,
+ *temperatureCombo,
+ *databaseCombo;
- TGListBox *reactionList;
+ TGListBox *reactionList;
- // ----- Options -----
- TGGroupFrame *optionGroup;
+ // ----- Options -----
+ TGGroupFrame *optionGroup;
- TGLabel *lineWidthLbl,
- *lineColorLbl,
- *markerStyleLbl,
- *markerColorLbl,
- *markerSizeLbl,
- *errorbarColorLbl;
+ TGLabel *lineWidthLbl,
+ *lineColorLbl,
+ *markerStyleLbl,
+ *markerColorLbl,
+ *markerSizeLbl,
+ *errorbarColorLbl;
- TGComboBox *lineWidthCombo,
- *lineColorCombo,
- *markerStyleCombo,
- *markerColorCombo,
- *markerSizeCombo,
- *errorbarColorCombo;
+ TGComboBox *lineWidthCombo,
+ *lineColorCombo,
+ *markerStyleCombo,
+ *markerColorCombo,
+ *markerSizeCombo,
+ *errorbarColorCombo;
- // ----- Info Group -----
- TGGroupFrame *infoGroup;
+ // ----- Info Group -----
+ TGGroupFrame *infoGroup;
- TGTextView *infoView;
+ TGTextView *infoView;
- // ----- Execution Buttons ----
- TGHorizontalFrame *buttonFrame;
- TGButton *okButton,
- *execButton,
- *resetButton,
- *closeButton;
+ // ----- Execution Buttons ----
+ TGHorizontalFrame *buttonFrame;
+ TGButton *okButton,
+ *execButton,
+ *resetButton,
+ *closeButton;
public:
- XSReactionDlg(const TGWindow *p,
- const TGWindow *main, UInt_t initZ, UInt_t w, UInt_t h);
- ~XSReactionDlg();
+ XSReactionDlg(const TGWindow *p,
+ const TGWindow *main, UInt_t initZ, UInt_t w, UInt_t h);
+ ~XSReactionDlg();
protected:
- void InitColorCombo(TGComboBox *cb);
- void InitCombos();
- const char* GetString(int box);
- char* CreatePath(int option);
- int UpdateContainer( TGListBox *lb, char *path, int option);
- void UpdateCurIsotope();
- void UpdateIsotopes();
- void UpdateProjectile();
- void UpdateDatabase();
- void UpdateReactions();
-
- void SetElement(UInt_t aZ);
- void ElementEntryChanged();
-
- void UpdateGraph(NdbMTReactionXS *xs);
- Bool_t ExecCommand();
-
- virtual void CloseWindow();
- Bool_t ProcessButton(Long_t param1, Long_t param2);
- Bool_t ProcessCombo(Long_t param1, Long_t param2);
- virtual Bool_t ProcessMessage(Long_t msg, Long_t param1, Long_t param2);
-
- //ClassDef(XSReactionDlg,1)
+ void InitColorCombo(TGComboBox *cb);
+ void InitCombos();
+ const char* GetString(int box);
+ char* CreatePath(int option);
+ int UpdateContainer( TGListBox *lb, char *path, int option);
+ void UpdateCurIsotope();
+ void UpdateIsotopes();
+ void UpdateProjectile();
+ void UpdateDatabase();
+ void UpdateReactions();
+
+ void SetElement(UInt_t aZ);
+ void ElementEntryChanged();
+
+ void UpdateGraph(NdbMTReactionXS *xs);
+ Bool_t ExecCommand();
+
+ virtual void CloseWindow();
+ Bool_t ProcessButton(Long_t param1, Long_t param2);
+ Bool_t ProcessCombo(Long_t param1, Long_t param2);
+ virtual Bool_t ProcessMessage(Long_t msg, Long_t param1, Long_t param2);
+
+ //ClassDef(XSReactionDlg,1)
}; // XSReactionDlg
#endif
diff --git a/test/periodic/XSStepButton.cxx b/test/periodic/XSStepButton.cxx
index 9381fdac8ef..f7cd5f4b02a 100644
--- a/test/periodic/XSStepButton.cxx
+++ b/test/periodic/XSStepButton.cxx
@@ -9,59 +9,59 @@
/* ----- XSStepButton ----- */
XSStepButton::XSStepButton( const TGWindow *p, Int_t id )
- : TGCompositeFrame(p, 10, 10, kFixedSize)
+ : TGCompositeFrame(p, 10, 10, kFixedSize)
{
- buttonId = id;
- fMsgWindow = NULL;
+ buttonId = id;
+ fMsgWindow = NULL;
- lHints = new TGLayoutHints(kLHintsTop | kLHintsLeft);
- upButton = new TGPictureButton(this,
- fClient->GetPicture("arrow_up.xpm"),XSSTEPBUTTON_UP);
- upButton->Associate(this);
- downButton = new TGPictureButton(this,
- fClient->GetPicture("arrow_down.xpm"),XSSTEPBUTTON_DOWN);
- downButton->Associate(this);
- AddFrame(upButton, lHints);
- AddFrame(downButton, lHints);
+ lHints = new TGLayoutHints(kLHintsTop | kLHintsLeft);
+ upButton = new TGPictureButton(this,
+ fClient->GetPicture("arrow_up.xpm"),XSSTEPBUTTON_UP);
+ upButton->Associate(this);
+ downButton = new TGPictureButton(this,
+ fClient->GetPicture("arrow_down.xpm"),XSSTEPBUTTON_DOWN);
+ downButton->Associate(this);
+ AddFrame(upButton, lHints);
+ AddFrame(downButton, lHints);
- width = upButton->GetDefaultWidth() + 2*fBorderWidth;
- height = 2*upButton->GetDefaultHeight() + 2*fBorderWidth;
+ width = upButton->GetDefaultWidth() + 2*fBorderWidth;
+ height = 2*upButton->GetDefaultHeight() + 2*fBorderWidth;
- MapSubwindows();
- Resize(GetDefaultSize());
- MapWindow();
+ MapSubwindows();
+ Resize(GetDefaultSize());
+ MapWindow();
} // XSStepButton
/* ----- ~XSStepButton ----- */
XSStepButton::~XSStepButton( )
{
- delete lHints;
- delete upButton;
- delete downButton;
+ delete lHints;
+ delete upButton;
+ delete downButton;
} // ~XSStepButton
/* ----- ProcessMessage ----- */
Bool_t
XSStepButton::ProcessMessage(Long_t msg, Long_t param1, Long_t /* param2 */)
{
- switch (GET_MSG(msg)) {
- case kC_COMMAND:
- switch (GET_SUBMSG(msg)) {
- case kCM_BUTTON:
- // Send a message
- if (fMsgWindow)
- SendMessage(
- fMsgWindow,
- MK_MSG(kC_COMMAND,
- kCM_BUTTON),
- buttonId,
- param1);
- break;
- default:
- break;
- }
- default:
- break;
- }
- return kTRUE;
+ switch (GET_MSG(msg)) {
+ case kC_COMMAND:
+ switch (GET_SUBMSG(msg)) {
+ case kCM_BUTTON:
+ // Send a message
+ if (fMsgWindow)
+ SendMessage(
+ fMsgWindow,
+ MK_MSG(kC_COMMAND,
+ kCM_BUTTON),
+ buttonId,
+ param1);
+ break;
+ default:
+ break;
+ }
+ default:
+ break;
+ }
+ return kTRUE;
} // ProcessMessage
diff --git a/test/periodic/XSStepButton.h b/test/periodic/XSStepButton.h
index 6452da877e5..e81173aaf26 100644
--- a/test/periodic/XSStepButton.h
+++ b/test/periodic/XSStepButton.h
@@ -11,39 +11,39 @@
/* --- Messages that generate ---- */
-#define XSSTEPBUTTON_UP 0
-#define XSSTEPBUTTON_DOWN 1
+#define XSSTEPBUTTON_UP 0
+#define XSSTEPBUTTON_DOWN 1
/* =========== XSStepButton ============== */
class XSStepButton : public TGCompositeFrame
{
protected:
- const TGWindow *fMsgWindow; // window handling listbox messages
+ const TGWindow *fMsgWindow; // window handling listbox messages
- Int_t buttonId;
+ Int_t buttonId;
- TGLayoutHints *lHints;
+ TGLayoutHints *lHints;
- TGPictureButton *upButton,
- *downButton;
+ TGPictureButton *upButton,
+ *downButton;
- UInt_t width,
- height;
+ UInt_t width,
+ height;
public:
- XSStepButton( const TGWindow *p, Int_t id );
- ~XSStepButton();
+ XSStepButton( const TGWindow *p, Int_t id );
+ ~XSStepButton();
- virtual void Associate(const TGWindow *w) { fMsgWindow = w; }
+ virtual void Associate(const TGWindow *w) { fMsgWindow = w; }
- virtual Bool_t ProcessMessage(Long_t msg,
- Long_t param1, Long_t param2);
+ virtual Bool_t ProcessMessage(Long_t msg,
+ Long_t param1, Long_t param2);
- virtual TGDimension GetDefaultSize() const
- { return TGDimension(width,height); }
+ virtual TGDimension GetDefaultSize() const
+ { return TGDimension(width,height); }
- //ClassDef(XSStepButton,1)
+ //ClassDef(XSStepButton,1)
}; // XSStepButton
#endif
diff --git a/test/periodic/XSVarious.cxx b/test/periodic/XSVarious.cxx
index 2434ae67996..279c0fa7abd 100644
--- a/test/periodic/XSVarious.cxx
+++ b/test/periodic/XSVarious.cxx
@@ -19,31 +19,31 @@
void
XSinitialise( )
{
- XSelements = new XSElements(ISOTOPES_DESC_FILE);
- XSReactionDesc = new NdbMTReacDesc(MT_DESC_FILE);
- graphList = new TList();
+ XSelements = new XSElements(ISOTOPES_DESC_FILE);
+ XSReactionDesc = new NdbMTReacDesc(MT_DESC_FILE);
+ graphList = new TList();
- // --- Initialise GUI variables ---
- fixedFontStruct = gClient->GetFontByName(
- gEnv->GetValue("Gui.NormalFont","fixed"));
+ // --- Initialise GUI variables ---
+ fixedFontStruct = gClient->GetFontByName(
+ gEnv->GetValue("Gui.NormalFont","fixed"));
- // Define new graphics context.
- memset(&gval,0,sizeof(gval));
- gval.fMask = kGCForeground | kGCBackground | kGCFont |
- kGCFillStyle | kGCGraphicsExposures;
- gval.fFillStyle = kFillSolid;
- gval.fGraphicsExposures = kFALSE;
- gval.fFont = gVirtualX->GetFontHandle(fixedFontStruct);
- fixedGC=gVirtualX->CreateGC(gClient->GetRoot()->GetId(), &gval);
+ // Define new graphics context.
+ memset(&gval,0,sizeof(gval));
+ gval.fMask = kGCForeground | kGCBackground | kGCFont |
+ kGCFillStyle | kGCGraphicsExposures;
+ gval.fFillStyle = kFillSolid;
+ gval.fGraphicsExposures = kFALSE;
+ gval.fFont = gVirtualX->GetFontHandle(fixedFontStruct);
+ fixedGC=gVirtualX->CreateGC(gClient->GetRoot()->GetId(), &gval);
- blueFontStruct = gClient->GetFontByName(
- gEnv->GetValue("Gui.NormalFont",
- "-adobe-helvetica-bold-r-*-*-12-*-*-*-*-*-iso8859-1"));
- // Define new graphics context.
- gval.fMask = kGCForeground | kGCFont;
- gval.fFont = gVirtualX->GetFontHandle(blueFontStruct);
- gClient->GetColorByName("blue", gval.fForeground);
- blueBoldGC=gVirtualX->CreateGC(gClient->GetRoot()->GetId(), &gval);
+ blueFontStruct = gClient->GetFontByName(
+ gEnv->GetValue("Gui.NormalFont",
+ "-adobe-helvetica-bold-r-*-*-12-*-*-*-*-*-iso8859-1"));
+ // Define new graphics context.
+ gval.fMask = kGCForeground | kGCFont;
+ gval.fFont = gVirtualX->GetFontHandle(blueFontStruct);
+ gClient->GetColorByName("blue", gval.fForeground);
+ blueBoldGC=gVirtualX->CreateGC(gClient->GetRoot()->GetId(), &gval);
} // XSinitialise
@@ -51,17 +51,17 @@ XSinitialise( )
void
XSfinalise()
{
- delete XSelements;
- delete XSReactionDesc;
- delete graphList;
+ delete XSelements;
+ delete XSReactionDesc;
+ delete graphList;
} // XSfinalise
/* --------------- Add2GraphList --------------- */
void
Add2GraphList( XSGraph *gr)
{
- graphList->Add(gr);
+ graphList->Add(gr);
- /* --- Scan all graphs and update the canvas --- */
- // ....
+ /* --- Scan all graphs and update the canvas --- */
+ // ....
} // Add2GraphList
diff --git a/test/periodic/XSVarious.h b/test/periodic/XSVarious.h
index bd55fb3e9e4..ca6bbaf0ea3 100644
--- a/test/periodic/XSVarious.h
+++ b/test/periodic/XSVarious.h
@@ -20,39 +20,39 @@
#include "XSElements.h"
#ifdef __XSVARIOUS_CXX
-# define EXT
+# define EXT
#else
-# define EXT extern
+# define EXT extern
#endif
/* ---------------- Global DEFINES ---------------------- */
-#define PATHSEP "/"
-#define ICONDIR "icons" PATHSEP
-#define DBDIR "db" PATHSEP
-#define PTBL_ICON ICONDIR "ptable_s.xpm"
-#define ISOTOPES_DESC_FILE DBDIR "isotopes.dat"
-#define MT_DESC_FILE DBDIR "mt.dat"
+#define PATHSEP "/"
+#define ICONDIR "icons" PATHSEP
+#define DBDIR "db" PATHSEP
+#define PTBL_ICON ICONDIR "ptable_s.xpm"
+#define ISOTOPES_DESC_FILE DBDIR "isotopes.dat"
+#define MT_DESC_FILE DBDIR "mt.dat"
/* ---------------- Global Variables -------------------- */
-EXT XSElements *XSelements;
-EXT NdbMTReacDesc *XSReactionDesc;
-EXT TList *graphList;
+EXT XSElements *XSelements;
+EXT NdbMTReacDesc *XSReactionDesc;
+EXT TList *graphList;
// --- GUI vars ---
-EXT GCValues_t gval;
-EXT FontStruct_t fixedFontStruct;
-EXT FontStruct_t blueFontStruct;
-EXT GContext_t fixedGC;
-EXT GContext_t blueBoldGC;
+EXT GCValues_t gval;
+EXT FontStruct_t fixedFontStruct;
+EXT FontStruct_t blueFontStruct;
+EXT GContext_t fixedGC;
+EXT GContext_t blueBoldGC;
-EXT TCanvas *canvas;
-EXT TRootEmbeddedCanvas *canvasWindow;
+EXT TCanvas *canvas;
+EXT TRootEmbeddedCanvas *canvasWindow;
/* ----------------- function prototypes ---------------- */
-void XSinitialise();
-void XSfinalise();
+void XSinitialise();
+void XSfinalise();
-void Add2GraphList( XSGraph *gr);
+void Add2GraphList( XSGraph *gr);
#undef EXT
#endif
diff --git a/test/sqlitetest.cxx b/test/sqlitetest.cxx
index 95744622b0b..e3f79a6b3c8 100644
--- a/test/sqlitetest.cxx
+++ b/test/sqlitetest.cxx
@@ -12,204 +12,204 @@
int main() {
- // Create a new DB called testdb:
- TSQLServer *serv=TSQLServer::Connect("sqlite://testdb.sqlite", "", "");
- if (serv == NULL) {
- std::cerr << "Connection failed!" << std::endl;
- _exit(1);
- }
-
- // First, some debug-checks:
- std::cout << "DB: " << serv->GetDB() << std::endl;
- std::cout << "DBMS: " << serv->GetDBMS() << std::endl;
- std::cout << "HOST: " << serv->GetHost() << std::endl;
- std::cout << "PORT: " << serv->GetPort() << std::endl;
- std::cout << "Info: " << serv->ServerInfo() << std::endl;
-
- // Create table:
- if ((serv!=0) && serv->IsConnected()) {
- // create statement instance
- TSQLStatement* stmt = serv->Statement("CREATE TABLE TESTTABLE (ID1 FOO, ID2 FOO, ID3 FOO, ID4 FOO, ID5 FOO, ID6 FOO, ID7 FOO, ID8 FOO, ID9 FOO, ID10 FOO)");
- // process statement
- stmt->Process();
- // destroy object
- delete stmt;
- }
-
- serv->StartTransaction();//Exec("BEGIN TRANSACTION;");
-
- // Fill with data:
- TSQLStatement* stmt = serv->Statement("INSERT INTO TESTTABLE (ID1, ID2, ID3, ID4, ID5, ID6, ID7, ID8, ID9, ID10) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?);", 100);
- std::cout << "statement pars: " << stmt->GetNumParameters() << std::endl;
-
-
- for (int n=0;n<10;n++) {
- if (stmt->NextIteration()) {
- stmt->SetInt(0, n);
- stmt->SetUInt(1, n);
- stmt->SetLong(2, n);
- stmt->SetULong64(3, n);
- stmt->SetDate(4, 2013,1,n);
- stmt->SetTime(5, 1,1,n);
- stmt->SetDatime(6, 2013,1,n,1,1,n);
- stmt->SetTimestamp(7, 2013,1,1,1,1,n,102+n);
- TString foo;
- foo.Form("testbinary %d", n);
- void *binary=const_cast<char*>(foo.Data());
- stmt->SetBinary(8, binary, foo.Length());
- stmt->SetString(9, Form("%d", n), 200);
- }
- }
-
- stmt->Process();
- delete stmt;
-
- serv->Commit();
-
- delete serv;
-
- std::cout << "Testing tool created DB with sample data. Now reopening and selecting all." << std::endl;
-
- serv=TSQLServer::Connect("sqlite://testdb.sqlite", "", "");
- if (serv == NULL) {
- std::cerr << "Connection failed!" << std::endl;
- _exit(1);
- }
-
- std::cout << "Select table names:" << std::endl;
- TSQLResult *res=serv->GetTables(NULL, NULL);
-
- int fields=res->GetFieldCount();
- std::cout << "Table list has field count: " << fields << std::endl;
-
- int rowcount=res->GetRowCount();
- std::cout << "Table list has row count: " << rowcount << std::endl;
-
- TSQLRow *row=NULL;
- while ((row=res->Next()) != NULL) {
- for (int i=0; i<fields; i++) {
- std::cout << row->GetField(i);
- TSQLResult *res2=serv->GetColumns(NULL, row->GetField(i), NULL);
- if (res2 == NULL) continue;
- std::cout << "|";
- int fields2=res2->GetFieldCount();
- std::cout << "Cols: " << fields2 << " ";
- TSQLRow *row2=NULL;
- while ((row2=res2->Next()) != NULL) {
- std::cout << "(";
- for (int ii=0; ii<fields2; ii++) {
- if (row2->GetField(ii) == NULL) continue;
- std::cout << row2->GetField(ii) << "|";
- }
- std::cout << ")";
- delete row2;
- }
- }
- std::cout << std::endl;
- delete row;
- }
- delete res;
- std::cout << std::endl;
-
- std::cout << "Alternate way using GetTablesList:" << std::endl;
- serv->GetTablesList()->Print();
-
- std::cout << "Completed listing tables. Now selecting * from testtable, first using Query() and string output:" << std::endl;
- row=NULL;
- res=serv->Query("SELECT * from TESTTABLE;");
- fields=res->GetFieldCount();
- for (int i=0; i<fields; i++) {
- std::cout << "|" << std::setw(19) << res->GetFieldName(i) << "|";
- }
- std::cout << std::endl;
- while ((row=res->Next()) != NULL) {
- for (int i=0; i<fields; i++) {
- std::cout << "|" << std::setw(19) << row->GetField(i) << "|";
- }
- std::cout << std::endl;
- delete row;
- }
- delete res;
- std::cout << std::endl;
-
- std::cout << "Now using TSQLStatement-methods with appropriate types:" << std::endl;
-
- stmt = serv->Statement("SELECT * FROM TESTTABLE;", 100);
- // process statement
- if (stmt->Process()) {
- std::cout << "iteration..." << std::endl;
- // store result of statement in buffer
- stmt->StoreResult();
-
- // display info about selected field
- std::cout << "NumFields = " << stmt->GetNumFields() << std::endl;
- for (int n=0;n<stmt->GetNumFields();n++) {
- std::cout << "|" << std::setw(19) << stmt->GetFieldName(n) << "|";
- }
- std::cout << std::endl;
-
- // extract rows one after another
- while (stmt->NextResultRow()) {
- Int_t id1 = stmt->GetInt(0);
- std::cout << "|" << std::setw(19) << id1 << "|";
-
- UInt_t id2 = stmt->GetUInt(1);
- std::cout << "|" << std::setw(19) << id2 << "|";
-
- Long_t id3 = stmt->GetLong(2);
- std::cout << "|" << std::setw(19) << id3 << "|";
-
- ULong64_t id4 = stmt->GetULong64(3);
- std::cout << "|" << std::setw(19) << id4 << "|";
-
- Int_t year=0, month=0, day=0, hour=0, minute=0, second=0, frac=0;
-
- stmt->GetDate(4, year, month, day);
- TString id5;
- id5.Form("%04d-%02d-%02d %02d:%02d:%02d", year, month, day, 0, 0, 0);
- std::cout << "|" << std::setw(19) << id5 << "|";
-
- stmt->GetTime(5, hour, minute, second);
- TString id6;
- id6.Form("%04d-%02d-%02d %02d:%02d:%02d", 2000, 01, 01, hour, minute, second);
- std::cout << "|" << std::setw(19) << id6 << "|";
-
- stmt->GetDatime(6, year, month, day, hour, minute, second);
- TString id7;
- id7.Form("%04d-%02d-%02d %02d:%02d:%02d", year, month, day, hour, minute, second);
- std::cout << "|" << std::setw(19) << id7 << "|";
-
- stmt->GetTimestamp(7, year, month, day, hour, minute, second, frac);
- TTimeStamp ts(year,month,day,hour,minute,second);
- TString id8;
- // Frac is in milliseconds for SQLite, thus use %3d here.
- id8.Form("%04d-%02d-%02d %02d:%02d:%02d.%3d", year, month, day, hour, minute, second, frac);
- std::cout << "|" << std::setw(23) << id8 << "|";
-
- void* id9 = new unsigned char[1];
- Long_t binSize=1;
- stmt->GetBinary(8, id9, binSize);
- char* id9str = new char[binSize+1];
- memcpy(id9str, id9, binSize);
- id9str[binSize]='\0';
- std::cout << "|" << std::setw(19) << id9str << "|";
- delete [] (unsigned char*) id9;
- delete [] id9str;
-
- TString id10 = stmt->GetString(9);
- std::cout << "|" << std::setw(19) << id10 << "|";
-
- std::cout << std::endl;
- }
- }
- delete stmt;
-
- // Test tableinfo:
- std::cout << "Tableinfo:" << std::endl;
- TSQLTableInfo *ti=serv->GetTableInfo("TESTTABLE");
- ti->Print();
-
- delete serv;
-
- return 0;
+ // Create a new DB called testdb:
+ TSQLServer *serv=TSQLServer::Connect("sqlite://testdb.sqlite", "", "");
+ if (serv == NULL) {
+ std::cerr << "Connection failed!" << std::endl;
+ _exit(1);
+ }
+
+ // First, some debug-checks:
+ std::cout << "DB: " << serv->GetDB() << std::endl;
+ std::cout << "DBMS: " << serv->GetDBMS() << std::endl;
+ std::cout << "HOST: " << serv->GetHost() << std::endl;
+ std::cout << "PORT: " << serv->GetPort() << std::endl;
+ std::cout << "Info: " << serv->ServerInfo() << std::endl;
+
+ // Create table:
+ if ((serv!=0) && serv->IsConnected()) {
+ // create statement instance
+ TSQLStatement* stmt = serv->Statement("CREATE TABLE TESTTABLE (ID1 FOO, ID2 FOO, ID3 FOO, ID4 FOO, ID5 FOO, ID6 FOO, ID7 FOO, ID8 FOO, ID9 FOO, ID10 FOO)");
+ // process statement
+ stmt->Process();
+ // destroy object
+ delete stmt;
+ }
+
+ serv->StartTransaction();//Exec("BEGIN TRANSACTION;");
+
+ // Fill with data:
+ TSQLStatement* stmt = serv->Statement("INSERT INTO TESTTABLE (ID1, ID2, ID3, ID4, ID5, ID6, ID7, ID8, ID9, ID10) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?);", 100);
+ std::cout << "statement pars: " << stmt->GetNumParameters() << std::endl;
+
+
+ for (int n=0;n<10;n++) {
+ if (stmt->NextIteration()) {
+ stmt->SetInt(0, n);
+ stmt->SetUInt(1, n);
+ stmt->SetLong(2, n);
+ stmt->SetULong64(3, n);
+ stmt->SetDate(4, 2013,1,n);
+ stmt->SetTime(5, 1,1,n);
+ stmt->SetDatime(6, 2013,1,n,1,1,n);
+ stmt->SetTimestamp(7, 2013,1,1,1,1,n,102+n);
+ TString foo;
+ foo.Form("testbinary %d", n);
+ void *binary=const_cast<char*>(foo.Data());
+ stmt->SetBinary(8, binary, foo.Length());
+ stmt->SetString(9, Form("%d", n), 200);
+ }
+ }
+
+ stmt->Process();
+ delete stmt;
+
+ serv->Commit();
+
+ delete serv;
+
+ std::cout << "Testing tool created DB with sample data. Now reopening and selecting all." << std::endl;
+
+ serv=TSQLServer::Connect("sqlite://testdb.sqlite", "", "");
+ if (serv == NULL) {
+ std::cerr << "Connection failed!" << std::endl;
+ _exit(1);
+ }
+
+ std::cout << "Select table names:" << std::endl;
+ TSQLResult *res=serv->GetTables(NULL, NULL);
+
+ int fields=res->GetFieldCount();
+ std::cout << "Table list has field count: " << fields << std::endl;
+
+ int rowcount=res->GetRowCount();
+ std::cout << "Table list has row count: " << rowcount << std::endl;
+
+ TSQLRow *row=NULL;
+ while ((row=res->Next()) != NULL) {
+ for (int i=0; i<fields; i++) {
+ std::cout << row->GetField(i);
+ TSQLResult *res2=serv->GetColumns(NULL, row->GetField(i), NULL);
+ if (res2 == NULL) continue;
+ std::cout << "|";
+ int fields2=res2->GetFieldCount();
+ std::cout << "Cols: " << fields2 << " ";
+ TSQLRow *row2=NULL;
+ while ((row2=res2->Next()) != NULL) {
+ std::cout << "(";
+ for (int ii=0; ii<fields2; ii++) {
+ if (row2->GetField(ii) == NULL) continue;
+ std::cout << row2->GetField(ii) << "|";
+ }
+ std::cout << ")";
+ delete row2;
+ }
+ }
+ std::cout << std::endl;
+ delete row;
+ }
+ delete res;
+ std::cout << std::endl;
+
+ std::cout << "Alternate way using GetTablesList:" << std::endl;
+ serv->GetTablesList()->Print();
+
+ std::cout << "Completed listing tables. Now selecting * from testtable, first using Query() and string output:" << std::endl;
+ row=NULL;
+ res=serv->Query("SELECT * from TESTTABLE;");
+ fields=res->GetFieldCount();
+ for (int i=0; i<fields; i++) {
+ std::cout << "|" << std::setw(19) << res->GetFieldName(i) << "|";
+ }
+ std::cout << std::endl;
+ while ((row=res->Next()) != NULL) {
+ for (int i=0; i<fields; i++) {
+ std::cout << "|" << std::setw(19) << row->GetField(i) << "|";
+ }
+ std::cout << std::endl;
+ delete row;
+ }
+ delete res;
+ std::cout << std::endl;
+
+ std::cout << "Now using TSQLStatement-methods with appropriate types:" << std::endl;
+
+ stmt = serv->Statement("SELECT * FROM TESTTABLE;", 100);
+ // process statement
+ if (stmt->Process()) {
+ std::cout << "iteration..." << std::endl;
+ // store result of statement in buffer
+ stmt->StoreResult();
+
+ // display info about selected field
+ std::cout << "NumFields = " << stmt->GetNumFields() << std::endl;
+ for (int n=0;n<stmt->GetNumFields();n++) {
+ std::cout << "|" << std::setw(19) << stmt->GetFieldName(n) << "|";
+ }
+ std::cout << std::endl;
+
+ // extract rows one after another
+ while (stmt->NextResultRow()) {
+ Int_t id1 = stmt->GetInt(0);
+ std::cout << "|" << std::setw(19) << id1 << "|";
+
+ UInt_t id2 = stmt->GetUInt(1);
+ std::cout << "|" << std::setw(19) << id2 << "|";
+
+ Long_t id3 = stmt->GetLong(2);
+ std::cout << "|" << std::setw(19) << id3 << "|";
+
+ ULong64_t id4 = stmt->GetULong64(3);
+ std::cout << "|" << std::setw(19) << id4 << "|";
+
+ Int_t year=0, month=0, day=0, hour=0, minute=0, second=0, frac=0;
+
+ stmt->GetDate(4, year, month, day);
+ TString id5;
+ id5.Form("%04d-%02d-%02d %02d:%02d:%02d", year, month, day, 0, 0, 0);
+ std::cout << "|" << std::setw(19) << id5 << "|";
+
+ stmt->GetTime(5, hour, minute, second);
+ TString id6;
+ id6.Form("%04d-%02d-%02d %02d:%02d:%02d", 2000, 01, 01, hour, minute, second);
+ std::cout << "|" << std::setw(19) << id6 << "|";
+
+ stmt->GetDatime(6, year, month, day, hour, minute, second);
+ TString id7;
+ id7.Form("%04d-%02d-%02d %02d:%02d:%02d", year, month, day, hour, minute, second);
+ std::cout << "|" << std::setw(19) << id7 << "|";
+
+ stmt->GetTimestamp(7, year, month, day, hour, minute, second, frac);
+ TTimeStamp ts(year,month,day,hour,minute,second);
+ TString id8;
+ // Frac is in milliseconds for SQLite, thus use %3d here.
+ id8.Form("%04d-%02d-%02d %02d:%02d:%02d.%3d", year, month, day, hour, minute, second, frac);
+ std::cout << "|" << std::setw(23) << id8 << "|";
+
+ void* id9 = new unsigned char[1];
+ Long_t binSize=1;
+ stmt->GetBinary(8, id9, binSize);
+ char* id9str = new char[binSize+1];
+ memcpy(id9str, id9, binSize);
+ id9str[binSize]='\0';
+ std::cout << "|" << std::setw(19) << id9str << "|";
+ delete [] (unsigned char*) id9;
+ delete [] id9str;
+
+ TString id10 = stmt->GetString(9);
+ std::cout << "|" << std::setw(19) << id10 << "|";
+
+ std::cout << std::endl;
+ }
+ }
+ delete stmt;
+
+ // Test tableinfo:
+ std::cout << "Tableinfo:" << std::endl;
+ TSQLTableInfo *ti=serv->GetTableInfo("TESTTABLE");
+ ti->Print();
+
+ delete serv;
+
+ return 0;
}
diff --git a/test/stressGraphics.cxx b/test/stressGraphics.cxx
index 9455d20ae3e..a3946eeb3c3 100644
--- a/test/stressGraphics.cxx
+++ b/test/stressGraphics.cxx
@@ -1202,17 +1202,17 @@ void tmathtext()
{
TCanvas *C = StartTest(700, 500);
- TMathText l;
- l.SetTextAlign(23);
- l.SetTextSize(0.06);
- l.DrawMathText(0.50, 1.000, "\\prod_{j\\ge0} \\left(\\sum_{k\\ge0} a_{jk}z^k\\right) = \\sum_{n\\ge0} z^n \\left(\\sum_{k_0,k_1,\\ldots\\ge0\\atop k_0+k_1+\\cdots=n} a_{0k_0}a_{1k_1} \\cdots \\right)");
- l.DrawMathText(0.50, 0.800, "W_{\\delta_1\\rho_1\\sigma_2}^{3\\beta} = U_{\\delta_1\\rho_1\\sigma_2}^{3\\beta} + {1\\over 8\\pi^2} \\int_{\\alpha_1}^{\\alpha_2} d\\alpha_2^\\prime \\left[ {U_{\\delta_1\\rho_1}^{2\\beta} - \\alpha_2^\\prime U_{\\rho_1\\sigma_2}^{1\\beta} \\over U_{\\rho_1\\sigma_2}^{0\\beta}} \\right]");
- l.DrawMathText(0.50, 0.600, "d\\Gamma = {1\\over 2m_A} \\left( \\prod_f {d^3p_f\\over (2\\pi)^3} {1\\over 2E_f} \\right) \\left| \\mathscr{M} \\left(m_A - \\left\\{p_f\\right\\} \\right) \\right|^2 (2\\pi)^4 \\delta^{(4)} \\left(p_A - \\sum p_f \\right)");
- l.DrawMathText(0.50, 0.425, "4\\mathrm{Re}\\left\\{{2\\over 1-\\Delta\\alpha} \\chi(s) \\left[ \\^{g}_\\nu^e \\^{g}_\\nu^f (1 + \\cos^2\\theta) + \\^{g}_a^e \\^{g}_a^f \\cos\\theta \\right] \\right\\}");
- l.DrawMathText(0.50, 0.330, "p(n) = {1\\over\\pi\\sqrt{2}} \\sum_{k = 1}^\\infty \\sqrt{k} A_k(n) {d\\over dn} {\\sinh \\left\\{ {\\pi\\over k} \\sqrt{2\\over 3} \\sqrt{n - {1\\over 24}} \\right\\} \\over \\sqrt{n - {1\\over 24}}}");
- l.DrawMathText(0.13, 0.150, "{(\\ell+1)C_{\\ell}^{TE} \\over 2\\pi}");
+ TMathText l;
+ l.SetTextAlign(23);
+ l.SetTextSize(0.06);
+ l.DrawMathText(0.50, 1.000, "\\prod_{j\\ge0} \\left(\\sum_{k\\ge0} a_{jk}z^k\\right) = \\sum_{n\\ge0} z^n \\left(\\sum_{k_0,k_1,\\ldots\\ge0\\atop k_0+k_1+\\cdots=n} a_{0k_0}a_{1k_1} \\cdots \\right)");
+ l.DrawMathText(0.50, 0.800, "W_{\\delta_1\\rho_1\\sigma_2}^{3\\beta} = U_{\\delta_1\\rho_1\\sigma_2}^{3\\beta} + {1\\over 8\\pi^2} \\int_{\\alpha_1}^{\\alpha_2} d\\alpha_2^\\prime \\left[ {U_{\\delta_1\\rho_1}^{2\\beta} - \\alpha_2^\\prime U_{\\rho_1\\sigma_2}^{1\\beta} \\over U_{\\rho_1\\sigma_2}^{0\\beta}} \\right]");
+ l.DrawMathText(0.50, 0.600, "d\\Gamma = {1\\over 2m_A} \\left( \\prod_f {d^3p_f\\over (2\\pi)^3} {1\\over 2E_f} \\right) \\left| \\mathscr{M} \\left(m_A - \\left\\{p_f\\right\\} \\right) \\right|^2 (2\\pi)^4 \\delta^{(4)} \\left(p_A - \\sum p_f \\right)");
+ l.DrawMathText(0.50, 0.425, "4\\mathrm{Re}\\left\\{{2\\over 1-\\Delta\\alpha} \\chi(s) \\left[ \\^{g}_\\nu^e \\^{g}_\\nu^f (1 + \\cos^2\\theta) + \\^{g}_a^e \\^{g}_a^f \\cos\\theta \\right] \\right\\}");
+ l.DrawMathText(0.50, 0.330, "p(n) = {1\\over\\pi\\sqrt{2}} \\sum_{k = 1}^\\infty \\sqrt{k} A_k(n) {d\\over dn} {\\sinh \\left\\{ {\\pi\\over k} \\sqrt{2\\over 3} \\sqrt{n - {1\\over 24}} \\right\\} \\over \\sqrt{n - {1\\over 24}}}");
+ l.DrawMathText(0.13, 0.150, "{(\\ell+1)C_{\\ell}^{TE} \\over 2\\pi}");
l.DrawMathText(0.27, 0.110, "\\mathbb{N} \\subset \\mathbb{R}");
- l.DrawMathText(0.63, 0.100, "\\hbox{RHIC ã‚¹ãƒ”ãƒ³ç‰©ç† Ðью-Йорк}");
+ l.DrawMathText(0.63, 0.100, "\\hbox{RHIC ã‚¹ãƒ”ãƒ³ç‰©ç† Ðью-Йорк}");
TestReport1(C, "TMathText",1);
DoCcode(C);
diff --git a/test/stressHistFactory_models.cxx b/test/stressHistFactory_models.cxx
index 691b2b4039f..4dc9fdcb70c 100644
--- a/test/stressHistFactory_models.cxx
+++ b/test/stressHistFactory_models.cxx
@@ -48,7 +48,7 @@ void buildAPI_XML_TestModel(TString prefix)
HistFactory::Sample Background1("background1","background1","HistFactory_input.root","API_vs_XML/SignalRegion/");
Background1.ActivateStatError();
Background1.AddHistoSys("bkg1_shape_unc","background1_Low","HistFactory_input.root","API_vs_XML/SignalRegion/",
- "background1_High","HistFactory_input.root","API_vs_XML/SignalRegion/");
+ "background1_High","HistFactory_input.root","API_vs_XML/SignalRegion/");
Background1.AddOverallSys("bkg_unc",0.9,1.1);
SignalRegion.AddSample(Background1);
diff --git a/test/stressHistFactory_tests.cxx b/test/stressHistFactory_tests.cxx
index 52aa146b04a..773ad707265 100644
--- a/test/stressHistFactory_tests.cxx
+++ b/test/stressHistFactory_tests.cxx
@@ -142,7 +142,7 @@ public:
{
assert(pWS_XML->data("obsData"));
if(!CompareData(*pWS_API->data("obsData"),*pWS_XML->data("obsData")))
- return kFALSE;
+ return kFALSE;
}
else
return kFALSE;
@@ -151,7 +151,7 @@ public:
{
assert(pWS_XML->data("asimovData"));
if(!CompareData(*pWS_API->data("asimovData"),*pWS_XML->data("asimovData")))
- return kFALSE;
+ return kFALSE;
}
else
return kFALSE;
@@ -161,20 +161,20 @@ public:
{
assert(pMC_XML->GetParametersOfInterest());
if(_verb > 0)
- Info("testCode","comparing PoIs");
+ Info("testCode","comparing PoIs");
if(!CompareParameters(*pMC_API->GetParametersOfInterest(),*pMC_XML->GetParametersOfInterest()))
- return kFALSE;
+ return kFALSE;
}
- else
+ else
assert(!pMC_XML->GetParametersOfInterest());
if(pMC_API->GetObservables())
{
assert(pMC_XML->GetObservables());
if(_verb > 0)
- Info("testCode","comparing observables");
+ Info("testCode","comparing observables");
if(!CompareParameters(*pMC_API->GetObservables(),*pMC_XML->GetObservables()))
- return kFALSE;
+ return kFALSE;
}
else
assert(!pMC_XML->GetObservables());
@@ -183,9 +183,9 @@ public:
{
assert(pMC_XML->GetGlobalObservables());
if(_verb > 0)
- Info("testCode","comparing global observables");
+ Info("testCode","comparing global observables");
if(!CompareParameters(*pMC_API->GetGlobalObservables(),*pMC_XML->GetGlobalObservables()))
- return kFALSE;
+ return kFALSE;
}
else
assert(!pMC_XML->GetGlobalObservables());
@@ -194,9 +194,9 @@ public:
{
assert(pMC_XML->GetConditionalObservables());
if(_verb > 0)
- Info("testCode","comparing conditional observables");
+ Info("testCode","comparing conditional observables");
if(!CompareParameters(*pMC_API->GetConditionalObservables(),*pMC_XML->GetConditionalObservables()))
- return kFALSE;
+ return kFALSE;
}
else
assert(!pMC_XML->GetConditionalObservables());
@@ -205,9 +205,9 @@ public:
{
assert(pMC_XML->GetNuisanceParameters());
if(_verb > 0)
- Info("testCode","comparing nuisance parameters");
+ Info("testCode","comparing nuisance parameters");
if(!CompareParameters(*pMC_API->GetNuisanceParameters(),*pMC_XML->GetNuisanceParameters()))
- return kFALSE;
+ return kFALSE;
}
else
assert(!pMC_XML->GetNuisanceParameters());
@@ -292,14 +292,14 @@ private:
if (!par) continue; // do not test RooCategory
if(!TMath::AreEqualAbs(rData1.mean(*par),rData2.mean(*par),fTolerance))
{
- Warning("CompareData","data sets have different means for \"%s\": %.3f vs %.3f",par->GetName(),rData1.mean(*par),rData2.mean(*par));
- return kFALSE;
+ Warning("CompareData","data sets have different means for \"%s\": %.3f vs %.3f",par->GetName(),rData1.mean(*par),rData2.mean(*par));
+ return kFALSE;
}
if(!TMath::AreEqualAbs(rData1.sigma(*par),rData2.sigma(*par),fTolerance))
{
- Warning("CompareData","data sets have different sigmas for \"%s\": %.3f vs %.3f",par->GetName(),rData1.sigma(*par),rData2.sigma(*par));
- return kFALSE;
+ Warning("CompareData","data sets have different sigmas for \"%s\": %.3f vs %.3f",par->GetName(),rData1.sigma(*par),rData2.sigma(*par));
+ return kFALSE;
}
}
@@ -323,65 +323,65 @@ private:
// checks only for RooRealVars implemented
arg1 = dynamic_cast<RooRealVar*>(obj);
if(!arg1)
- continue;
+ continue;
arg2 = (RooRealVar*)rPars2.find(arg1->GetName());
if(!arg2)
{
- Warning("CompareParameters","did not find observable with name \"%s\"",arg1->GetName());
- return kFALSE;
+ Warning("CompareParameters","did not find observable with name \"%s\"",arg1->GetName());
+ return kFALSE;
}
if(!TMath::AreEqualAbs(arg1->getMin(),arg2->getMin(),fTolerance))
{
- Warning("CompareParameters","parameters with name \"%s\" have different minima: %.3f vs %.3f",arg1->GetName(),arg1->getMin(),arg2->getMin());
- return kFALSE;
+ Warning("CompareParameters","parameters with name \"%s\" have different minima: %.3f vs %.3f",arg1->GetName(),arg1->getMin(),arg2->getMin());
+ return kFALSE;
}
if(!TMath::AreEqualAbs(arg1->getMax(),arg2->getMax(),fTolerance))
{
- Warning("CompareParameters","parameters with name \"%s\" have different maxima: %.3f vs %.3f",arg1->GetName(),arg1->getMax(),arg2->getMax());
- return kFALSE;
+ Warning("CompareParameters","parameters with name \"%s\" have different maxima: %.3f vs %.3f",arg1->GetName(),arg1->getMax(),arg2->getMax());
+ return kFALSE;
}
if(arg1->getBins() != arg2->getBins())
{
- Warning("CompareParameters","parameters with name \"%s\" have different number of bins: %d vs %d",arg1->GetName(),arg1->getBins(),arg2->getBins());
- return kFALSE;
+ Warning("CompareParameters","parameters with name \"%s\" have different number of bins: %d vs %d",arg1->GetName(),arg1->getBins(),arg2->getBins());
+ return kFALSE;
}
if(arg1->isConstant() != arg2->isConstant())
{
- Warning("CompareParameters","parameters with name \"%s\" have different constness",arg1->GetName());
- return kFALSE;
+ Warning("CompareParameters","parameters with name \"%s\" have different constness",arg1->GetName());
+ return kFALSE;
}
if(bAllowForError)
{
if(!TMath::AreEqualAbs(arg1->getVal(),arg2->getVal(), TMath::Max(fTolerance,0.1*TMath::Min(arg1->getError(),arg2->getError()))))
- {
- Warning("CompareParameters","parameters with name \"%s\" have different values: %.3f +/- %.3f vs %.3f +/- %.3f",arg1->GetName(),arg1->getVal(),arg1->getError(),arg2->getVal(),arg2->getError());
- return kFALSE;
- }
+ {
+ Warning("CompareParameters","parameters with name \"%s\" have different values: %.3f +/- %.3f vs %.3f +/- %.3f",arg1->GetName(),arg1->getVal(),arg1->getError(),arg2->getVal(),arg2->getError());
+ return kFALSE;
+ }
}
else
- {
- if(!TMath::AreEqualAbs(arg1->getVal(),arg2->getVal(),fTolerance))
- {
- Warning("CompareParameters","parameters with name \"%s\" have different values: %.3f vs %.3f",arg1->GetName(),arg1->getVal(),arg2->getVal());
- return kFALSE;
- }
-
- if(!TMath::AreEqualAbs(arg1->getError(),arg2->getError(),fTolerance))
- {
- Warning("CompareParameters","parameters with name \"%s\" have different errors: %.3f vs %.3f",arg1->GetName(),arg1->getError(),arg2->getError());
- return kFALSE;
- }
- }
+ {
+ if(!TMath::AreEqualAbs(arg1->getVal(),arg2->getVal(),fTolerance))
+ {
+ Warning("CompareParameters","parameters with name \"%s\" have different values: %.3f vs %.3f",arg1->GetName(),arg1->getVal(),arg2->getVal());
+ return kFALSE;
+ }
+
+ if(!TMath::AreEqualAbs(arg1->getError(),arg2->getError(),fTolerance))
+ {
+ Warning("CompareParameters","parameters with name \"%s\" have different errors: %.3f vs %.3f",arg1->GetName(),arg1->getError(),arg2->getError());
+ return kFALSE;
+ }
+ }
}
-
- return kTRUE;
+
+ return kTRUE;
}
Bool_t ComparePDF(RooAbsPdf& rPDF1,RooAbsPdf& rPDF2,const RooArgSet& rAllObservables,RooAbsData& rTestData)
diff --git a/test/stressHistoFit.cxx b/test/stressHistoFit.cxx
index 3acc07b3c9b..f83739a6468 100644
--- a/test/stressHistoFit.cxx
+++ b/test/stressHistoFit.cxx
@@ -64,7 +64,7 @@
// ****************************************************************************
// stressHistoFit: Real Time = 37.49 seconds Cpu Time = 37.24 seconds
-// ROOTMARKS = 2663.8 ROOT version: 5.27/01 trunk@32822
+// ROOTMARKS = 2663.8 ROOT version: 5.27/01 trunk@32822
// ****************************************************************************
//
// //
diff --git a/test/stressLinear.cxx b/test/stressLinear.cxx
index e6f212ba33e..a01c2d19d21 100644
--- a/test/stressLinear.cxx
+++ b/test/stressLinear.cxx
@@ -1319,15 +1319,15 @@ void mstress_determinant(Int_t msize)
// Next test disabled because it produces (of course) a Warning
if (0) {
if (gVerbose)
- std::cout << "\nCheck the determinant for the singular matrix"
- "\n defined as above with zero first row" << std::endl;
+ std::cout << "\nCheck the determinant for the singular matrix"
+ "\n\tdefined as above with zero first row" << std::endl;
m.Zero();
{
for (Int_t i = m.GetRowLwb()+1; i <= m.GetRowUpb(); i++)
for (Int_t j = m.GetColLwb(); j <= m.GetColUpb(); j++)
m(i,j) = ( i==(m.GetColUpb()+m.GetColLwb()-j) ? pattern : 0 );
}
- std::cout << "\n determinant is " << m.Determinant();
+ std::cout << "\n\tdeterminant is " << m.Determinant();
ok &= ( m.Determinant() == 0 ) ? kTRUE : kFALSE;
}
@@ -3889,16 +3889,16 @@ class MakeMatrix : public TMatrixDLazy {
public:
MakeMatrix(Int_t nrows,Int_t ncols,
- const Double_t *_array,Int_t _no_elems)
+ const Double_t *_array,Int_t _no_elems)
:TMatrixDLazy(nrows,ncols), array(_array), no_elems(_no_elems) {}
MakeMatrix(Int_t row_lwb,Int_t row_upb,Int_t col_lwb,Int_t col_upb,
- const Double_t *_array,Int_t _no_elems)
+ const Double_t *_array,Int_t _no_elems)
: TMatrixDLazy(row_lwb,row_upb,col_lwb,col_upb),
array(_array), no_elems(_no_elems) {}
};
#else
TMatrixD MakeMatrix(Int_t nrows,Int_t ncols,
- const Double_t *_array,Int_t _no_elems)
+ const Double_t *_array,Int_t _no_elems)
{
TMatrixD m(nrows,ncols,_array);
return m;
diff --git a/test/stressMathCore.cxx b/test/stressMathCore.cxx
index ac7722d5ce7..2a736548c70 100644
--- a/test/stressMathCore.cxx
+++ b/test/stressMathCore.cxx
@@ -972,7 +972,7 @@ public:
Timer timer;
for (int i = 0; i < nGen; ++i) {
- *v1 = dataV[i];
+ *v1 = dataV[i];
tree.Fill();
}
diff --git a/test/stressRooFit.cxx b/test/stressRooFit.cxx
index d454b73128f..0d413a90759 100644
--- a/test/stressRooFit.cxx
+++ b/test/stressRooFit.cxx
@@ -73,8 +73,8 @@ Int_t stressRooFit(const char* refFile, Bool_t writeRef, Int_t doVerbose, Int_t
if (!dryRun) {
if (TString(refFile).Contains("http:")) {
if (writeRef) {
- cout << "stressRooFit ERROR: reference file must be local file in writing mode" << endl ;
- return 1;
+ cout << "stressRooFit ERROR: reference file must be local file in writing mode" << endl ;
+ return 1;
}
fref = new TWebFile(refFile) ;
} else {
@@ -176,7 +176,7 @@ Int_t stressRooFit(const char* refFile, Bool_t writeRef, Int_t doVerbose, Int_t
for (list<RooUnitTest*>::iterator iter = testList.begin () ; iter != testList.end() ; ++iter) {
if (oneTest<0 || oneTest==i) {
if (doDump) {
- (*iter)->setDebug(kTRUE) ;
+ (*iter)->setDebug(kTRUE) ;
}
Int_t status = (*iter)->isTestAvailable()?(*iter)->runTest():-1;
StatusPrint( i,(*iter)->GetName(), status);
diff --git a/test/stressRooFit_tests.cxx b/test/stressRooFit_tests.cxx
index a8bd5a052b1..df35bb3e723 100644
--- a/test/stressRooFit_tests.cxx
+++ b/test/stressRooFit_tests.cxx
@@ -1480,20 +1480,20 @@ public:
TestBasic208(TFile* refFile, Bool_t writeRef, Int_t verbose) : RooUnitTest("FFT Convolution operator p.d.f.",refFile,writeRef,verbose) {} ;
Bool_t isTestAvailable() {
- // only if ROOT was build with fftw3 enabled
- TString conffeatures = gROOT->GetConfigFeatures();
- if(conffeatures.Contains("fftw3")) {
- TPluginHandler *h;
- if ((h = gROOT->GetPluginManager()->FindHandler("TVirtualFFT"))) {
- if (h->LoadPlugin() == -1) {
- gROOT->ProcessLine("new TNamed ;") ;
- return kFALSE;
- } else {
- return kTRUE ;
+ // only if ROOT was build with fftw3 enabled
+ TString conffeatures = gROOT->GetConfigFeatures();
+ if(conffeatures.Contains("fftw3")) {
+ TPluginHandler *h;
+ if ((h = gROOT->GetPluginManager()->FindHandler("TVirtualFFT"))) {
+ if (h->LoadPlugin() == -1) {
+ gROOT->ProcessLine("new TNamed ;") ;
+ return kFALSE;
+ } else {
+ return kTRUE ;
+ }
}
- }
- }
- return kFALSE ;
+ }
+ return kFALSE ;
}
Double_t ctol() { return 1e-2 ; } // Account for difficult shape of Landau distribution
@@ -6073,7 +6073,7 @@ public:
// to speed up the study at the expemse of some precision
RooMCStudy* mcstudy = new RooMCStudy(model,x,Binned(kTRUE),Silence(),Extended(),
- FitOptions(Save(kTRUE),PrintEvalErrors(0))) ;
+ FitOptions(Save(kTRUE),PrintEvalErrors(0))) ;
// G e n e r a t e a n d f i t e v e n t s
@@ -6293,7 +6293,7 @@ public:
// Configure manager to perform binned extended likelihood fits (Binned(),Extended()) on data generated
// with a Poisson fluctuation on Nobs (Extended())
RooMCStudy* mcs = new RooMCStudy(model,mjjj,Binned(),Silence(),Extended(kTRUE),
- FitOptions(Extended(kTRUE),PrintEvalErrors(-1))) ;
+ FitOptions(Extended(kTRUE),PrintEvalErrors(-1))) ;
diff --git a/test/stressShapes.cxx b/test/stressShapes.cxx
index 6b78d63d704..e80e442c980 100644
--- a/test/stressShapes.cxx
+++ b/test/stressShapes.cxx
@@ -133,7 +133,7 @@ void length()
step += 1E-3;
}
if (istep>10000) break;
- len[icrt] += step;
+ len[icrt] += step;
hist = (TH1F*)(hlist->At(icrt));
hist->Fill(step);
// now see if we can make an other step
diff --git a/test/stressTMVA.cxx b/test/stressTMVA.cxx
index 2c0ff4d2393..9c0d7afb1ee 100644
--- a/test/stressTMVA.cxx
+++ b/test/stressTMVA.cxx
@@ -1791,8 +1791,8 @@ namespace UnitTesting
{
public:
MethodUnitTestWithROCLimits(const TMVA::Types::EMVA& theMethod, const TString& methodTitle, const TString& theOption,
- double lowLimit = 0., double upLimit = 1.,
- const std::string & name="", const std::string & filename="", std::ostream* osptr = &std::cout);
+ double lowLimit = 0., double upLimit = 1.,
+ const std::string & name="", const std::string & filename="", std::ostream* osptr = &std::cout);
virtual ~MethodUnitTestWithROCLimits();
virtual void run();
@@ -1806,7 +1806,7 @@ namespace UnitTesting
TMVA::Types::EMVA _methodType;
TString _methodTitle;
TString _methodOption;
-
+
double _upROCLimit;
double _lowROCLimit;
double _ROCValue;
@@ -1839,7 +1839,7 @@ using namespace UnitTesting;
using namespace TMVA;
MethodUnitTestWithROCLimits::MethodUnitTestWithROCLimits(const Types::EMVA& theMethod, const TString& methodTitle, const TString& theOption,
- double lowLimit, double upLimit,
+ double lowLimit, double upLimit,
const std::string & /* xname */ ,const std::string & /* filename */ , std::ostream* /* sptr */ ) :
UnitTest((string)methodTitle, __FILE__), _methodType(theMethod) , _methodTitle(methodTitle), _methodOption(theOption), _upROCLimit(upLimit), _lowROCLimit(lowLimit), _VariableNames(0), _TreeVariableNames(0)
{
@@ -1920,7 +1920,7 @@ void MethodUnitTestWithROCLimits::run()
// FIXME:: make options string mutable?
factory->PrepareTrainingAndTestTree( mycuts, mycutb,
- "nTrain_Signal=1000:nTrain_Background=1000:nTest_Signal=5000:nTest_Background=5000:SplitMode=Random:NormMode=NumEvents:!V" );
+ "nTrain_Signal=1000:nTrain_Background=1000:nTest_Signal=5000:nTest_Background=5000:SplitMode=Random:NormMode=NumEvents:!V" );
factory->BookMethod(_methodType, _methodTitle, _methodOption);
@@ -2518,7 +2518,7 @@ using namespace UnitTesting;
using namespace TMVA;
MethodUnitTestWithComplexData::MethodUnitTestWithComplexData(const TString& treestring, const TString& preparestring, const Types::EMVA& theMethod, const TString& methodTitle, const TString& theOption,
- double lowLimit, double upLimit,
+ double lowLimit, double upLimit,
const std::string & /* xname */ ,const std::string & /* filename */ , std::ostream* /* sptr */) :
UnitTest(string("ComplexData_")+(string)methodTitle+(string)treestring, __FILE__), _methodType(theMethod) , _treeString(treestring), _prepareString(preparestring), _methodTitle(methodTitle), _methodOption(theOption), _upROCLimit(upLimit), _lowROCLimit(lowLimit)
{
@@ -2536,7 +2536,7 @@ bool MethodUnitTestWithComplexData::ROCIntegralWithinInterval()
void MethodUnitTestWithComplexData::run()
{
- // FIXME:: create _this_ file or rather somewhere else?
+ // FIXME:: create _this_ file or rather somewhere else?
TString outfileName( "weights/TMVA.root" );
TFile* outputFile = TFile::Open( outfileName, "RECREATE" );
diff --git a/test/stressVector.cxx b/test/stressVector.cxx
index a60d2dece6d..446e2c6f844 100644
--- a/test/stressVector.cxx
+++ b/test/stressVector.cxx
@@ -96,7 +96,7 @@ public:
int pr = std::cout.precision(8);
std::cout << s << "\t" << " time = " << time.RealTime() << "\t(sec)\t"
// << time.CpuTime()
- << std::endl;
+ << std::endl;
std::cout.precision(pr);
}
@@ -123,7 +123,7 @@ public:
double pt = r.Exp(10.);
double m = r.Uniform(0,10.);
if ( i%50 == 0 )
- m = r.BreitWigner(1.,0.01);
+ m = r.BreitWigner(1.,0.01);
double E = sqrt( m*m + pt*pt*cosh(eta)*cosh(eta) );
@@ -284,15 +284,14 @@ int testAnalysis( const std::vector<V *> & dataV, TStopwatch & tim, double& t,
if (cutPtEta(v1,ptMin, etaMax) ) {
double delta;
for (unsigned int j = i +1; j < n; ++j) {
- V & v2 = *(dataV[j]);
- delta = VectorUtil::DeltaR(v1,v2);
- if (delta < deltaMax) {
- V v3 = v1 + v2;
- nsel++;
- if ( cutPtEtaAndMass(v3))
- nsel2++;
- }
-
+ V & v2 = *(dataV[j]);
+ delta = VectorUtil::DeltaR(v1,v2);
+ if (delta < deltaMax) {
+ V v3 = v1 + v2;
+ nsel++;
+ if ( cutPtEtaAndMass(v3))
+ nsel2++;
+ }
}
}
}
@@ -317,8 +316,8 @@ int testAnalysis2( const std::vector<V *> & dataV, TStopwatch & tim, double& t,
V & v1 = *(dataV[i]);
if ( cutPtEta(v1, ptMin, etaMax) ) {
for (unsigned int j = i +1; j < n; ++j) {
- V & v2 = *(dataV[j]);
- if ( VectorUtil::DeltaR(v1,v2) < 0.5) nsel++;
+ V & v2 = *(dataV[j]);
+ if ( VectorUtil::DeltaR(v1,v2) < 0.5) nsel++;
}
}
}
@@ -578,9 +577,9 @@ int main(int argc,const char *argv[]) {
// for TLR need to loop
std::cout << " TLorentzRotation: " << std::endl;
for (int i = 0; i < 4; ++i) {
- for (int j = 0; j < 4; ++j)
- std::cout << lr1(i,j) << " ";
- std::cout << "\n";
+ for (int j = 0; j < 4; ++j)
+ std::cout << lr1(i,j) << " ";
+ std::cout << "\n";
}
std::cout << "\n";
std::cout << "LorentzRotation :\n" << lr2 << std::endl;
diff --git a/test/tcollbm.cxx b/test/tcollbm.cxx
index 4a41945f9f9..8f5e97ed8d9 100644
--- a/test/tcollbm.cxx
+++ b/test/tcollbm.cxx
@@ -163,8 +163,8 @@ Double_t Tester::TestByIndex() { // benchmark access by index
}
timer.Stop();
} else {
- std::cout << "Class " << GetName()
- << " doesn't support access by index" << std::endl;
+ std::cout << "Class " << GetName()
+ << " doesn't support access by index" << std::endl;
}
CleanUp();
return timer.CpuTime();
@@ -255,19 +255,19 @@ int main(int argc,char **argv)
TObjArray array(ntests); // Array of collections
array.Add(new Tester(nobjects,ntimes,moda,
- new TObjArray())); // Add TObjArray
+ new TObjArray())); // Add TObjArray
j++;
deltas[j] = ((Tester*)(array[j]))->DoTest();
if(deltas[j] < smin) { idx=j; smin=deltas[j]; }
array.Add(new Tester(nobjects,ntimes,moda,
- new TClonesArray("TNamed",nobjects))); // Add TClonesArray
+ new TClonesArray("TNamed",nobjects))); // Add TClonesArray
j++;
deltas[j] = ((Tester*)(array[j]))->DoTest();
if(deltas[j] < smin) { idx=j; smin=deltas[j]; }
array.Add(new Tester(nobjects,ntimes,moda,
- new TBtree())); // Add TBTree
+ new TBtree())); // Add TBTree
j++;
deltas[j] = ((Tester*)(array[j]))->DoTest();
if(deltas[j] < smin) { idx=j; smin=deltas[j]; }
@@ -275,31 +275,31 @@ int main(int argc,char **argv)
if(moda != 1) { // Skip classes without operator[] from index test
array.Add(new Tester(nobjects,ntimes,moda,
- new TOrdCollection())); // Add TOrdCollection
+ new TOrdCollection())); // Add TOrdCollection
j++;
deltas[j] = ((Tester*)(array[j]))->DoTest();
if(deltas[j] < smin) { idx=j; smin=deltas[j]; }
array.Add(new Tester(nobjects,ntimes,moda,
- new TList())); // Add TList
+ new TList())); // Add TList
j++;
deltas[j] = ((Tester*)(array[j]))->DoTest();
if(deltas[j] < smin) { idx=j; smin=deltas[j]; }
array.Add(new Tester(nobjects,ntimes,moda,
- new TSortedList())); // Add TSortedList
+ new TSortedList())); // Add TSortedList
j++;
deltas[j] = ((Tester*)(array[j]))->DoTest();
if(deltas[j] < smin) { idx=j; smin=deltas[j]; }
array.Add(new Tester(nobjects,ntimes,moda,
- new THashList())); // Add THashList
+ new THashList())); // Add THashList
j++;
deltas[j] = ((Tester*)(array[j]))->DoTest();
if(deltas[j] < smin) { idx=j; smin=deltas[j]; }
array.Add(new Tester(nobjects,ntimes,moda,
- new THashTable())); // Add THashTable
+ new THashTable())); // Add THashTable
j++;
deltas[j] = ((Tester*)(array[j]))->DoTest();
if(deltas[j] < smin) { idx=j; smin=deltas[j]; }
@@ -327,8 +327,8 @@ int main(int argc,char **argv)
Printf("\tAverage (msec)\tRatio\t\tClassName");
for (int i=0;i<j;i++) {
- Printf("\t%f\t%f\t%s",
- deltas[i],deltas[i]/smin,array[i]->GetName());
+ Printf("\t%f\t%f\t%s",
+ deltas[i],deltas[i]/smin,array[i]->GetName());
}
array.Delete();
return 0;
diff --git a/test/vlazy.cxx b/test/vlazy.cxx
index 8623d696945..3a6572a7759 100644
--- a/test/vlazy.cxx
+++ b/test/vlazy.cxx
@@ -44,7 +44,7 @@ downsample_matrix::downsample_matrix(const TMatrix &orig_matrix)
(orig_matrix.GetNrows()+1)/2 + orig_matrix.GetRowLwb()-1,
orig_matrix.GetColLwb(),
(orig_matrix.GetNcols()+1)/2 + orig_matrix.GetColLwb()-1),
- fOrigMatrix(orig_matrix)
+fOrigMatrix(orig_matrix)
{ }
// "construct" the new matrix (when the lazy matrix is being "rolled out")
diff --git a/test/vmatrix.cxx b/test/vmatrix.cxx
index d6ccfb07015..9a6b47fc29d 100644
--- a/test/vmatrix.cxx
+++ b/test/vmatrix.cxx
@@ -947,7 +947,7 @@ void stress_determinant(Int_t msize)
std::cout << "\nCheck to see that the determinant of the unit matrix is one";
m.UnitMatrix();
if (gVerbose)
- std::cout << "\n determinant is " << m.Determinant();
+ std::cout << "\n determinant is " << m.Determinant();
ok &= ( m.Determinant() == 1 ) ? kTRUE : kFALSE;
if (gVerbose)
@@ -958,7 +958,7 @@ void stress_determinant(Int_t msize)
m(i,j) = ( i==j ? pattern : 0 );
}
if (gVerbose)
- std::cout << "\n determinant is " << m.Determinant() << " should be " << TMath::Power(pattern,(double)m.GetNrows()) <<std::endl;
+ std::cout << "\n determinant is " << m.Determinant() << " should be " << TMath::Power(pattern,(double)m.GetNrows()) <<std::endl;
ok &= ( TMath::Abs(m.Determinant()-TMath::Power(pattern,(double)m.GetNrows())) < DBL_EPSILON ) ? kTRUE : kFALSE;
if (gVerbose)
@@ -1018,8 +1018,8 @@ void stress_determinant(Int_t msize)
if (0)
{
if (gVerbose)
- std::cout << "\nCheck the determinant for the singular matrix"
- "\n defined as above with zero first row";
+ std::cout << "\nCheck the determinant for the singular matrix"
+ "\n\tdefined as above with zero first row";
m.Zero();
{
for (Int_t i = m.GetRowLwb()+1; i <= m.GetRowUpb(); i++)
@@ -1027,7 +1027,7 @@ void stress_determinant(Int_t msize)
m(i,j) = ( i==(m.GetColUpb()+m.GetColLwb()-j) ? pattern : 0 );
}
if (gVerbose)
- std::cout << "\n determinant is " << m.Determinant();
+ std::cout << "\n\tdeterminant is " << m.Determinant();
ok &= ( m.Determinant() == 0 ) ? kTRUE : kFALSE;
}
diff --git a/tutorials/eve/alice_esd.C b/tutorials/eve/alice_esd.C
index 79b27189197..ad1c6f73aab 100644
--- a/tutorials/eve/alice_esd.C
+++ b/tutorials/eve/alice_esd.C
@@ -123,7 +123,7 @@ void load_event();
void alice_esd_read();
TEveTrack* esd_make_track(TEveTrackPropagator* trkProp, Int_t index,
AliESDtrack* at,
- AliExternalTrackParam* tp=0);
+ AliExternalTrackParam* tp=0);
Bool_t trackIsOn(AliESDtrack* t, Int_t mask);
void trackGetPos(AliExternalTrackParam* tp, Double_t r[3]);
void trackGetMomentum(AliExternalTrackParam* tp, Double_t p[3]);
@@ -462,9 +462,9 @@ void alice_esd_read()
//______________________________________________________________________________
TEveTrack* esd_make_track(TEveTrackPropagator* trkProp,
- Int_t index,
- AliESDtrack* at,
- AliExternalTrackParam* tp)
+ Int_t index,
+ AliESDtrack* at,
+ AliExternalTrackParam* tp)
{
// Helper function creating TEveTrack from AliESDtrack.
//
diff --git a/tutorials/eve/alice_esd_split.C b/tutorials/eve/alice_esd_split.C
index d478cbe59b6..85c1468b7ff 100644
--- a/tutorials/eve/alice_esd_split.C
+++ b/tutorials/eve/alice_esd_split.C
@@ -126,7 +126,7 @@ void update_projections();
void alice_esd_read();
TEveTrack* esd_make_track(TEveTrackPropagator* trkProp, Int_t index, AliESDtrack* at,
- AliExternalTrackParam* tp=0);
+ AliExternalTrackParam* tp=0);
Bool_t trackIsOn(AliESDtrack* t, Int_t mask);
void trackGetPos(AliExternalTrackParam* tp, Double_t r[3]);
void trackGetMomentum(AliExternalTrackParam* tp, Double_t p[3]);
@@ -462,9 +462,9 @@ void alice_esd_read()
//______________________________________________________________________________
TEveTrack* esd_make_track(TEveTrackPropagator* trkProp,
- Int_t index,
- AliESDtrack* at,
- AliExternalTrackParam* tp)
+ Int_t index,
+ AliESDtrack* at,
+ AliExternalTrackParam* tp)
{
// Helper function creating TEveTrack from AliESDtrack.
//
diff --git a/tutorials/eve/boxset.C b/tutorials/eve/boxset.C
index 251f7065c0a..50852445c6a 100644
--- a/tutorials/eve/boxset.C
+++ b/tutorials/eve/boxset.C
@@ -4,7 +4,7 @@
// Demonstrates usage of TEveBoxSet class.
TEveBoxSet* boxset(Float_t x=0, Float_t y=0, Float_t z=0,
- Int_t num=100, Bool_t registerSet=kTRUE)
+ Int_t num=100, Bool_t registerSet=kTRUE)
{
TEveManager::Create();
@@ -47,7 +47,7 @@ TEveBoxSet* boxset(Float_t x=0, Float_t y=0, Float_t z=0,
}
TEveBoxSet* boxset_colisval(Float_t x=0, Float_t y=0, Float_t z=0,
- Int_t num=100, Bool_t registerSet=kTRUE)
+ Int_t num=100, Bool_t registerSet=kTRUE)
{
TEveManager::Create();
diff --git a/tutorials/eve/boxset_cones.C b/tutorials/eve/boxset_cones.C
index 759ccf83405..758e7ee854d 100644
--- a/tutorials/eve/boxset_cones.C
+++ b/tutorials/eve/boxset_cones.C
@@ -4,7 +4,7 @@
// Demonstrates usage of 'cone' mode in TEveBoxSet class.
TEveBoxSet* boxset_cones(Float_t x=0, Float_t y=0, Float_t z=0,
- Int_t num=100, Bool_t register=kTRUE)
+ Int_t num=100, Bool_t register=kTRUE)
{
TEveManager::Create();
diff --git a/tutorials/eve/hierarchical_scene.C b/tutorials/eve/hierarchical_scene.C
index 634991a0666..4ecdf4ce3e8 100644
--- a/tutorials/eve/hierarchical_scene.C
+++ b/tutorials/eve/hierarchical_scene.C
@@ -1,7 +1,7 @@
const Int_t Ns = 7;
void add_blobs(TEveElement* p, Float_t rad, Float_t height, Float_t size,
- Int_t level)
+ Int_t level)
{
if (level <= 0) return;
@@ -11,8 +11,8 @@ void add_blobs(TEveElement* p, Float_t rad, Float_t height, Float_t size,
x->SetShape(new TGeoSphere(0, size));
Double_t phi = TMath::TwoPi() * i / Ns;
x->RefMainTrans().SetPos(rad*TMath::Cos(phi),
- rad*TMath::Sin(phi),
- height);
+ rad*TMath::Sin(phi),
+ height);
x->SetMainColor(TColor::GetColorPalette
(gRandom->Integer(TColor::GetNumberOfColors())));
p->AddElement(x);
diff --git a/tutorials/eve/jetcone.C b/tutorials/eve/jetcone.C
index f186f6921cd..b631d6d6c0d 100644
--- a/tutorials/eve/jetcone.C
+++ b/tutorials/eve/jetcone.C
@@ -134,8 +134,8 @@ TEveVector GetTEveVector(Float_t eta, Float_t phi)
using namespace TMath;
TEveVector vec( (Float_t) Cos ( (Double_t) phi)/ CosH( (Double_t) eta ),
- (Float_t) Sin ( (Double_t) phi)/ CosH( (Double_t) eta ),
- (Float_t) TanH( (Double_t) eta ) );
+ (Float_t) Sin ( (Double_t) phi)/ CosH( (Double_t) eta ),
+ (Float_t) TanH( (Double_t) eta ) );
return vec;
}
diff --git a/tutorials/eve/track.C b/tutorials/eve/track.C
index f066b24674b..77095a616a1 100644
--- a/tutorials/eve/track.C
+++ b/tutorials/eve/track.C
@@ -251,12 +251,12 @@ void track(Int_t mode = 1, Bool_t isRungeKutta = kTRUE)
prop->SetMagFieldObj(mf);
prop->SetMaxR(1000);
prop->SetMaxZ(1000);
- prop->SetRnrDaughters(kTRUE);
- prop->SetRnrDecay(kTRUE);
- prop->RefPMAtt().SetMarkerStyle(4);
+ prop->SetRnrDaughters(kTRUE);
+ prop->SetRnrDecay(kTRUE);
+ prop->RefPMAtt().SetMarkerStyle(4);
list->SetElementName(Form("%s, CMS field", list->GetElementName()));
-
+
TEveRecTrackD *rc = new TEveRecTrackD();
rc->fV.Set(0.027667, 0.007919, 0.895964);
rc->fP.Set(3.903134, 2.252232, -3.731366);
@@ -274,8 +274,8 @@ void track(Int_t mode = 1, Bool_t isRungeKutta = kTRUE)
track->AddPathMark(TEvePathMarkD(TEvePathMarkD::kDecay,
TEveVectorD(2.249656e+02, 5.835767e+02, -5.565275e+02)));
- track->SetRnrPoints(kTRUE);
- track->SetMarkerStyle(4);
+ track->SetRnrPoints(kTRUE);
+ track->SetMarkerStyle(4);
break;
}
@@ -290,10 +290,10 @@ void track(Int_t mode = 1, Bool_t isRungeKutta = kTRUE)
prop->SetMagFieldObj(mf);
prop->SetMaxR(1000);
prop->SetMaxZ(1000);
- prop->SetRnrReferences(kTRUE);
- prop->SetRnrDaughters(kTRUE);
- prop->SetRnrDecay(kTRUE);
- prop->RefPMAtt().SetMarkerStyle(4);
+ prop->SetRnrReferences(kTRUE);
+ prop->SetRnrDaughters(kTRUE);
+ prop->SetRnrDecay(kTRUE);
+ prop->RefPMAtt().SetMarkerStyle(4);
list->SetElementName(Form("%s, CMS field", list->GetElementName()));
TEveRecTrackD *rc = new TEveRecTrackD();
@@ -320,8 +320,8 @@ void track(Int_t mode = 1, Bool_t isRungeKutta = kTRUE)
track->AddPathMark(TEvePathMarkD(TEvePathMarkD::kDecay,
TEveVectorD(1.884976e+02, 7.202000e+02, 7.919290e+01)));
- track->SetRnrPoints(kTRUE);
- track->SetMarkerStyle(4);
+ track->SetRnrPoints(kTRUE);
+ track->SetMarkerStyle(4);
break;
}
@@ -332,10 +332,10 @@ void track(Int_t mode = 1, Bool_t isRungeKutta = kTRUE)
prop->SetMagFieldObj(new TEveMagFieldDuo(350, -3.5, 2.0));
prop->SetMaxR(1000);
prop->SetMaxZ(1000);
- prop->SetRnrReferences(kTRUE);
- prop->SetRnrDaughters(kTRUE);
- prop->SetRnrDecay(kTRUE);
- prop->RefPMAtt().SetMarkerStyle(4);
+ prop->SetRnrReferences(kTRUE);
+ prop->SetRnrDaughters(kTRUE);
+ prop->SetRnrDecay(kTRUE);
+ prop->RefPMAtt().SetMarkerStyle(4);
list->SetElementName(Form("%s, Some ILC Detector field",
list->GetElementName()));
@@ -352,8 +352,8 @@ void track(Int_t mode = 1, Bool_t isRungeKutta = kTRUE)
track->AddPathMark(TEvePathMarkD(TEvePathMarkD::kDecay,
TEveVectorD(6.527213e+02, 1.473249e+02, -8.348498e+01)));
- track->SetRnrPoints(kTRUE);
- track->SetMarkerStyle(4);
+ track->SetRnrPoints(kTRUE);
+ track->SetMarkerStyle(4);
break;
}
diff --git a/tutorials/fit/Ifit.C b/tutorials/fit/Ifit.C
index 9f6936d489d..48cd469e84f 100644
--- a/tutorials/fit/Ifit.C
+++ b/tutorials/fit/Ifit.C
@@ -42,30 +42,30 @@ void fcn(Int_t &npar, Double_t *gin, Double_t &f, Double_t *par, Int_t iflag)
void Ifit()
{
// The z values
- z[0]=1;
- z[1]=0.96;
- z[2]=0.89;
- z[3]=0.85;
- z[4]=0.78;
+ z[0]=1;
+ z[1]=0.96;
+ z[2]=0.89;
+ z[3]=0.85;
+ z[4]=0.78;
// The errors on z values
Float_t error = 0.01;
- errorz[0]=error;
- errorz[1]=error;
- errorz[2]=error;
- errorz[3]=error;
- errorz[4]=error;
+ errorz[0]=error;
+ errorz[1]=error;
+ errorz[2]=error;
+ errorz[3]=error;
+ errorz[4]=error;
// the x values
- x[0]=1.5751;
- x[1]=1.5825;
- x[2]=1.6069;
- x[3]=1.6339;
- x[4]=1.6706;
+ x[0]=1.5751;
+ x[1]=1.5825;
+ x[2]=1.6069;
+ x[3]=1.6339;
+ x[4]=1.6706;
// the y values
- y[0]=1.0642;
- y[1]=0.97685;
- y[2]=1.13168;
- y[3]=1.128654;
- y[4]=1.44016;
+ y[0]=1.0642;
+ y[1]=0.97685;
+ y[2]=1.13168;
+ y[3]=1.128654;
+ y[4]=1.44016;
TMinuit *gMinuit = new TMinuit(5); //initialize TMinuit with a maximum of 5 params
gMinuit->SetFCN(fcn);
diff --git a/tutorials/fit/TestBinomial.C b/tutorials/fit/TestBinomial.C
index 5fef8818e5b..647b87f8394 100644
--- a/tutorials/fit/TestBinomial.C
+++ b/tutorials/fit/TestBinomial.C
@@ -132,8 +132,8 @@ void TestBinomial(int nloop = 100, int nevts = 100, bool plot=false)
TCanvas* cEvt;
if (plot) {
cEvt = new TCanvas(Form("cEnv%d",iloop),
- Form("plots for experiment %d", iloop),
- 1000, 600);
+ Form("plots for experiment %d", iloop),
+ 1000, 600);
cEvt->Divide(1,2);
cEvt->cd(1);
hM2D->DrawCopy("HIST");
@@ -145,29 +145,29 @@ void TestBinomial(int nloop = 100, int nevts = 100, bool plot=false)
Int_t status = 0;
switch (fit) {
case 0:
- hM2E->Fit(fM2Fit, "RN");
- if (plot) {
- hM2E->DrawCopy("E");
- fM2Fit->DrawCopy("SAME");
- }
- break;
+ hM2E->Fit(fM2Fit, "RN");
+ if (plot) {
+ hM2E->DrawCopy("E");
+ fM2Fit->DrawCopy("SAME");
+ }
+ break;
case 1:
- if (fM2Fit2) delete fM2Fit2;
- fM2Fit2 = dynamic_cast<TF1*>(fM2Fit->Clone("fM2Fit2"));
- if (fM2Fit2->GetParameter(0) >= 1.0)
- fM2Fit2->SetParameter(0, 0.95);
- fM2Fit2->SetParLimits(0, 0.0, 1.0);
- TBinomialEfficiencyFitter bef(hM2N, hM2D);
- status = bef.Fit(fM2Fit2,"RI");
- if (status!=0) {
- std::cerr << "Error performing binomial efficiency fit, result = "
- << status << std::endl;
- continue;
- }
- if (plot) {
- fM2Fit2->SetLineColor(kRed);
- fM2Fit2->DrawCopy("SAME");
- }
+ if (fM2Fit2) delete fM2Fit2;
+ fM2Fit2 = dynamic_cast<TF1*>(fM2Fit->Clone("fM2Fit2"));
+ if (fM2Fit2->GetParameter(0) >= 1.0)
+ fM2Fit2->SetParameter(0, 0.95);
+ fM2Fit2->SetParLimits(0, 0.0, 1.0);
+ TBinomialEfficiencyFitter bef(hM2N, hM2D);
+ status = bef.Fit(fM2Fit2,"RI");
+ if (status!=0) {
+ std::cerr << "Error performing binomial efficiency fit, result = "
+ << status << std::endl;
+ continue;
+ }
+ if (plot) {
+ fM2Fit2->SetLineColor(kRed);
+ fM2Fit2->DrawCopy("SAME");
+ }
}
if (status != 0) break;
@@ -179,13 +179,13 @@ void TestBinomial(int nloop = 100, int nevts = 100, bool plot=false)
Double_t fwidth = fM2Fit->GetParameter(2);
Double_t ewidth = fM2Fit->GetParError(2);
if (fit == 1) {
- fnorm = fM2Fit2->GetParameter(0);
- enorm = fM2Fit2->GetParError(0);
- fthreshold = fM2Fit2->GetParameter(1);
- ethreshold = fM2Fit2->GetParError(1);
- fwidth = fM2Fit2->GetParameter(2);
- ewidth = fM2Fit2->GetParError(2);
- hChisquared->Fill(fM2Fit2->GetProb());
+ fnorm = fM2Fit2->GetParameter(0);
+ enorm = fM2Fit2->GetParError(0);
+ fthreshold = fM2Fit2->GetParameter(1);
+ ethreshold = fM2Fit2->GetParError(1);
+ fwidth = fM2Fit2->GetParameter(2);
+ ewidth = fM2Fit2->GetParError(2);
+ hChisquared->Fill(fM2Fit2->GetProb());
}
TH1D* h = dynamic_cast<TH1D*>(hbiasNorm[fit]);
diff --git a/tutorials/fit/TwoHistoFit2D.C b/tutorials/fit/TwoHistoFit2D.C
index 39cc91e10d3..53b047dad52 100644
--- a/tutorials/fit/TwoHistoFit2D.C
+++ b/tutorials/fit/TwoHistoFit2D.C
@@ -152,18 +152,18 @@ int TwoHistoFit2D(bool global = true) {
for (int ix = 1; ix <= nbinX1; ++ix) {
for (int iy = 1; iy <= nbinY1; ++iy) {
if ( h1->GetBinContent(ix,iy) > 0 ) {
- coords.push_back( std::make_pair(xaxis1->GetBinCenter(ix), yaxis1->GetBinCenter(iy) ) );
- values.push_back( h1->GetBinContent(ix,iy) );
- errors.push_back( h1->GetBinError(ix,iy) );
+ coords.push_back( std::make_pair(xaxis1->GetBinCenter(ix), yaxis1->GetBinCenter(iy) ) );
+ values.push_back( h1->GetBinContent(ix,iy) );
+ errors.push_back( h1->GetBinError(ix,iy) );
}
}
}
for (int ix = 1; ix <= nbinX2; ++ix) {
for (int iy = 1; iy <= nbinY2; ++iy) {
if ( h2->GetBinContent(ix,iy) > 0 ) {
- coords.push_back( std::make_pair(xaxis2->GetBinCenter(ix), yaxis2->GetBinCenter(iy) ) );
- values.push_back( h2->GetBinContent(ix,iy) );
- errors.push_back( h2->GetBinError(ix,iy) );
+ coords.push_back( std::make_pair(xaxis2->GetBinCenter(ix), yaxis2->GetBinCenter(iy) ) );
+ values.push_back( h2->GetBinContent(ix,iy) );
+ errors.push_back( h2->GetBinError(ix,iy) );
}
}
}
@@ -214,7 +214,7 @@ int TwoHistoFit2D(bool global = true) {
h2->Fit(func);
}
-
+
// Create a new canvas.
TCanvas * c1 = new TCanvas("c1","Two HIstogram Fit example",100,10,900,800);
diff --git a/tutorials/fit/fit2dHist.C b/tutorials/fit/fit2dHist.C
index b0d90ee22bb..5787bee7eda 100644
--- a/tutorials/fit/fit2dHist.C
+++ b/tutorials/fit/fit2dHist.C
@@ -213,7 +213,7 @@ int fit2dHist(int option=1) {
// fit independently
h1->Fit(func);
h2->Fit(func);
- }
+ }
// Create a new canvas.
TCanvas * c1 = new TCanvas("c1","Two HIstogram Fit example",100,10,900,800);
diff --git a/tutorials/fit/fitLinear2.C b/tutorials/fit/fitLinear2.C
index 1963de51537..759d4b379ae 100644
--- a/tutorials/fit/fitLinear2.C
+++ b/tutorials/fit/fitLinear2.C
@@ -27,7 +27,7 @@ void fitLinear2()
for (i=0; i<n; i++){
x[0 + i*5] = rand.Uniform(-10, 10);
x[1 + i*5] = rand.Uniform(-10, 10);
- x[2 + i*5] = rand.Uniform(-10, 10);
+ x[2 + i*5] = rand.Uniform(-10, 10);
x[3 + i*5] = rand.Uniform(-10, 10);
x[4 + i*5] = rand.Uniform(-10, 10);
e[i] = 0.01;
@@ -56,7 +56,7 @@ void fitLinear2()
for (i=n; i<n*2; i++) {
x[0+i*5] = rand.Uniform(-10, 10);
x[1+i*5] = rand.Uniform(-10, 10);
- x[2+i*5] = rand.Uniform(-10, 10);
+ x[2+i*5] = rand.Uniform(-10, 10);
x[3+i*5] = rand.Uniform(-10, 10);
x[4+i*5] = rand.Uniform(-10, 10);
e[i] = 0.01;
diff --git a/tutorials/fit/langaus.C b/tutorials/fit/langaus.C
index c3dbd544101..b637c252c3f 100644
--- a/tutorials/fit/langaus.C
+++ b/tutorials/fit/langaus.C
@@ -1,6 +1,6 @@
//-----------------------------------------------------------------------
//
-// Convoluted Landau and Gaussian Fitting Function
+// Convoluted Landau and Gaussian Fitting Function
// (using ROOT's Landau and Gauss functions)
//
// Based on a Fortran code by R.Fruehwirth (fruhwirth@hephy.oeaw.ac.at)
diff --git a/tutorials/fit/multidimfit.C b/tutorials/fit/multidimfit.C
index a151e493cd0..d972493b9d1 100644
--- a/tutorials/fit/multidimfit.C
+++ b/tutorials/fit/multidimfit.C
@@ -231,7 +231,7 @@ Int_t multidimfit(bool doFit = true)
for (j = 0; j < nVars; j++)
if (x[j] < xMin[j] || x[j] > xMax[j])
- break;
+ break;
// If we get through the loop above, all variables are in range
if (j == nVars)
diff --git a/tutorials/geom/csgdemo.C b/tutorials/geom/csgdemo.C
index a31a3c7d2cf..1bd5f7f627c 100644
--- a/tutorials/geom/csgdemo.C
+++ b/tutorials/geom/csgdemo.C
@@ -12,8 +12,8 @@ void csgdemo ()
bar->AddButton("Union ", "s_union()", "A + B ");
bar->AddButton("Intersection ", "s_intersection()","A * B ");
bar->AddButton("Difference ", "s_difference()","A - B ");
- //These two buttons are disabled cause of bugs
- bar->AddButton("Complex composite", "complex_1()","(A * B) + (C - D)");
+ //These two buttons are disabled cause of bugs
+ bar->AddButton("Complex composite", "complex_1()","(A * B) + (C - D)");
bar->Show();
gROOT->SaveContext();
@@ -22,9 +22,9 @@ void csgdemo ()
//______________________________________________________________________________
void MakePicture()
{
- gGeoManager->GetGeomPainter()->SetRaytracing(kFALSE);
- gPad->Modified();
- gPad->Update();
+ gGeoManager->GetGeomPainter()->SetRaytracing(kFALSE);
+ gPad->Modified();
+ gPad->Update();
}
diff --git a/tutorials/geom/geodemo.C b/tutorials/geom/geodemo.C
index ce4a1f8635b..2e18fd651c6 100644
--- a/tutorials/geom/geodemo.C
+++ b/tutorials/geom/geodemo.C
@@ -927,7 +927,7 @@ void torus(Int_t iaxis=0, Int_t ndiv=8, Double_t start=0, Double_t step=0)
pt->SetTextSize(0.044);
pt->Draw();
c->cd(1);
-}
+}
//______________________________________________________________________________
void trd1(Int_t iaxis=0, Int_t ndiv=8, Double_t start=0, Double_t step=0)
@@ -1806,4 +1806,3 @@ void align()
gPad->Update();
}
}
-
diff --git a/tutorials/geom/lego.C b/tutorials/geom/lego.C
index fa1f45dba4b..236d30e77b6 100644
--- a/tutorials/geom/lego.C
+++ b/tutorials/geom/lego.C
@@ -28,11 +28,11 @@ void lego()
// create volume
- TGeoVolume *top=geom->MakeBox("top",Air,100,100,100);
+ TGeoVolume *top=geom->MakeBox("top",Air,100,100,100);
geom->SetTopVolume(top);
geom->SetTopVisible(0);
- // If you want to see the boundary, please input the number, 1 instead of 0.
- // Like this, geom->SetTopVisible(1);
+ // If you want to see the boundary, please input the number, 1 instead of 0.
+ // Like this, geom->SetTopVisible(1);
//----------------------------------------------------------------------
diff --git a/tutorials/geom/station2.C b/tutorials/geom/station2.C
index cabf47eb058..cf8b3f18cbc 100644
--- a/tutorials/geom/station2.C
+++ b/tutorials/geom/station2.C
@@ -27,8 +27,8 @@ void station2()
TGeoVolume *top=geom->MakeBox("top",Air,1000,1000,1000);
geom->SetTopVolume(top);
geom->SetTopVisible(0);
- // If you want to see the boundary, please input the number, 1 instead of 0.
- // Like this, geom->SetTopVisible(1);
+ // If you want to see the boundary, please input the number, 1 instead of 0.
+ // Like this, geom->SetTopVisible(1);
TGeoVolume *b1=geom->MakeBox("b1",Iron,1,2,3);
diff --git a/tutorials/graphics/canvas.C b/tutorials/graphics/canvas.C
index ca0230db1b1..369fe696373 100644
--- a/tutorials/graphics/canvas.C
+++ b/tutorials/graphics/canvas.C
@@ -115,5 +115,5 @@
// Try to change the canvas size.
// In the canvas "File" menu, select the option "Print" to produce
// a PostScript file with a copy of the canvas.
-
+
}
diff --git a/tutorials/graphics/gaxis.C b/tutorials/graphics/gaxis.C
index 56e98f2577c..c4dbb449eac 100644
--- a/tutorials/graphics/gaxis.C
+++ b/tutorials/graphics/gaxis.C
@@ -1,5 +1,5 @@
{
-//Simple example illustrating how to draw TGaxis objects in various formats.
+//Simple example illustrating how to draw TGaxis objects in various formats.
//To see the output of this macro, click begin_html <a href="gif/gaxis.gif" >here</a> end_html
//Author: Rene Brun
diff --git a/tutorials/hist/ContourList.C b/tutorials/hist/ContourList.C
index fcfbf897d52..9241442c627 100644
--- a/tutorials/hist/ContourList.C
+++ b/tutorials/hist/ContourList.C
@@ -126,8 +126,8 @@ TCanvas *ContourList(){
nGraphs ++;
printf("\tGraph: %d -- %d Elements\n", nGraphs,curv->GetN());
- // Draw clones of the graphs to avoid deletions in case the 1st
- // pad is redrawn.
+ // Draw clones of the graphs to avoid deletions in case the 1st
+ // pad is redrawn.
gc = (TGraph*)curv->Clone();
gc->Draw("C");
diff --git a/tutorials/hist/hsum.C b/tutorials/hist/hsum.C
index 0b169bce66f..8192e716066 100644
--- a/tutorials/hist/hsum.C
+++ b/tutorials/hist/hsum.C
@@ -2,7 +2,7 @@
void hsum() {
//
// To see the output of this macro, click begin_html <a href="gif/hsum.gif" >here</a> end_html
-// Simple example illustrating how to use the C++ interpreter
+// Simple example illustrating how to use the C++ interpreter
// to fill histograms in a loop and show the graphics results
//Author: Rene Brun
diff --git a/tutorials/hist/hsumTimer.C b/tutorials/hist/hsumTimer.C
index a82cc9b8642..e0732361543 100644
--- a/tutorials/hist/hsumTimer.C
+++ b/tutorials/hist/hsumTimer.C
@@ -7,7 +7,7 @@ TCanvas *c1;
void hsumTimer(Int_t nfill=100000)
{
//
-// Simple example illustrating how to use the C++ interpreter
+// Simple example illustrating how to use the C++ interpreter
// to fill histograms in a loop and show the graphics results
// This program is a variant of the tutorial "hsum".
// It illustrates the use of Timers.
diff --git a/tutorials/hist/logscales.C b/tutorials/hist/logscales.C
index 1ed14472e6b..a705cc126a3 100644
--- a/tutorials/hist/logscales.C
+++ b/tutorials/hist/logscales.C
@@ -86,17 +86,17 @@ void logscales() {
f4->SetNpx(200);
Int_t a = 20;
for (int i=a; i>=1; i--) {
- f4 = new TF1(Form("f4b_%d",i),"x*sin(x+10)*[0]/[1]+25",1,21);
- f4->SetParameter(0,i);
- f4->SetParameter(1,a);
- f4->SetNpx(200);
- f4->SetLineWidth(1); f4->SetLineColor(i+10);
- f4->Draw("same");
- f4 = new TF1(Form("f4c_%d",i),"x*cos(x+10)*sin(x+10)*[0]/[1]+25",1,25);
- f4->SetParameter(0,i);
- f4->SetParameter(1,a);
- f4->SetNpx(200);
- f4->SetLineWidth(1); f4->SetLineColor(i+30); f4->Draw("same");
+ f4 = new TF1(Form("f4b_%d",i),"x*sin(x+10)*[0]/[1]+25",1,21);
+ f4->SetParameter(0,i);
+ f4->SetParameter(1,a);
+ f4->SetNpx(200);
+ f4->SetLineWidth(1); f4->SetLineColor(i+10);
+ f4->Draw("same");
+ f4 = new TF1(Form("f4c_%d",i),"x*cos(x+10)*sin(x+10)*[0]/[1]+25",1,25);
+ f4->SetParameter(0,i);
+ f4->SetParameter(1,a);
+ f4->SetNpx(200);
+ f4->SetLineWidth(1); f4->SetLineColor(i+30); f4->Draw("same");
}
pave3 = new TPaveText(1.2,8,9,15);
pave3->SetFillColor(42);
diff --git a/tutorials/hist/th2polyEurope.C b/tutorials/hist/th2polyEurope.C
index eba0c7a737a..575e1aaabea 100644
--- a/tutorials/hist/th2polyEurope.C
+++ b/tutorials/hist/th2polyEurope.C
@@ -39,21 +39,21 @@ void th2polyEurope(Int_t npoints=500000)
const Int_t nx = 36;
// see http://en.wikipedia.org/wiki/Area_and_population_of_European_countries
const char *countries[nx] = { "france", "spain", "sweden", "germany", "finland",
- "norway", "poland", "italy", "yugoslavia", "united_kingdom",
- "romania", "belarus","greece", "czechoslovakia","bulgaria",
- "iceland", "hungary","portugal","austria", "ireland",
- "lithuania", "latvia", "estonia", "denmark", "netherlands",
- "switzerland","moldova","belgium", "albania", "cyprus",
- "luxembourg", "andorra","malta", "liechtenstein", "san_marino",
- "monaco" };
+ "norway", "poland", "italy", "yugoslavia", "united_kingdom",
+ "romania", "belarus","greece", "czechoslovakia","bulgaria",
+ "iceland", "hungary","portugal","austria", "ireland",
+ "lithuania", "latvia", "estonia", "denmark", "netherlands",
+ "switzerland","moldova","belgium", "albania", "cyprus",
+ "luxembourg", "andorra","malta", "liechtenstein", "san_marino",
+ "monaco" };
Float_t surfaces[nx] = { 547030, 505580, 449964, 357021, 338145,
- 324220, 312685, 301230, 255438, 244820,
- 237500, 207600, 131940, 127711, 110910,
- 103000, 93030, 89242, 83870, 70280,
- 65200, 64589, 45226, 43094, 41526,
- 41290, 33843, 30528, 28748, 9250,
- 2586, 468, 316, 160, 61,
- 2};
+ 324220, 312685, 301230, 255438, 244820,
+ 237500, 207600, 131940, 127711, 110910,
+ 103000, 93030, 89242, 83870, 70280,
+ 65200, 64589, 45226, 43094, 41526,
+ 41290, 33843, 30528, 28748, 9250,
+ 2586, 468, 316, 160, 61,
+ 2};
TH1F *h = new TH1F("h","Countries surfaces (in km^{2})",3,0,3);
for (i=0; i<nx; i++) h->Fill(countries[i], surfaces[i]);
diff --git a/tutorials/histfactory/ModifyInterpolation.C b/tutorials/histfactory/ModifyInterpolation.C
index a6343a273af..e9fe4529155 100644
--- a/tutorials/histfactory/ModifyInterpolation.C
+++ b/tutorials/histfactory/ModifyInterpolation.C
@@ -96,9 +96,9 @@ void ModifyInterpolationForSet(RooArgSet* modifySet, int code){
while((tempObj=serverIt->Next())){
FlexibleInterpVar* flex = dynamic_cast<FlexibleInterpVar*>(tempObj);
if(flex){
- flex->printAllInterpCodes();
- flex->setInterpCode(*alpha,code);
- flex->printAllInterpCodes();
+ flex->printAllInterpCodes();
+ flex->setInterpCode(*alpha,code);
+ flex->printAllInterpCodes();
}
}
}
diff --git a/tutorials/math/TSVDUnfoldExample.C b/tutorials/math/TSVDUnfoldExample.C
index bc6b4ccb82b..a6ea0c58f2d 100644
--- a/tutorials/math/TSVDUnfoldExample.C
+++ b/tutorials/math/TSVDUnfoldExample.C
@@ -86,7 +86,7 @@ void TSVDUnfoldExample()
datatrue->Fill(xt);
Double_t x = Reconstruct( xt, R );
if (x != cutdummy)
- data->Fill(x);
+ data->Fill(x);
}
cout << "Created toy distributions and errors for: " << endl;
diff --git a/tutorials/math/binomial.C b/tutorials/math/binomial.C
index 927125dbe34..afa3ffc38fa 100755
--- a/tutorials/math/binomial.C
+++ b/tutorials/math/binomial.C
@@ -48,7 +48,7 @@ void binomialFancy() {
for(Int_t k=0; k<=j; k++)
res2+=TMath::Power(x,k)*TMath::Power(y,j-k)*TMath::Binomial(j,k);
if((err=TMath::Abs(res1-res2)/TMath::Abs(res1))>1e-10)
- printf("res1=%e res2=%e x=%e y=%e err=%e j=%d\n",res1,res2,x,y,err,j);
+ printf("res1=%e res2=%e x=%e y=%e err=%e j=%d\n",res1,res2,x,y,err,j);
serr +=err;
}
}
diff --git a/tutorials/math/limit.C b/tutorials/math/limit.C
index 1dd8204ac63..d1385b9f52c 100644
--- a/tutorials/math/limit.C
+++ b/tutorials/math/limit.C
@@ -23,7 +23,7 @@ void limit() {
// Create a new canvas.
TCanvas *c1 = new TCanvas("c1","Dynamic Filling Example",200,10,700,500);
c1->SetFillColor(42);
-
+
// Create some histograms
TH1D* background = new TH1D("background","The expected background",30,-4,4);
TH1D* signal = new TH1D("signal","the expected signal",30,-4,4);
diff --git a/tutorials/math/mathcoreGenVector.C b/tutorials/math/mathcoreGenVector.C
index bd1681dd13f..d84c8ce78a8 100644
--- a/tutorials/math/mathcoreGenVector.C
+++ b/tutorials/math/mathcoreGenVector.C
@@ -94,8 +94,8 @@ int testVector3D() {
std::cout << "\n************************************************************************\n "
- << " Vector 3D Test"
- << "\n************************************************************************\n";
+ << " Vector 3D Test"
+ << "\n************************************************************************\n";
//CINT cannot autoload classes known only via a typedef (here XYZVector)
gSystem->Load("libGenVector");
@@ -251,8 +251,8 @@ int testVector3D() {
int testPoint3D() {
std::cout << "\n************************************************************************\n "
- << " Point 3D Tests"
- << "\n************************************************************************\n";
+ << " Point 3D Tests"
+ << "\n************************************************************************\n";
@@ -344,8 +344,8 @@ int testPoint3D() {
int testLorentzVector() {
std::cout << "\n************************************************************************\n "
- << " Loorentz Vector Tests"
- << "\n************************************************************************\n";
+ << " Loorentz Vector Tests"
+ << "\n************************************************************************\n";
@@ -485,8 +485,8 @@ int testVectorUtil() {
std::cout << "\n************************************************************************\n "
- << " Utility Function Tests"
- << "\n************************************************************************\n";
+ << " Utility Function Tests"
+ << "\n************************************************************************\n";
std::cout << "Test Vector utility functions : ";
@@ -561,8 +561,8 @@ int testRotation() {
std::cout << "\n************************************************************************\n "
- << " Rotation and Transformation Tests"
- << "\n************************************************************************\n";
+ << " Rotation and Transformation Tests"
+ << "\n************************************************************************\n";
std::cout << "Test Vector Rotations : ";
ok = 0;
diff --git a/tutorials/math/mathcoreVectorFloatIO.C b/tutorials/math/mathcoreVectorFloatIO.C
index f716212dcd2..8ba8be88fdc 100644
--- a/tutorials/math/mathcoreVectorFloatIO.C
+++ b/tutorials/math/mathcoreVectorFloatIO.C
@@ -54,14 +54,14 @@ void write(int n) {
timer.Start();
for (int i = 0; i < n; ++i) {
- double Px = R.Gaus(0,10);
- double Py = R.Gaus(0,10);
- double Pz = R.Gaus(0,10);
- double E = R.Gaus(100,10);
- //CylindricalEta4D<double> & c = v1->Coordinates();
- //c.SetValues(Px,pY,pZ,E);
- v1->SetCoordinates(Px,Py,Pz,E);
- t1.Fill();
+ double Px = R.Gaus(0,10);
+ double Py = R.Gaus(0,10);
+ double Pz = R.Gaus(0,10);
+ double E = R.Gaus(100,10);
+ //CylindricalEta4D<double> & c = v1->Coordinates();
+ //c.SetValues(Px,pY,pZ,E);
+ v1->SetCoordinates(Px,Py,Pz,E);
+ t1.Fill();
}
f1.Write();
diff --git a/tutorials/math/mathcoreVectorIO.C b/tutorials/math/mathcoreVectorIO.C
index a8c896a19e5..192354a495d 100644
--- a/tutorials/math/mathcoreVectorIO.C
+++ b/tutorials/math/mathcoreVectorIO.C
@@ -37,12 +37,12 @@ void write(int n) {
R.SetSeed(1);
timer.Start();
double s = 0;
- for (int i = 0; i < n; ++i) {
- s += R.Gaus(0,10);
- s += R.Gaus(0,10);
- s += R.Gaus(0,10);
- s += R.Gaus(100,10);
- }
+ for (int i = 0; i < n; ++i) {
+ s += R.Gaus(0,10);
+ s += R.Gaus(0,10);
+ s += R.Gaus(0,10);
+ s += R.Gaus(100,10);
+ }
timer.Stop();
std::cout << s/double(n) << std::endl;
@@ -58,17 +58,17 @@ void write(int n) {
t1.Branch("LV branch","ROOT::Math::XYZTVector",&v1);
R.SetSeed(1);
- timer.Start();
- for (int i = 0; i < n; ++i) {
- double Px = R.Gaus(0,10);
- double Py = R.Gaus(0,10);
- double Pz = R.Gaus(0,10);
- double E = R.Gaus(100,10);
- //CylindricalEta4D<double> & c = v1->Coordinates();
- //c.SetValues(Px,pY,pZ,E);
- v1->SetCoordinates(Px,Py,Pz,E);
- t1.Fill();
- }
+ timer.Start();
+ for (int i = 0; i < n; ++i) {
+ double Px = R.Gaus(0,10);
+ double Py = R.Gaus(0,10);
+ double Pz = R.Gaus(0,10);
+ double E = R.Gaus(100,10);
+ //CylindricalEta4D<double> & c = v1->Coordinates();
+ //c.SetValues(Px,pY,pZ,E);
+ v1->SetCoordinates(Px,Py,Pz,E);
+ t1.Fill();
+ }
f1.Write();
timer.Stop();
@@ -90,12 +90,12 @@ void write(int n) {
R.SetSeed(1);
timer.Start();
for (int i = 0; i < n; ++i) {
- double Px = R.Gaus(0,10);
- double Py = R.Gaus(0,10);
- double Pz = R.Gaus(0,10);
- double E = R.Gaus(100,10);
- v2->SetPxPyPzE(Px,Py,Pz,E);
- t2.Fill();
+ double Px = R.Gaus(0,10);
+ double Py = R.Gaus(0,10);
+ double Pz = R.Gaus(0,10);
+ double E = R.Gaus(100,10);
+ v2->SetPxPyPzE(Px,Py,Pz,E);
+ t2.Fill();
}
f2.Write();
diff --git a/tutorials/math/principal.C b/tutorials/math/principal.C
index d75df0eab13..85130670b18 100644
--- a/tutorials/math/principal.C
+++ b/tutorials/math/principal.C
@@ -48,19 +48,19 @@ void principal(Int_t n=10, Int_t m=10000)
// First we create the un-correlated, random variables, according
// to one of three distributions
for (Int_t j = 0; j < n - c; j++) {
- if (j % 3 == 0)
- data[j] = random->Gaus(5,1);
- else if (j % 3 == 1)
- data[j] = random->Poisson(8);
- else
- data[j] = random->Exp(2);
+ if (j % 3 == 0)
+ data[j] = random->Gaus(5,1);
+ else if (j % 3 == 1)
+ data[j] = random->Poisson(8);
+ else
+ data[j] = random->Exp(2);
}
// Then we create the correlated variables
for (Int_t j = 0 ; j < c; j++) {
- data[n - c + j] = 0;
- for (Int_t k = 0; k < n - c - j; k++)
- data[n - c + j] += data[k];
+ data[n - c + j] = 0;
+ for (Int_t k = 0; k < n - c - j; k++)
+ data[n - c + j] += data[k];
}
// Finally we're ready to add this datapoint to the PCA
diff --git a/tutorials/mc/CompareMasses.C b/tutorials/mc/CompareMasses.C
index adcaf1dc4c7..89c65f52c60 100644
--- a/tutorials/mc/CompareMasses.C
+++ b/tutorials/mc/CompareMasses.C
@@ -11,66 +11,66 @@
void CompareMasses()
{
- TString massWidthFile = gSystem->UnixPathName(__FILE__);
- massWidthFile.ReplaceAll("CompareMasses.C","mass_width_2008.mc.txt");
+ TString massWidthFile = gSystem->UnixPathName(__FILE__);
+ massWidthFile.ReplaceAll("CompareMasses.C","mass_width_2008.mc.txt");
- FILE* file = fopen(massWidthFile.Data(),"r");
+ FILE* file = fopen(massWidthFile.Data(),"r");
- if (!file){
+ if (!file){
Printf("Could not open PDG particle file %s", massWidthFile.Data());
return;
- }
+ }
- char c[200];
- char cempty;
- Int_t pdg[4];
- Float_t mass, err1, err2, err;
- Int_t ndiff = 0;
+ char c[200];
+ char cempty;
+ Int_t pdg[4];
+ Float_t mass, err1, err2, err;
+ Int_t ndiff = 0;
- while (fgets(c, 200, file)) {
- if (c[0] != '*' && c[0] !='W') {
- //printf("%s",c);
- sscanf(&c[1], "%8d", &pdg[0]);
+ while (fgets(c, 200, file)) {
+ if (c[0] != '*' && c[0] !='W') {
+ //printf("%s",c);
+ sscanf(&c[1], "%8d", &pdg[0]);
- // check emptyness
- pdg[1] = 0;
- for(int i = 0;i<8;i++){
- sscanf(&c[9+i],"%c",&cempty);
- if(cempty != ' ')sscanf(&c[9],"%8d",&pdg[1]);
- }
+ // check emptyness
+ pdg[1] = 0;
+ for(int i = 0;i<8;i++){
+ sscanf(&c[9+i],"%c",&cempty);
+ if(cempty != ' ')sscanf(&c[9],"%8d",&pdg[1]);
+ }
- pdg[2] = 0;
- for(int i = 0;i<8;i++){
- sscanf(&c[17+i],"%c",&cempty);
- if(cempty != ' ')sscanf(&c[17],"%8d",&pdg[2]);
- }
+ pdg[2] = 0;
+ for(int i = 0;i<8;i++){
+ sscanf(&c[17+i],"%c",&cempty);
+ if(cempty != ' ')sscanf(&c[17],"%8d",&pdg[2]);
+ }
- pdg[3] = 0;
- for(int i = 0;i<8;i++){
- sscanf(&c[25+i],"%c",&cempty);
- if(cempty != ' ')sscanf(&c[25],"%8d",&pdg[3]);
- }
+ pdg[3] = 0;
+ for(int i = 0;i<8;i++){
+ sscanf(&c[25+i],"%c",&cempty);
+ if(cempty != ' ')sscanf(&c[25],"%8d",&pdg[3]);
+ }
- sscanf(&c[35],"%14f",&mass);
- sscanf(&c[50],"%8f",&err1);
- sscanf(&c[50],"%8f",&err2);
- err = TMath::Max((Double_t)err1,(Double_t)-1.*err2);
- for(int ipdg = 0;ipdg < 4;ipdg++){
- if(pdg[ipdg]==0)continue;
- TParticlePDG *partRoot = TDatabasePDG::Instance()->GetParticle(pdg[ipdg]);
- if(partRoot){
- Float_t massRoot = partRoot->Mass();
- Float_t deltaM = TMath::Abs(massRoot - mass);
- // if(deltaM > err){
- if (mass != 0.0 && deltaM/mass>1E-05){
- ndiff++;
- Printf("%10s %8d pdg mass %E pdg err %E root Mass %E >> deltaM %E = %3.3f%%",partRoot->GetName(),pdg[ipdg],mass,err,massRoot,deltaM,100.*deltaM/mass);
- }
- }
+ sscanf(&c[35],"%14f",&mass);
+ sscanf(&c[50],"%8f",&err1);
+ sscanf(&c[50],"%8f",&err2);
+ err = TMath::Max((Double_t)err1,(Double_t)-1.*err2);
+ for(int ipdg = 0;ipdg < 4;ipdg++){
+ if(pdg[ipdg]==0)continue;
+ TParticlePDG *partRoot = TDatabasePDG::Instance()->GetParticle(pdg[ipdg]);
+ if(partRoot){
+ Float_t massRoot = partRoot->Mass();
+ Float_t deltaM = TMath::Abs(massRoot - mass);
+ // if(deltaM > err){
+ if (mass != 0.0 && deltaM/mass>1E-05){
+ ndiff++;
+ Printf("%10s %8d pdg mass %E pdg err %E root Mass %E >> deltaM %E = %3.3f%%",partRoot->GetName(),pdg[ipdg],mass,err,massRoot,deltaM,100.*deltaM/mass);
+ }
+ }
+ }
}
- }
- }// while
- fclose(file);
- if (ndiff == 0) Printf("Crongratulations !! All particles in ROOT and PDG have identical masses");
-
+ }// while
+ fclose(file);
+ if (ndiff == 0) Printf("Crongratulations !! All particles in ROOT and PDG have identical masses");
+
}
diff --git a/tutorials/pythia/pythiaExample.C b/tutorials/pythia/pythiaExample.C
index ab071c197a5..fd75d5a0062 100644
--- a/tutorials/pythia/pythiaExample.C
+++ b/tutorials/pythia/pythiaExample.C
@@ -145,12 +145,12 @@ int makeEventSample(Int_t nEvents)
// After the run is over, we may want to do some summary plots:
TH1D* hist = new TH1D(HISTNAME, "p_{#perp} spectrum for #pi^{+}",
- 100, 0, 3);
+ 100, 0, 3);
hist->SetXTitle("p_{#perp}");
hist->SetYTitle("dN/dp_{#perp}");
char expression[64];
sprintf(expression,"sqrt(pow(%s.fPx,2)+pow(%s.fPy,2))>>%s",
- BRANCHNAME, BRANCHNAME, HISTNAME);
+ BRANCHNAME, BRANCHNAME, HISTNAME);
char selection[64];
sprintf(selection,"%s.fKF==%d", BRANCHNAME, PDGNUMBER);
tree->Draw(expression,selection);
diff --git a/tutorials/ruby/tornado.rb b/tutorials/ruby/tornado.rb
index b1febeb924b..e738a701630 100644
--- a/tutorials/ruby/tornado.rb
+++ b/tutorials/ruby/tornado.rb
@@ -22,9 +22,9 @@ view.SetRange(0, 0, 0, 4.0*rng, 2.0*rng, rng)
polymarkers = []
-d.step(numberOfCircles * d, d) do |j|
- # create a PolyMarker3D
- pm3d = TPolyMarker3D.new( numberOfPoints )
+d.step(numberOfCircles * d, d) do |j|
+ # create a PolyMarker3D
+ pm3d = TPolyMarker3D.new( numberOfPoints )
# set points
for i in 1..numberOfPoints do
csin = Math.sin( 2*Math::PI / numberOfPoints * i ) + 1
diff --git a/tutorials/tree/JetEvent.cxx b/tutorials/tree/JetEvent.cxx
index aa32e508336..f4d4820e2a4 100644
--- a/tutorials/tree/JetEvent.cxx
+++ b/tutorials/tree/JetEvent.cxx
@@ -72,14 +72,14 @@ void JetEvent::Build(Int_t jetm, Int_t trackm, Int_t hitam, Int_t hitbm) {
track->fPx = gRandom->Gaus(0,1);
track->fPy = gRandom->Gaus(0,1);
track->fPz = gRandom->Gaus(0,5);
- jet->fTracks.Add(track);
+ jet->fTracks.Add(track);
Int_t nhitsA = (Int_t)gRandom->Gaus(hitam,5);
for (Int_t ha=0;ha<nhitsA;ha++) {
hit = AddHitA();
hit->fX = 10000*j + 100*t +ha;
hit->fY = 10000*j + 100*t +ha+0.1;
hit->fZ = 10000*j + 100*t +ha+0.2;
- track->fHits.Add(hit);
+ track->fHits.Add(hit);
}
Int_t nhitsB = (Int_t)gRandom->Gaus(hitbm,2);
for (Int_t hb=0;hb<nhitsB;hb++) {
@@ -87,7 +87,7 @@ void JetEvent::Build(Int_t jetm, Int_t trackm, Int_t hitam, Int_t hitbm) {
hit->fX = 20000*j + 100*t +hb+0.3;
hit->fY = 20000*j + 100*t +hb+0.4;
hit->fZ = 20000*j + 100*t +hb+0.5;
- track->fHits.Add(hit);
+ track->fHits.Add(hit);
}
track->fNhit = nhitsA + nhitsB;
}
diff --git a/tutorials/tree/clonesA_Event.h b/tutorials/tree/clonesA_Event.h
index 242a74ca8c9..cf6588dd7f6 100644
--- a/tutorials/tree/clonesA_Event.h
+++ b/tutorials/tree/clonesA_Event.h
@@ -55,7 +55,7 @@ class TMrbSubevent_Caen:public TObject {
Int_t fTimeStamp; // time stamp, same as fUniqueID
TUsrHitBuffer fHitBuffer; // hit buffer to store subevent data
- ClassDef(TMrbSubevent_Caen, 1) // [Analyze] Base class for subevents: CAEN data stored in hit buffer
+ ClassDef(TMrbSubevent_Caen, 1) // [Analyze] Base class for subevents: CAEN data stored in hit buffer
};
//______________________________________________________
diff --git a/tutorials/tree/jets.C b/tutorials/tree/jets.C
index ac8df96fe45..ffe3f8d3598 100644
--- a/tutorials/tree/jets.C
+++ b/tutorials/tree/jets.C
@@ -48,9 +48,9 @@ void read() {
if (ev) continue; //dump first event only
cout << " Event: "<< ev
<< " Jets: " << event->GetNjet()
- << " Tracks: " << event->GetNtrack()
- << " Hits A: " << event->GetNhitA()
- << " Hits B: " << event->GetNhitB() << endl;
+ << " Tracks: " << event->GetNtrack()
+ << " Hits A: " << event->GetNhitA()
+ << " Hits B: " << event->GetNhitB() << endl;
}
}
diff --git a/tutorials/tree/parallelcoord.C b/tutorials/tree/parallelcoord.C
index 8861e507851..f75a888c6b5 100644
--- a/tutorials/tree/parallelcoord.C
+++ b/tutorials/tree/parallelcoord.C
@@ -36,7 +36,7 @@ void parallelcoord() {
r = new TRandom();;
new TCanvas("c1", "c1",0,0,800,700);
- gStyle->SetPalette(1);
+ gStyle->SetPalette(1);
nt = new TNtuple("nt","Demo ntuple","x:y:z:u:v:w");
diff --git a/tutorials/tree/tree0.C b/tutorials/tree/tree0.C
index 1c14a87831e..ba0cb0a8131 100644
--- a/tutorials/tree/tree0.C
+++ b/tutorials/tree/tree0.C
@@ -79,7 +79,7 @@ void tree0() {
e->b.e=eb;
e->a.t=gRandom->Rndm(); // random
e->b.t=e->a.t + gRandom->Gaus(0.,.1); // identical to a.t but a gaussian
- // 'resolution' was added with sigma .1
+ // 'resolution' was added with sigma .1
tree->Fill(); // fill the tree with the current event
}
diff --git a/tutorials/xml/person.dtd b/tutorials/xml/person.dtd
index f19c33bcdbc..b921e4790d8 100644
--- a/tutorials/xml/person.dtd
+++ b/tutorials/xml/person.dtd
@@ -4,7 +4,7 @@
<!ELEMENT PersonList (Person)+ >
<!ELEMENT Person (FirstName,LastName,Gender,DateOfBirth,Address) >
<!ATTLIST Person
- ID CDATA #REQUIRED
+ ID CDATA #REQUIRED
>
<!ELEMENT FirstName (#PCDATA) >
diff --git a/tutorials/xml/person.xml b/tutorials/xml/person.xml
index 139360b65bd..688ff3ff768 100644
--- a/tutorials/xml/person.xml
+++ b/tutorials/xml/person.xml
@@ -5,7 +5,7 @@
<!--
This is an example...
-->
- <Person ID="1">
+<Person ID="1">
<FirstName>Alicia</FirstName>
<LastName>Smith</LastName>
<Gender>F</Gender>
@@ -17,7 +17,7 @@
<Address>
<Street>Grand Avenue, 143</Street>
<PostalCode>Toronto 2283</PostalCode>
- <Country>Canada</Country>
+ <Country>Canada</Country>
</Address>
</Person>
<Person ID="2">
@@ -32,7 +32,7 @@
<Address>
<Street>Green Land Park, 143</Street>
<PostalCode>Vancouver BC V6C 2C2</PostalCode>
- <Country>Canada</Country>
+ <Country>Canada</Country>
</Address>
</Person>
</PersonList>
diff --git a/tutorials/xml/saxexample.xml b/tutorials/xml/saxexample.xml
index 044c5f7f62f..01d2b422ed9 100644
--- a/tutorials/xml/saxexample.xml
+++ b/tutorials/xml/saxexample.xml
@@ -8,8 +8,8 @@
<gjob:Category>Development</gjob:Category>
<gjob:Update>
- <gjob:Status>Open</gjob:Status>
- <gjob:Modified>Mon, 07 Jun 1999 20:27:45 -0400 MET DST</gjob:Modified>
+ <gjob:Status>Open</gjob:Status>
+ <gjob:Modified>Mon, 07 Jun 1999 20:27:45 -0400 MET DST</gjob:Modified>
<gjob:Salary>USD 0.00</gjob:Salary>
</gjob:Update>
@@ -20,17 +20,17 @@
<gjob:Contact>
<gjob:Person>Nathan Clemons</gjob:Person>
- <gjob:Email>nathan@windsofstorm.net</gjob:Email>
+ <gjob:Email>nathan@windsofstorm.net</gjob:Email>
<gjob:Company>
- </gjob:Company>
+ </gjob:Company>
<gjob:Organisation>
- </gjob:Organisation>
+ </gjob:Organisation>
<gjob:Webpage>
- </gjob:Webpage>
- <gjob:Snailmail>
- </gjob:Snailmail>
- <gjob:Phone>
- </gjob:Phone>
+ </gjob:Webpage>
+ <gjob:Snailmail>
+ </gjob:Snailmail>
+ <gjob:Phone>
+ </gjob:Phone>
</gjob:Contact>
<gjob:Requirements>
--
GitLab