diff --git a/cmake/Modules/LauraExternalDependencies.cmake b/cmake/Modules/LauraExternalDependencies.cmake --- a/cmake/Modules/LauraExternalDependencies.cmake +++ b/cmake/Modules/LauraExternalDependencies.cmake @@ -6,27 +6,9 @@ endif() if(LAURA_BUILD_ROOFIT_TASK) - find_package(ROOT 6.14 REQUIRED COMPONENTS EG RooFitCore RooFit) + find_package(ROOT 6.18 REQUIRED COMPONENTS EG RooFitCore RooFit) else() - find_package(ROOT 6.14 REQUIRED COMPONENTS EG) -endif() - -#message(STATUS "ROOT include directories: ${ROOT_INCLUDE_DIRS}") -#message(STATUS "ROOT libraries: ${ROOT_LIBRARIES}") -#message(STATUS "ROOT definitions: ${ROOT_DEFINITIONS}") -#message(STATUS "ROOT CXX flags: ${ROOT_CXX_FLAGS}") -#message(STATUS "ROOT CC flags: ${ROOT_CC_FLAGS}") -#message(STATUS "ROOT use file: ${ROOT_USE_FILE}") -# Don't want to do this because it uses old-style CMake -#include(${ROOT_USE_FILE}) - -if(EXISTS "${ROOT_DIR}/RootMacros.cmake") - message(STATUS "Laura++: Including ROOT macros module: ${ROOT_DIR}/RootMacros.cmake") - include(${ROOT_DIR}/RootMacros.cmake) -elseif(EXISTS "${ROOT_DIR}/modules/RootNewMacros.cmake") - message(STATUS "Laura++: Including ROOT macros module: ${ROOT_DIR}/modules/RootNewMacros.cmake") - include(${ROOT_DIR}/modules/RootNewMacros.cmake) -else() - message(WARNING "Laura++: Cannot locate ROOT macros module in ${ROOT_DIR}") + find_package(ROOT 6.18 REQUIRED COMPONENTS EG) endif() +message(STATUS "Laura++: Using ROOT installation: ${ROOT_DIR}") diff --git a/doc/ReleaseNotes.md b/doc/ReleaseNotes.md --- a/doc/ReleaseNotes.md +++ b/doc/ReleaseNotes.md @@ -1,5 +1,14 @@ # Laura++ release notes +16th Oct 2023 Thomas Latham +* Remove all uses of deprecated ROOT ClassImp macro +* Generate ROOT dictionary only for classes: LauAbsRValue, LauBlind and LauParameter + - Remove ClassDef macro from all other classes + - Remove all other classes from from LinkDef file and dictionary generation command +* Take advantage of related improvements in the ROOT CMake + - Consequently bump the minimum ROOT version to 6.18 +* See https://phab.hepforge.org/T213 for more details + 22nd June 2023 Thomas Latham * Added functionality to properly manage Gaussian constraints in toy generation - see https://phab.hepforge.org/T45 @@ -8,6 +17,13 @@ * Added functionality to include n-dimensional Gaussian constraints - see https://phab.hepforge.org/T214 +10th February 2023 Thomas Latham +* Store the sqDP jacobian separately in weightEvents routines + - Previously the weight was multiplied by the jacobian + - Now the jacobian is stored in a separate branch + - New info messages give instructions on what to do depending on how the + input sample was generated + 21st November 2022 Andy Morris * Use Minuit to automatically determine ASq max for signal in LauIsobarDynamics - see https://phab.hepforge.org/D85 diff --git a/inc/Lau1DCubicSpline.hh b/inc/Lau1DCubicSpline.hh --- a/inc/Lau1DCubicSpline.hh +++ b/inc/Lau1DCubicSpline.hh @@ -200,7 +200,6 @@ //! The gradient at the right boundary for a clamped spline Double_t dydxn_; - ClassDef(Lau1DCubicSpline, 0); // Class for defining a 1D cubic spline }; #endif diff --git a/inc/Lau1DHistPdf.hh b/inc/Lau1DHistPdf.hh --- a/inc/Lau1DHistPdf.hh +++ b/inc/Lau1DHistPdf.hh @@ -130,7 +130,6 @@ //! The histogram axis range Double_t axisRange_; - ClassDef(Lau1DHistPdf,0) // 1D histogram pdf class }; #endif diff --git a/inc/Lau2DAbsDP.hh b/inc/Lau2DAbsDP.hh --- a/inc/Lau2DAbsDP.hh +++ b/inc/Lau2DAbsDP.hh @@ -68,7 +68,6 @@ //! Copy assignment operator - not implemented Lau2DAbsDP& operator=(const Lau2DAbsDP& rhs); - ClassDef(Lau2DAbsDP,0) // Abstract base class for 2D DP variation }; #endif diff --git a/inc/Lau2DAbsDPPdf.hh b/inc/Lau2DAbsDPPdf.hh --- a/inc/Lau2DAbsDPPdf.hh +++ b/inc/Lau2DAbsDPPdf.hh @@ -75,7 +75,6 @@ //! Copy assignment operator - not implemented Lau2DAbsDPPdf& operator=(const Lau2DAbsDPPdf& rhs); - ClassDef(Lau2DAbsDPPdf,0) // Abstract base class for 2D DP variation }; #endif diff --git a/inc/Lau2DAbsHistDP.hh b/inc/Lau2DAbsHistDP.hh --- a/inc/Lau2DAbsHistDP.hh +++ b/inc/Lau2DAbsHistDP.hh @@ -140,7 +140,6 @@ //! Boolean for using square DP variables Bool_t squareDP_; - ClassDef(Lau2DAbsHistDP,0) // Abstract base class for 2D DP variations based on a histogram }; #endif diff --git a/inc/Lau2DAbsHistDPPdf.hh b/inc/Lau2DAbsHistDPPdf.hh --- a/inc/Lau2DAbsHistDPPdf.hh +++ b/inc/Lau2DAbsHistDPPdf.hh @@ -157,7 +157,6 @@ //! Boolean for using square DP variables Bool_t squareDP_; - ClassDef(Lau2DAbsHistDPPdf,0) // Abstract base class for 2D DP variations based on a histogram }; #endif diff --git a/inc/Lau2DCubicSpline.hh b/inc/Lau2DCubicSpline.hh --- a/inc/Lau2DCubicSpline.hh +++ b/inc/Lau2DCubicSpline.hh @@ -212,7 +212,6 @@ */ Double_t evalXY(Double_t x1, Double_t x2, Double_t y1, Double_t y2) const; - ClassDef(Lau2DCubicSpline, 0); // Class for defining a 2D cubic spline based on an input histogram }; #endif diff --git a/inc/Lau2DHistDP.hh b/inc/Lau2DHistDP.hh --- a/inc/Lau2DHistDP.hh +++ b/inc/Lau2DHistDP.hh @@ -144,7 +144,6 @@ //! Control boolean for using the linear interpolation Bool_t useInterpolation_; - ClassDef(Lau2DHistDP,0) // 2D Histogram utility class for DP analyses }; #endif diff --git a/inc/Lau2DHistDPPdf.hh b/inc/Lau2DHistDPPdf.hh --- a/inc/Lau2DHistDPPdf.hh +++ b/inc/Lau2DHistDPPdf.hh @@ -148,7 +148,6 @@ //! Control boolean for using the linear interpolation Bool_t useInterpolation_; - ClassDef(Lau2DHistDPPdf,0) // 2D Histogram utility class for DP analyses }; #endif diff --git a/inc/Lau2DHistPdf.hh b/inc/Lau2DHistPdf.hh --- a/inc/Lau2DHistPdf.hh +++ b/inc/Lau2DHistPdf.hh @@ -212,7 +212,6 @@ //! Control boolean for performing the fluctuation of the histogram bin contents Bool_t fluctuateBins_; - ClassDef(Lau2DHistPdf,0) // 2D histogram pdf class }; #endif diff --git a/inc/Lau2DSplineDP.hh b/inc/Lau2DSplineDP.hh --- a/inc/Lau2DSplineDP.hh +++ b/inc/Lau2DSplineDP.hh @@ -104,7 +104,6 @@ //! A 2D cubic spline generated from the histogram Lau2DCubicSpline* spline_; - ClassDef(Lau2DSplineDP,0) // 2D Spline utility class for DP analyses }; #endif diff --git a/inc/Lau2DSplineDPPdf.hh b/inc/Lau2DSplineDPPdf.hh --- a/inc/Lau2DSplineDPPdf.hh +++ b/inc/Lau2DSplineDPPdf.hh @@ -106,7 +106,6 @@ //! A 2D cubic spline generated from the histogram Lau2DCubicSpline* spline_; - ClassDef(Lau2DSplineDPPdf,0) // 2D Spline utility class for DP analyses }; #endif diff --git a/inc/LauASqMaxFinder.hh b/inc/LauASqMaxFinder.hh --- a/inc/LauASqMaxFinder.hh +++ b/inc/LauASqMaxFinder.hh @@ -88,7 +88,6 @@ //! The fit parameters in a form to be passed to the minimiser std::vector params_; - ClassDefOverride(LauASqMaxFinder,0) }; #endif diff --git a/inc/LauAbsBkgndDPModel.hh b/inc/LauAbsBkgndDPModel.hh --- a/inc/LauAbsBkgndDPModel.hh +++ b/inc/LauAbsBkgndDPModel.hh @@ -149,7 +149,6 @@ //! Vetoes within the Dalitz plot LauVetoes* vetoes_; - ClassDef(LauAbsBkgndDPModel,0) // Abstract DP background model }; #endif diff --git a/inc/LauAbsCoeffSet.hh b/inc/LauAbsCoeffSet.hh --- a/inc/LauAbsCoeffSet.hh +++ b/inc/LauAbsCoeffSet.hh @@ -326,7 +326,6 @@ //! The index number of the coefficient set UInt_t index_; - ClassDef(LauAbsCoeffSet, 0) }; diff --git a/inc/LauAbsEffModel.hh b/inc/LauAbsEffModel.hh --- a/inc/LauAbsEffModel.hh +++ b/inc/LauAbsEffModel.hh @@ -82,7 +82,6 @@ //! Copy assignment operator - not implemented LauAbsEffModel& operator=( const LauAbsEffModel& rhs ); - ClassDef(LauAbsEffModel, 0) // pABC for the signal efficiency across the DP }; diff --git a/inc/LauAbsFitModel.hh b/inc/LauAbsFitModel.hh --- a/inc/LauAbsFitModel.hh +++ b/inc/LauAbsFitModel.hh @@ -828,7 +828,6 @@ //! Control the verbosity of the sFit TString sPlotVerbosity_; - ClassDef(LauAbsFitModel,0) // Abstract interface to fit/toyMC model }; #endif diff --git a/inc/LauAbsFitter.hh b/inc/LauAbsFitter.hh --- a/inc/LauAbsFitter.hh +++ b/inc/LauAbsFitter.hh @@ -140,7 +140,6 @@ //! Move assignment operator - private and not implemented LauAbsFitter& operator=( LauAbsFitter&& rhs ) = delete; - ClassDef(LauAbsFitter,0); }; #endif diff --git a/inc/LauAbsIncohRes.hh b/inc/LauAbsIncohRes.hh --- a/inc/LauAbsIncohRes.hh +++ b/inc/LauAbsIncohRes.hh @@ -76,7 +76,6 @@ //! Copy assignment operator (not implemented) LauAbsIncohRes& operator=(const LauAbsIncohRes& rhs); - ClassDef(LauAbsIncohRes,0) // Abstract incoherent resonance class }; #endif diff --git a/inc/LauAbsModIndPartWave.hh b/inc/LauAbsModIndPartWave.hh --- a/inc/LauAbsModIndPartWave.hh +++ b/inc/LauAbsModIndPartWave.hh @@ -242,7 +242,6 @@ //! The current value of the amplitude LauComplex amp_; - ClassDef(LauAbsModIndPartWave,0) // model independent partial wave }; diff --git a/inc/LauAbsPdf.hh b/inc/LauAbsPdf.hh --- a/inc/LauAbsPdf.hh +++ b/inc/LauAbsPdf.hh @@ -546,7 +546,6 @@ //! The normalisation weights std::vector normWeights_; - ClassDef(LauAbsPdf,0) // Define the abstract PDF class }; #endif diff --git a/inc/LauAbsResonance.hh b/inc/LauAbsResonance.hh --- a/inc/LauAbsResonance.hh +++ b/inc/LauAbsResonance.hh @@ -572,7 +572,6 @@ //! Covariant factor (full spin-dependent expression) Double_t covFactor_{1.0}; - ClassDef(LauAbsResonance,0) // Abstract resonance class }; diff --git a/inc/LauArgusPdf.hh b/inc/LauArgusPdf.hh --- a/inc/LauArgusPdf.hh +++ b/inc/LauArgusPdf.hh @@ -92,7 +92,6 @@ //! Endpoint of curve LauAbsRValue* m0_; - ClassDef(LauArgusPdf,0) // Define the ARGUS PDF }; #endif diff --git a/inc/LauAsymmCalc.hh b/inc/LauAsymmCalc.hh --- a/inc/LauAsymmCalc.hh +++ b/inc/LauAsymmCalc.hh @@ -78,7 +78,6 @@ //! The asymmetry Double_t asymm_; - ClassDef(LauAsymmCalc,0) // Calculate asymmetry between two variables }; #endif diff --git a/inc/LauBelleCPCoeffSet.hh b/inc/LauBelleCPCoeffSet.hh --- a/inc/LauBelleCPCoeffSet.hh +++ b/inc/LauBelleCPCoeffSet.hh @@ -171,7 +171,6 @@ //! The CP asymmetry LauParameter acp_; - ClassDef(LauBelleCPCoeffSet, 0) }; #endif diff --git a/inc/LauBelleNR.hh b/inc/LauBelleNR.hh --- a/inc/LauBelleNR.hh +++ b/inc/LauBelleNR.hh @@ -149,7 +149,6 @@ //! Force use of Legendre spin factors Bool_t forceLegendre_; - ClassDef(LauBelleNR,0) }; #endif diff --git a/inc/LauBelleSymNR.hh b/inc/LauBelleSymNR.hh --- a/inc/LauBelleSymNR.hh +++ b/inc/LauBelleSymNR.hh @@ -140,7 +140,6 @@ //! The model to use LauAbsResonance::LauResonanceModel model_; - ClassDef(LauBelleSymNR,0) // Belle Non-resonant model }; diff --git a/inc/LauBifurcatedGaussPdf.hh b/inc/LauBifurcatedGaussPdf.hh --- a/inc/LauBifurcatedGaussPdf.hh +++ b/inc/LauBifurcatedGaussPdf.hh @@ -95,7 +95,6 @@ //! Sigma of right Gaussian LauAbsRValue* sigmaR_; - ClassDef(LauBifurcatedGaussPdf,0) // Define the Bifurcated Gaussian PDF }; #endif diff --git a/inc/LauBkgndDPModel.hh b/inc/LauBkgndDPModel.hh --- a/inc/LauBkgndDPModel.hh +++ b/inc/LauBkgndDPModel.hh @@ -166,7 +166,6 @@ //! Flag to track whether a warning has been issued for bin values less than zero mutable Bool_t lowBinWarningIssued_; - ClassDef(LauBkgndDPModel,0) // DP background model }; #endif diff --git a/inc/LauBlattWeisskopfFactor.hh b/inc/LauBlattWeisskopfFactor.hh --- a/inc/LauBlattWeisskopfFactor.hh +++ b/inc/LauBlattWeisskopfFactor.hh @@ -140,7 +140,6 @@ //! Rest frame const RestFrame restFrame_; - ClassDef(LauBlattWeisskopfFactor, 0) }; #endif diff --git a/inc/LauBreitWignerRes.hh b/inc/LauBreitWignerRes.hh --- a/inc/LauBreitWignerRes.hh +++ b/inc/LauBreitWignerRes.hh @@ -86,7 +86,6 @@ //! Copy assignment operator (not implemented) LauBreitWignerRes& operator=(const LauBreitWignerRes& rhs); - ClassDef(LauBreitWignerRes,0) // Breit-Wigner resonance model }; diff --git a/inc/LauCPFitModel.hh b/inc/LauCPFitModel.hh --- a/inc/LauCPFitModel.hh +++ b/inc/LauCPFitModel.hh @@ -705,7 +705,6 @@ //! Total background likelihood(s) std::vector bkgndTotalLike_; - ClassDef(LauCPFitModel,0) // CP fit/ToyMC model }; diff --git a/inc/LauCacheData.hh b/inc/LauCacheData.hh --- a/inc/LauCacheData.hh +++ b/inc/LauCacheData.hh @@ -248,7 +248,6 @@ //! The intensities of the incoherent contributions std::vector incohIntensities_; - ClassDef(LauCacheData,0) // Cached Data Class }; #endif diff --git a/inc/LauCalcChiSq.hh b/inc/LauCalcChiSq.hh --- a/inc/LauCalcChiSq.hh +++ b/inc/LauCalcChiSq.hh @@ -159,5 +159,4 @@ //! Verbose flag Bool_t verbose_; - ClassDef(LauCalcChiSq,0) }; diff --git a/inc/LauCartesianCPCoeffSet.hh b/inc/LauCartesianCPCoeffSet.hh --- a/inc/LauCartesianCPCoeffSet.hh +++ b/inc/LauCartesianCPCoeffSet.hh @@ -167,7 +167,6 @@ //! The CP asymmetry LauParameter acp_; - ClassDef(LauCartesianCPCoeffSet, 0) }; #endif diff --git a/inc/LauCartesianGammaCPCoeffSet.hh b/inc/LauCartesianGammaCPCoeffSet.hh --- a/inc/LauCartesianGammaCPCoeffSet.hh +++ b/inc/LauCartesianGammaCPCoeffSet.hh @@ -184,7 +184,6 @@ //! The CP asymmetry LauParameter acp_; - ClassDef(LauCartesianGammaCPCoeffSet, 0) }; #endif diff --git a/inc/LauChebychevPdf.hh b/inc/LauChebychevPdf.hh --- a/inc/LauChebychevPdf.hh +++ b/inc/LauChebychevPdf.hh @@ -102,7 +102,6 @@ //! Coefficients of polynomial std::vector coeffs_; - ClassDef(LauChebychevPdf,0) // Chebychev PDF }; #endif diff --git a/inc/LauCleoCPCoeffSet.hh b/inc/LauCleoCPCoeffSet.hh --- a/inc/LauCleoCPCoeffSet.hh +++ b/inc/LauCleoCPCoeffSet.hh @@ -171,7 +171,6 @@ //! The CP asymmetry LauParameter acp_; - ClassDef(LauCleoCPCoeffSet, 0) }; #endif diff --git a/inc/LauComplex.hh b/inc/LauComplex.hh --- a/inc/LauComplex.hh +++ b/inc/LauComplex.hh @@ -347,7 +347,6 @@ //! The imaginary part Double_t im_; - ClassDef(LauComplex,0) // a non-persistent bare-bones complex class }; //! input/output operator formatting of a complex number diff --git a/inc/LauCruijffPdf.hh b/inc/LauCruijffPdf.hh --- a/inc/LauCruijffPdf.hh +++ b/inc/LauCruijffPdf.hh @@ -110,7 +110,6 @@ //! Alpha of right Gaussian LauAbsRValue* alphaR_; - ClassDef(LauCruijffPdf,0) // Define the Cruijff PDF }; #endif diff --git a/inc/LauCrystalBallPdf.hh b/inc/LauCrystalBallPdf.hh --- a/inc/LauCrystalBallPdf.hh +++ b/inc/LauCrystalBallPdf.hh @@ -118,7 +118,6 @@ //! Power for tail (goes as 1/x^n) LauAbsRValue* n_; - ClassDef(LauCrystalBallPdf,0) // Define the Crystal Ball PDF }; #endif diff --git a/inc/LauDPDepBifurGaussPdf.hh b/inc/LauDPDepBifurGaussPdf.hh --- a/inc/LauDPDepBifurGaussPdf.hh +++ b/inc/LauDPDepBifurGaussPdf.hh @@ -169,7 +169,6 @@ //! Scaling method information ScaleMethod scaleMethod_; - ClassDef(LauDPDepBifurGaussPdf,0) // Define the MVA PDF }; #endif diff --git a/inc/LauDPDepCruijffPdf.hh b/inc/LauDPDepCruijffPdf.hh --- a/inc/LauDPDepCruijffPdf.hh +++ b/inc/LauDPDepCruijffPdf.hh @@ -180,7 +180,6 @@ //! The DP axis we depend on DPAxis dpAxis_; - ClassDef(LauDPDepCruijffPdf,0) // Define the Cruijff PDF }; #endif diff --git a/inc/LauDPDepGaussPdf.hh b/inc/LauDPDepGaussPdf.hh --- a/inc/LauDPDepGaussPdf.hh +++ b/inc/LauDPDepGaussPdf.hh @@ -138,7 +138,6 @@ //! The DP axis we depend on DPAxis dpAxis_; - ClassDef(LauDPDepGaussPdf,0) // Define the Gaussian PDF }; #endif diff --git a/inc/LauDPDepMapPdf.hh b/inc/LauDPDepMapPdf.hh --- a/inc/LauDPDepMapPdf.hh +++ b/inc/LauDPDepMapPdf.hh @@ -155,7 +155,6 @@ //! Cached indices values std::vector indices_; - ClassDef(LauDPDepMapPdf,0) // Define the sum PDF }; #endif diff --git a/inc/LauDPDepSumPdf.hh b/inc/LauDPDepSumPdf.hh --- a/inc/LauDPDepSumPdf.hh +++ b/inc/LauDPDepSumPdf.hh @@ -161,7 +161,6 @@ //! Cached values of fractions std::vector fractions_; - ClassDef(LauDPDepSumPdf,0) // Define the sum PDF }; #endif diff --git a/inc/LauDPPartialIntegralInfo.hh b/inc/LauDPPartialIntegralInfo.hh --- a/inc/LauDPPartialIntegralInfo.hh +++ b/inc/LauDPPartialIntegralInfo.hh @@ -267,7 +267,6 @@ //! The incoherent intensity values at each 2D grid point std::vector< std::vector< std::vector > > incohIntensities_; - ClassDef(LauDPPartialIntegralInfo, 0) }; std::ostream& operator<<( std::ostream& stream, const LauDPPartialIntegralInfo& infoRecord ); diff --git a/inc/LauDabbaRes.hh b/inc/LauDabbaRes.hh --- a/inc/LauDabbaRes.hh +++ b/inc/LauDabbaRes.hh @@ -175,7 +175,6 @@ //! Constant factor LauParameter* beta_; - ClassDef(LauDabbaRes,0) // Dabba resonance model }; diff --git a/inc/LauDatabasePDG.hh b/inc/LauDatabasePDG.hh --- a/inc/LauDatabasePDG.hh +++ b/inc/LauDatabasePDG.hh @@ -140,7 +140,6 @@ //! Debug flag - set in constructor const Bool_t debug_; - ClassDef(LauDatabasePDG,0) }; diff --git a/inc/LauDaughters.hh b/inc/LauDaughters.hh --- a/inc/LauDaughters.hh +++ b/inc/LauDaughters.hh @@ -212,7 +212,6 @@ //! Flavour-conjugate Dalitz plot Bool_t flavourConjugateDP_; - ClassDef(LauDaughters, 0) }; diff --git a/inc/LauEFKLLMRes.hh b/inc/LauEFKLLMRes.hh --- a/inc/LauEFKLLMRes.hh +++ b/inc/LauEFKLLMRes.hh @@ -140,7 +140,6 @@ //! The power of the mass dependence LauParameter* massFactor_; - ClassDef(LauEFKLLMRes,0) // EFKLLM resonance model }; diff --git a/inc/LauEffModel.hh b/inc/LauEffModel.hh --- a/inc/LauEffModel.hh +++ b/inc/LauEffModel.hh @@ -263,7 +263,6 @@ //! Flag to track whether a warning has been issued for bin values greater than one mutable Bool_t highBinWarningIssued_; - ClassDef(LauEffModel, 0) // Implement the signal efficiency across the DP }; diff --git a/inc/LauEmbeddedData.hh b/inc/LauEmbeddedData.hh --- a/inc/LauEmbeddedData.hh +++ b/inc/LauEmbeddedData.hh @@ -140,7 +140,6 @@ //! Used events std::set usedEvents_; - ClassDef(LauEmbeddedData, 0) // a non-persistent bare-bones complex class }; #endif diff --git a/inc/LauExponentialPdf.hh b/inc/LauExponentialPdf.hh --- a/inc/LauExponentialPdf.hh +++ b/inc/LauExponentialPdf.hh @@ -90,7 +90,6 @@ //! Exponential slope ie exp(slope*x) LauAbsRValue* slope_; - ClassDef(LauExponentialPdf,0) // Define the Exponential PDF }; #endif diff --git a/inc/LauFitDataTree.hh b/inc/LauFitDataTree.hh --- a/inc/LauFitDataTree.hh +++ b/inc/LauFitDataTree.hh @@ -218,7 +218,6 @@ //! The fake events, which are not from the tree std::vector fakeEvents_; - ClassDef(LauFitDataTree, 0) }; #endif diff --git a/inc/LauFitNtuple.hh b/inc/LauFitNtuple.hh --- a/inc/LauFitNtuple.hh +++ b/inc/LauFitNtuple.hh @@ -127,7 +127,6 @@ //! Experiment number Int_t iExpt_; - ClassDef(LauFitNtuple,0) // Fit/toyMC results ntuple }; diff --git a/inc/LauFitObject.hh b/inc/LauFitObject.hh --- a/inc/LauFitObject.hh +++ b/inc/LauFitObject.hh @@ -368,7 +368,6 @@ //! The number of fit failures UInt_t numberBadFits_; - ClassDef(LauFitObject,0) }; #endif diff --git a/inc/LauFitter.hh b/inc/LauFitter.hh --- a/inc/LauFitter.hh +++ b/inc/LauFitter.hh @@ -113,7 +113,6 @@ //! The maximum number of parameters for the fitter static UInt_t fitterMaxPars_; - ClassDef(LauFitter,0); }; #endif diff --git a/inc/LauFlatNR.hh b/inc/LauFlatNR.hh --- a/inc/LauFlatNR.hh +++ b/inc/LauFlatNR.hh @@ -82,7 +82,6 @@ //! Copy assignment operator (not implemented) LauFlatNR& operator=(const LauFlatNR& rhs); - ClassDef(LauFlatNR,0) // Uniform non-resonant model }; #endif diff --git a/inc/LauFlatteRes.hh b/inc/LauFlatteRes.hh --- a/inc/LauFlatteRes.hh +++ b/inc/LauFlatteRes.hh @@ -165,7 +165,6 @@ //! Flag to specify whether the couplings absorb the m_0 factor Bool_t absorbM0_; - ClassDef(LauFlatteRes,0) }; #endif diff --git a/inc/LauFormulaPar.hh b/inc/LauFormulaPar.hh --- a/inc/LauFormulaPar.hh +++ b/inc/LauFormulaPar.hh @@ -175,7 +175,6 @@ //! Width of the Gaussian constraint Double_t constraintWidth_; - ClassDef(LauFormulaPar, 0) }; diff --git a/inc/LauGaussIncohRes.hh b/inc/LauGaussIncohRes.hh --- a/inc/LauGaussIncohRes.hh +++ b/inc/LauGaussIncohRes.hh @@ -86,7 +86,6 @@ //! Copy assignment operator (not implemented) LauGaussIncohRes& operator=(const LauGaussIncohRes& rhs); - ClassDef(LauGaussIncohRes,0) // Gaussian incoherent resonance model }; #endif diff --git a/inc/LauGaussPdf.hh b/inc/LauGaussPdf.hh --- a/inc/LauGaussPdf.hh +++ b/inc/LauGaussPdf.hh @@ -90,7 +90,6 @@ //! Gaussian sigma LauAbsRValue* sigma_; - ClassDef(LauGaussPdf,0) // Define the Gaussian PDF }; #endif diff --git a/inc/LauGenNtuple.hh b/inc/LauGenNtuple.hh --- a/inc/LauGenNtuple.hh +++ b/inc/LauGenNtuple.hh @@ -182,7 +182,6 @@ //! Double variables DoubleVarMap doubleVars_; - ClassDef(LauGenNtuple,0) // Generated toyMC ntuple }; diff --git a/inc/LauGounarisSakuraiRes.hh b/inc/LauGounarisSakuraiRes.hh --- a/inc/LauGounarisSakuraiRes.hh +++ b/inc/LauGounarisSakuraiRes.hh @@ -119,7 +119,6 @@ //! Value of the form factor for resonance decay (at pole mass) Double_t FR0_; - ClassDef(LauGounarisSakuraiRes,0) // Gounaris-Sakurai resonance model }; diff --git a/inc/LauIntegrals.hh b/inc/LauIntegrals.hh --- a/inc/LauIntegrals.hh +++ b/inc/LauIntegrals.hh @@ -79,7 +79,6 @@ //! The precision to which the weights should be calculated Double_t weightsPrecision_; - ClassDef(LauIntegrals,0) }; #endif diff --git a/inc/LauIsobarDynamics.hh b/inc/LauIsobarDynamics.hh --- a/inc/LauIsobarDynamics.hh +++ b/inc/LauIsobarDynamics.hh @@ -983,7 +983,6 @@ //! Whether to calculate separate rho and omega fit fractions from the LauRhoOmegaMix model Bool_t calculateRhoOmegaFitFractions_; - ClassDef(LauIsobarDynamics,0) }; #endif diff --git a/inc/LauKMatrixProdPole.hh b/inc/LauKMatrixProdPole.hh --- a/inc/LauKMatrixProdPole.hh +++ b/inc/LauKMatrixProdPole.hh @@ -100,7 +100,6 @@ //! Boolean to turn on/off the production Adler zero factor Bool_t useProdAdler_; - ClassDef(LauKMatrixProdPole, 0) // K-matrix production pole }; diff --git a/inc/LauKMatrixProdSVP.hh b/inc/LauKMatrixProdSVP.hh --- a/inc/LauKMatrixProdSVP.hh +++ b/inc/LauKMatrixProdSVP.hh @@ -100,8 +100,7 @@ //! Boolean to turn on/off the production Adler zero factor Bool_t useProdAdler_; - ClassDef(LauKMatrixProdSVP, 0) // K-matrix production SVP term }; #endif \ No newline at end of file diff --git a/inc/LauKMatrixPropFactory.hh b/inc/LauKMatrixPropFactory.hh --- a/inc/LauKMatrixPropFactory.hh +++ b/inc/LauKMatrixPropFactory.hh @@ -85,7 +85,6 @@ //! The map used to store the propagator information KMatrixPropMap map_; - ClassDef(LauKMatrixPropFactory,0) }; #endif diff --git a/inc/LauKMatrixPropagator.hh b/inc/LauKMatrixPropagator.hh --- a/inc/LauKMatrixPropagator.hh +++ b/inc/LauKMatrixPropagator.hh @@ -593,8 +593,6 @@ const Double_t m2EtaSq_{4.0*LauConstants::mEtaSq}; //! Defined as (mEta+mEta')^2 const Double_t mEtaEtaPSumSq_{(LauConstants::mEta + LauConstants::mEtaPrime)*(LauConstants::mEta + LauConstants::mEtaPrime)}; - //! Defined as (mEta-mEta')^2 - const Double_t mEtaEtaPDiffSq_{(LauConstants::mEta - LauConstants::mEtaPrime)*(LauConstants::mEta - LauConstants::mEtaPrime)}; //! Defined as (mK+mPi)^2 const Double_t mKpiSumSq_{(LauConstants::mK + LauConstants::mPi)*(LauConstants::mK + LauConstants::mPi)}; //! Defined as (mK-mPi)^2 @@ -631,7 +629,6 @@ //! Control if scattering constants are channel symmetric: f_ji = f_ij Bool_t scattSymmetry_{kFALSE}; - ClassDef(LauKMatrixPropagator,0) // K-matrix amplitude model }; #endif diff --git a/inc/LauKappaRes.hh b/inc/LauKappaRes.hh --- a/inc/LauKappaRes.hh +++ b/inc/LauKappaRes.hh @@ -196,7 +196,6 @@ //! Factor from BES data LauParameter* m0_; - ClassDef(LauKappaRes,0) // Kappa resonance model }; diff --git a/inc/LauKinematics.hh b/inc/LauKinematics.hh --- a/inc/LauKinematics.hh +++ b/inc/LauKinematics.hh @@ -667,7 +667,6 @@ //! Enable/disable warning messages Bool_t warnings_; - ClassDef(LauKinematics,0) }; Double_t dal(Double_t* x, Double_t* par); diff --git a/inc/LauLASSBWRes.hh b/inc/LauLASSBWRes.hh --- a/inc/LauLASSBWRes.hh +++ b/inc/LauLASSBWRes.hh @@ -165,7 +165,6 @@ //! LASS scattering length parameter LauParameter* a_; - ClassDef(LauLASSBWRes,0) }; #endif diff --git a/inc/LauLASSNRRes.hh b/inc/LauLASSNRRes.hh --- a/inc/LauLASSNRRes.hh +++ b/inc/LauLASSNRRes.hh @@ -162,7 +162,6 @@ //! LASS cut off Double_t cutOff_; - ClassDef(LauLASSNRRes,0) }; #endif diff --git a/inc/LauLASSRes.hh b/inc/LauLASSRes.hh --- a/inc/LauLASSRes.hh +++ b/inc/LauLASSRes.hh @@ -180,7 +180,6 @@ //! LASS cut off Double_t cutOff_; - ClassDef(LauLASSRes,0) }; #endif diff --git a/inc/LauLinearPdf.hh b/inc/LauLinearPdf.hh --- a/inc/LauLinearPdf.hh +++ b/inc/LauLinearPdf.hh @@ -88,7 +88,6 @@ Bool_t posflag_; - ClassDef(LauLinearPdf,0) // Define the Linear PDF }; #endif diff --git a/inc/LauMagPhaseCPCoeffSet.hh b/inc/LauMagPhaseCPCoeffSet.hh --- a/inc/LauMagPhaseCPCoeffSet.hh +++ b/inc/LauMagPhaseCPCoeffSet.hh @@ -168,7 +168,6 @@ //! The CP asymmetry LauParameter acp_; - ClassDef(LauMagPhaseCPCoeffSet, 0) }; #endif diff --git a/inc/LauMagPhaseCoeffSet.hh b/inc/LauMagPhaseCoeffSet.hh --- a/inc/LauMagPhaseCoeffSet.hh +++ b/inc/LauMagPhaseCoeffSet.hh @@ -151,7 +151,6 @@ //! The complex coefficient LauComplex coeff_; - ClassDef(LauMagPhaseCoeffSet, 0) }; #endif diff --git a/inc/LauMergeDataFiles.hh b/inc/LauMergeDataFiles.hh --- a/inc/LauMergeDataFiles.hh +++ b/inc/LauMergeDataFiles.hh @@ -122,6 +122,5 @@ //! Experiment -> first and last tree entry for tree 2 ExptsMap tree2Expts_; - ClassDef(LauMergeDataFiles,0) }; diff --git a/inc/LauMinuit.hh b/inc/LauMinuit.hh --- a/inc/LauMinuit.hh +++ b/inc/LauMinuit.hh @@ -163,7 +163,6 @@ //! The covariance matrix TMatrixD covMatrix_; - ClassDef(LauMinuit,0); }; #endif diff --git a/inc/LauModIndPartWaveMagPhase.hh b/inc/LauModIndPartWaveMagPhase.hh --- a/inc/LauModIndPartWaveMagPhase.hh +++ b/inc/LauModIndPartWaveMagPhase.hh @@ -118,7 +118,6 @@ virtual void createAmpParameters(const UInt_t iKnot); private: - ClassDef(LauModIndPartWaveMagPhase,0) // model independent partial wave }; diff --git a/inc/LauModIndPartWaveRealImag.hh b/inc/LauModIndPartWaveRealImag.hh --- a/inc/LauModIndPartWaveRealImag.hh +++ b/inc/LauModIndPartWaveRealImag.hh @@ -118,7 +118,6 @@ virtual void createAmpParameters(const UInt_t iKnot); private: - ClassDef(LauModIndPartWaveRealImag,0) // model independent partial wave }; diff --git a/inc/LauNRAmplitude.hh b/inc/LauNRAmplitude.hh --- a/inc/LauNRAmplitude.hh +++ b/inc/LauNRAmplitude.hh @@ -221,7 +221,6 @@ //! Parameter from arXiv:0709.0075v1 [hep-ph] LauParameter* p2_; - ClassDef(LauNRAmplitude,0) // Non-resonant amplitude model }; #endif diff --git a/inc/LauNovosibirskPdf.hh b/inc/LauNovosibirskPdf.hh --- a/inc/LauNovosibirskPdf.hh +++ b/inc/LauNovosibirskPdf.hh @@ -89,7 +89,6 @@ //! Gaussian tail LauAbsRValue* tail_; - ClassDef(LauNovosibirskPdf,0) // Define the Novosibirsk PDF }; #endif diff --git a/inc/LauParametricStepFuncPdf.hh b/inc/LauParametricStepFuncPdf.hh --- a/inc/LauParametricStepFuncPdf.hh +++ b/inc/LauParametricStepFuncPdf.hh @@ -125,7 +125,6 @@ //! limits of the bins std::vector limits_; - ClassDef(LauParametricStepFuncPdf,0) // Define the PSF PDF }; #endif diff --git a/inc/LauParticlePDG.hh b/inc/LauParticlePDG.hh --- a/inc/LauParticlePDG.hh +++ b/inc/LauParticlePDG.hh @@ -182,7 +182,6 @@ //! Flag whether the particle is a B Bool_t B_; - ClassDef(LauParticlePDG,0) }; diff --git a/inc/LauPolNR.hh b/inc/LauPolNR.hh --- a/inc/LauPolNR.hh +++ b/inc/LauPolNR.hh @@ -100,7 +100,6 @@ //! The order in the mass UInt_t order_; - ClassDef(LauPolNR,0) // Polynomial Non-resonant model }; #endif diff --git a/inc/LauPolarFormFactorNR.hh b/inc/LauPolarFormFactorNR.hh --- a/inc/LauPolarFormFactorNR.hh +++ b/inc/LauPolarFormFactorNR.hh @@ -135,7 +135,6 @@ //! The model to use LauAbsResonance::LauResonanceModel model_; - ClassDef(LauPolarFormFactorNR,0) }; #endif diff --git a/inc/LauPolarFormFactorSymNR.hh b/inc/LauPolarFormFactorSymNR.hh --- a/inc/LauPolarFormFactorSymNR.hh +++ b/inc/LauPolarFormFactorSymNR.hh @@ -143,7 +143,6 @@ //! The model to use LauAbsResonance::LauResonanceModel model_; - ClassDef(LauPolarFormFactorSymNR,0) }; #endif diff --git a/inc/LauPolarGammaCPCoeffSet.hh b/inc/LauPolarGammaCPCoeffSet.hh --- a/inc/LauPolarGammaCPCoeffSet.hh +++ b/inc/LauPolarGammaCPCoeffSet.hh @@ -254,7 +254,6 @@ //! The CP asymmetry LauParameter acp_; - ClassDef(LauPolarGammaCPCoeffSet, 0) }; #endif diff --git a/inc/LauPoleRes.hh b/inc/LauPoleRes.hh --- a/inc/LauPoleRes.hh +++ b/inc/LauPoleRes.hh @@ -87,7 +87,6 @@ //! Copy assignment operator (not implemented) LauPoleRes& operator=(const LauPoleRes& rhs); - ClassDef(LauPoleRes,0) // Pole resonance model }; diff --git a/inc/LauPrint.hh b/inc/LauPrint.hh --- a/inc/LauPrint.hh +++ b/inc/LauPrint.hh @@ -75,7 +75,6 @@ //! Copy assignment operator (not implemented) LauPrint& operator=(const LauPrint& rhs); - ClassDef(LauPrint,0) }; diff --git a/inc/LauRealImagCPCoeffSet.hh b/inc/LauRealImagCPCoeffSet.hh --- a/inc/LauRealImagCPCoeffSet.hh +++ b/inc/LauRealImagCPCoeffSet.hh @@ -166,7 +166,6 @@ //! The CP asymmetry LauParameter acp_; - ClassDef(LauRealImagCPCoeffSet, 0) }; #endif diff --git a/inc/LauRealImagCoeffSet.hh b/inc/LauRealImagCoeffSet.hh --- a/inc/LauRealImagCoeffSet.hh +++ b/inc/LauRealImagCoeffSet.hh @@ -151,7 +151,6 @@ //! The complex coefficient LauComplex coeff_; - ClassDef(LauRealImagCoeffSet, 0) }; #endif diff --git a/inc/LauRealImagGammaCPCoeffSet.hh b/inc/LauRealImagGammaCPCoeffSet.hh --- a/inc/LauRealImagGammaCPCoeffSet.hh +++ b/inc/LauRealImagGammaCPCoeffSet.hh @@ -183,7 +183,6 @@ //! The CP asymmetry LauParameter acp_; - ClassDef(LauRealImagGammaCPCoeffSet, 0) }; #endif diff --git a/inc/LauRelBreitWignerRes.hh b/inc/LauRelBreitWignerRes.hh --- a/inc/LauRelBreitWignerRes.hh +++ b/inc/LauRelBreitWignerRes.hh @@ -121,7 +121,6 @@ //! Value of the form factor for resonance decay (at pole mass) Double_t FR0_; - ClassDef(LauRelBreitWignerRes,0) // Relativistic Breit-Wigner resonance model }; diff --git a/inc/LauRescattering2Res.hh b/inc/LauRescattering2Res.hh --- a/inc/LauRescattering2Res.hh +++ b/inc/LauRescattering2Res.hh @@ -181,7 +181,6 @@ Double_t sqr_tmin[3], sqr_tmax[3]; Double_t B0_, C0_, F0_; - ClassDef(LauRescattering2Res,0) // pipi S wave model by Schechter amplitude model }; #endif diff --git a/inc/LauRescatteringRes.hh b/inc/LauRescatteringRes.hh --- a/inc/LauRescatteringRes.hh +++ b/inc/LauRescatteringRes.hh @@ -298,7 +298,6 @@ //! The model to use LauAbsResonance::LauResonanceModel model_; - ClassDef(LauRescatteringRes,0) }; #endif diff --git a/inc/LauResonanceInfo.hh b/inc/LauResonanceInfo.hh --- a/inc/LauResonanceInfo.hh +++ b/inc/LauResonanceInfo.hh @@ -195,7 +195,6 @@ //! Extra parameters std::set extraPars_; - ClassDef(LauResonanceInfo, 0) // Specify each allowed resonance }; diff --git a/inc/LauResonanceMaker.hh b/inc/LauResonanceMaker.hh --- a/inc/LauResonanceMaker.hh +++ b/inc/LauResonanceMaker.hh @@ -193,7 +193,6 @@ //! Boolean flag to control printing a summary of the formalism to be used when the first resonance is created Bool_t summaryPrinted_; - ClassDef(LauResonanceMaker,0) // Kinematic routines }; #endif diff --git a/inc/LauResultsExtractor.hh b/inc/LauResultsExtractor.hh --- a/inc/LauResultsExtractor.hh +++ b/inc/LauResultsExtractor.hh @@ -121,6 +121,5 @@ //! Histograms of the NLL values for each experiment std::map< Int_t, TH1* > nllHistos_; - ClassDef(LauResultsExtractor,0) }; diff --git a/inc/LauRhoOmegaMix.hh b/inc/LauRhoOmegaMix.hh --- a/inc/LauRhoOmegaMix.hh +++ b/inc/LauRhoOmegaMix.hh @@ -278,7 +278,6 @@ //! Which amplitude to calculate for rho/omega fit fractions Int_t whichAmpSq_; - ClassDef(LauRhoOmegaMix,0) // Rho-omega mixing model }; diff --git a/inc/LauRooFitTask.hh b/inc/LauRooFitTask.hh --- a/inc/LauRooFitTask.hh +++ b/inc/LauRooFitTask.hh @@ -167,7 +167,6 @@ //! The fit parameters (as LauParameter's) std::vector fitPars_; - ClassDef(LauRooFitTask,0); }; #endif diff --git a/inc/LauSPlot.hh b/inc/LauSPlot.hh --- a/inc/LauSPlot.hh +++ b/inc/LauSPlot.hh @@ -368,7 +368,6 @@ //! The extended sPlot coefficients (for each species and for each combination of excluded vars) std::map cN_; - ClassDef(LauSPlot, 0) }; #endif diff --git a/inc/LauScfMap.hh b/inc/LauScfMap.hh --- a/inc/LauScfMap.hh +++ b/inc/LauScfMap.hh @@ -129,7 +129,6 @@ //! Number of bins in a 2D histogram (nBinsX_*nBinsY_) Int_t numberOfBins_; - ClassDef(LauScfMap, 0) }; #endif diff --git a/inc/LauSigmaRes.hh b/inc/LauSigmaRes.hh --- a/inc/LauSigmaRes.hh +++ b/inc/LauSigmaRes.hh @@ -195,7 +195,6 @@ //! Factor from BES data LauParameter* m0_; - ClassDef(LauSigmaRes,0) // Sigma resonance model }; diff --git a/inc/LauSigmoidPdf.hh b/inc/LauSigmoidPdf.hh --- a/inc/LauSigmoidPdf.hh +++ b/inc/LauSigmoidPdf.hh @@ -90,7 +90,6 @@ //! Parameter b LauAbsRValue* b_; - ClassDef(LauSigmoidPdf,0) // Define the Sigmoid PDF }; #endif diff --git a/inc/LauSimFitCoordinator.hh b/inc/LauSimFitCoordinator.hh --- a/inc/LauSimFitCoordinator.hh +++ b/inc/LauSimFitCoordinator.hh @@ -225,7 +225,6 @@ //! The fit results ntuple LauFitNtuple* fitNtuple_; - ClassDef(LauSimFitCoordinator,0); }; #endif diff --git a/inc/LauSimFitTask.hh b/inc/LauSimFitTask.hh --- a/inc/LauSimFitTask.hh +++ b/inc/LauSimFitTask.hh @@ -183,7 +183,6 @@ //! The fit ntuple LauFitNtuple* fitNtuple_; - ClassDef(LauSimFitTask,0); }; #endif diff --git a/inc/LauSimpleFitModel.hh b/inc/LauSimpleFitModel.hh --- a/inc/LauSimpleFitModel.hh +++ b/inc/LauSimpleFitModel.hh @@ -523,7 +523,6 @@ //! Total background likelihood(s) std::vector bkgndTotalLike_; - ClassDef(LauSimpleFitModel,0) // Total fit/ToyMC model }; diff --git a/inc/LauSumPdf.hh b/inc/LauSumPdf.hh --- a/inc/LauSumPdf.hh +++ b/inc/LauSumPdf.hh @@ -114,7 +114,6 @@ //! Fractional contribution of first PDF to the final PDF LauAbsRValue* frac_; - ClassDef(LauSumPdf,0) // Define the sum PDF }; #endif diff --git a/inc/LauVetoes.hh b/inc/LauVetoes.hh --- a/inc/LauVetoes.hh +++ b/inc/LauVetoes.hh @@ -141,7 +141,6 @@ //! The maximum mass-squared for each veto std::vector vetoMaxMass_; - ClassDef(LauVetoes,0) // Vetoes in the Dalitz plot }; #endif diff --git a/inc/LauWeightedSumEffModel.hh b/inc/LauWeightedSumEffModel.hh --- a/inc/LauWeightedSumEffModel.hh +++ b/inc/LauWeightedSumEffModel.hh @@ -116,7 +116,6 @@ //! Flag to track whether a warning has been issued for bin values greater than one mutable Bool_t highBinWarningIssued_; - ClassDef(LauWeightedSumEffModel, 0) // Implement the signal efficiency across the DP }; diff --git a/inc/Laura++_LinkDef.h b/inc/Laura++_LinkDef.h --- a/inc/Laura++_LinkDef.h +++ b/inc/Laura++_LinkDef.h @@ -28,129 +28,11 @@ #pragma link off all classes; #pragma link off all functions; -#pragma link C++ class Lau1DCubicSpline+; -#pragma link C++ class Lau1DHistPdf+; -#pragma link C++ class Lau2DAbsDP+; -#pragma link C++ class Lau2DAbsDPPdf+; -#pragma link C++ class Lau2DAbsHistDP+; -#pragma link C++ class Lau2DAbsHistDPPdf+; -#pragma link C++ class Lau2DCubicSpline+; -#pragma link C++ class Lau2DHistDP+; -#pragma link C++ class Lau2DHistDPPdf+; -#pragma link C++ class Lau2DHistPdf+; -#pragma link C++ class Lau2DSplineDP+; -#pragma link C++ class Lau2DSplineDPPdf+; -#pragma link C++ class LauAbsBkgndDPModel+; -#pragma link C++ class LauAbsCoeffSet+; -#pragma link C++ class LauAbsEffModel+; -#pragma link C++ class LauAbsFitter+; -#pragma link C++ class LauAbsFitModel+; -#pragma link C++ class LauAbsIncohRes+; -#pragma link C++ class LauAbsModIndPartWave+; -#pragma link C++ class LauAbsPdf+; -#pragma link C++ class LauAbsResonance+; +#pragma link C++ nestedclasses; +#pragma link C++ nestedtypedefs; + #pragma link C++ class LauAbsRValue+; -#pragma link C++ class LauArgusPdf+; -#pragma link C++ class LauASqMaxFinder+; -#pragma link C++ class LauAsymmCalc+; -#pragma link C++ class LauBelleCPCoeffSet+; -#pragma link C++ class LauBelleNR+; -#pragma link C++ class LauBelleSymNR+; -#pragma link C++ class LauBifurcatedGaussPdf+; -#pragma link C++ class LauBkgndDPModel+; -#pragma link C++ class LauBlattWeisskopfFactor+; #pragma link C++ class LauBlind+; -#pragma link C++ class LauBreitWignerRes+; -#pragma link C++ class LauCacheData+; -#pragma link C++ class LauCalcChiSq+; -#pragma link C++ class LauCartesianCPCoeffSet+; -#pragma link C++ class LauCartesianGammaCPCoeffSet+; -#pragma link C++ class LauChebychevPdf+; -#pragma link C++ class LauCleoCPCoeffSet+; -#pragma link C++ class LauComplex+; -#pragma link C++ class LauCPFitModel+; -#pragma link C++ class LauCruijffPdf+; -#pragma link C++ class LauCrystalBallPdf+; -#pragma link C++ class LauDabbaRes+; -#pragma link C++ class LauDatabasePDG+; -#pragma link C++ class LauDaughters+; -#pragma link C++ class LauDPDepBifurGaussPdf+; -#pragma link C++ class LauDPDepCruijffPdf+; -#pragma link C++ class LauDPDepGaussPdf+; -#pragma link C++ class LauDPDepMapPdf+; -#pragma link C++ class LauDPDepSumPdf+; -#pragma link C++ class LauEffModel+; -#pragma link C++ class LauEFKLLMRes+; -#pragma link C++ class LauEmbeddedData+; -#pragma link C++ class LauExponentialPdf+; -#pragma link C++ class LauFitDataTree+; -#pragma link C++ class LauFitNtuple+; -#pragma link C++ class LauFitter+; -#pragma link C++ class LauFitObject+; -#pragma link C++ class LauFlatteRes+; -#pragma link C++ class LauFlatNR+; -#pragma link C++ class LauFormulaPar+; -#pragma link C++ class LauGaussIncohRes+; -#pragma link C++ class LauGaussPdf+; -#pragma link C++ class LauGenNtuple+; -#pragma link C++ class LauGounarisSakuraiRes+; -#pragma link C++ class LauIntegrals+; -#pragma link C++ class LauDPPartialIntegralInfo+; -#pragma link C++ class LauIsobarDynamics+; -#pragma link C++ class LauKappaRes+; -#pragma link C++ class LauKinematics+; -#pragma link C++ class LauKMatrixProdPole+; -#pragma link C++ class LauKMatrixProdSVP+; -#pragma link C++ class LauKMatrixPropagator+; -#pragma link C++ class LauKMatrixPropFactory+; -#pragma link C++ class LauLASSBWRes+; -#pragma link C++ class LauLASSNRRes+; -#pragma link C++ class LauLASSRes+; -#pragma link C++ class LauLinearPdf+; -#pragma link C++ class LauMagPhaseCoeffSet+; -#pragma link C++ class LauMagPhaseCPCoeffSet+; -#pragma link C++ class LauMergeDataFiles+; -#pragma link C++ class LauMinuit+; -#pragma link C++ class LauModIndPartWaveMagPhase+; -#pragma link C++ class LauModIndPartWaveRealImag+; -#pragma link C++ class LauNovosibirskPdf+; -#pragma link C++ class LauNRAmplitude+; #pragma link C++ class LauParameter+; -#pragma link C++ class LauParametricStepFuncPdf+; -#pragma link C++ class LauParamFixed+; -#pragma link C++ class LauParticlePDG+; -#pragma link C++ class LauPolNR+; -#pragma link C++ class LauPoleRes+; -#pragma link C++ class LauPolarFormFactorNR+; -#pragma link C++ class LauPolarFormFactorSymNR+; -#pragma link C++ class LauPolarGammaCPCoeffSet+; -#pragma link C++ class LauPrint+; -#pragma link C++ class LauRealImagCoeffSet+; -#pragma link C++ class LauRealImagCPCoeffSet+; -#pragma link C++ class LauRealImagGammaCPCoeffSet+; -#pragma link C++ class LauRelBreitWignerRes+; -#pragma link C++ class LauResonanceInfo+; -#pragma link C++ class LauRescatteringRes+; -#pragma link C++ class LauRescattering2Res+; -#pragma link C++ class LauResonanceMaker+; -#pragma link C++ class LauResultsExtractor+; -#pragma link C++ class LauRhoOmegaMix+; -#ifdef DOLAUROOFITTASK -#pragma link C++ class LauRooFitTask+; -#endif -#pragma link C++ class LauScfMap+; -#pragma link C++ class LauSigmaRes+; -#pragma link C++ class LauSigmoidPdf+; -#pragma link C++ class LauSimpleFitModel+; -#pragma link C++ class LauSimFitCoordinator+; -#pragma link C++ class LauSimFitTask+; -#pragma link C++ class LauSPlot+; -#pragma link C++ class LauString+; -#pragma link C++ class LauSumPdf+; -#pragma link C++ class LauTextFileParser+; -#pragma link C++ class LauVetoes+; -#pragma link C++ class LauWeightedSumEffModel+; -#pragma link C++ namespace LauConstants+; -#pragma link C++ namespace LauRandom+; #endif diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,35 +1,11 @@ -# Set the include directory (unfortunately this old-style stuff is necessary for the ROOT_GENERATE_DICTIONARY macro) -include_directories(${PROJECT_SOURCE_DIR}/inc) - -# Use glob to find the headers and sources -file(GLOB LAURA_HEADERS ${PROJECT_SOURCE_DIR}/inc/*.hh) +# Use glob to find the sources file(GLOB LAURA_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cc) if (NOT LAURA_BUILD_ROOFIT_TASK) - list(REMOVE_ITEM LAURA_HEADERS ${PROJECT_SOURCE_DIR}/inc/LauRooFitTask.hh) list(REMOVE_ITEM LAURA_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/LauRooFitTask.cc) endif() -# Generate the rootcint file -set(LAURA_LINKDEF ${PROJECT_SOURCE_DIR}/inc/Laura++_LinkDef.h) -set(LAURA_DICTIONARY_ROOT G__Laura++) -set(LAURA_DICTIONARY ${LAURA_DICTIONARY_ROOT}.cxx) -if (LAURA_BUILD_ROOFIT_TASK) - ROOT_GENERATE_DICTIONARY( - ${LAURA_DICTIONARY_ROOT} - ${LAURA_HEADERS} - LINKDEF ${LAURA_LINKDEF} - OPTIONS -DDOLAUROOFITTASK - ) -else() - ROOT_GENERATE_DICTIONARY( - ${LAURA_DICTIONARY_ROOT} - ${LAURA_HEADERS} - LINKDEF ${LAURA_LINKDEF} - ) -endif() - # Build the shared library -add_library(Laura++ SHARED ${LAURA_SOURCES} ${LAURA_DICTIONARY}) +add_library(Laura++ SHARED ${LAURA_SOURCES}) set_target_properties(Laura++ PROPERTIES OUTPUT_NAME Laura++) set_target_properties(Laura++ PROPERTIES VERSION ${CMAKE_PROJECT_VERSION} SOVERSION ${CMAKE_PROJECT_VERSION_MAJOR}) set_target_properties(Laura++ PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}) @@ -39,6 +15,21 @@ target_link_libraries(Laura++ ROOT::RooFit ROOT::RooFitCore) endif() +# Generate the dictionary file for those classes that require I/O +list(APPEND LAURA_DICT_HEADERS + LauAbsRValue.hh + LauBlind.hh + LauParameter.hh + ) +set(LAURA_LINKDEF ${PROJECT_SOURCE_DIR}/inc/Laura++_LinkDef.h) +set(LAURA_DICTIONARY G__Laura++) +ROOT_GENERATE_DICTIONARY( + ${LAURA_DICTIONARY} + ${LAURA_DICT_HEADERS} + MODULE Laura++ + LINKDEF ${LAURA_LINKDEF} + ) + # Install the libraries install( TARGETS Laura++ diff --git a/src/Lau1DCubicSpline.cc b/src/Lau1DCubicSpline.cc --- a/src/Lau1DCubicSpline.cc +++ b/src/Lau1DCubicSpline.cc @@ -35,7 +35,6 @@ #include "Lau1DCubicSpline.hh" -ClassImp(Lau1DCubicSpline) Lau1DCubicSpline::Lau1DCubicSpline(const std::vector& xs, const std::vector& ys, diff --git a/src/Lau1DHistPdf.cc b/src/Lau1DHistPdf.cc --- a/src/Lau1DHistPdf.cc +++ b/src/Lau1DHistPdf.cc @@ -40,7 +40,6 @@ class LauParameter; -ClassImp(Lau1DHistPdf) Lau1DHistPdf::Lau1DHistPdf(const TString& theVarName, const TH1* hist, Double_t minAbscissa, Double_t maxAbscissa, diff --git a/src/Lau2DAbsHistDP.cc b/src/Lau2DAbsHistDP.cc --- a/src/Lau2DAbsHistDP.cc +++ b/src/Lau2DAbsHistDP.cc @@ -39,7 +39,6 @@ #include "LauKinematics.hh" #include "LauRandom.hh" -ClassImp(Lau2DAbsHistDP) Lau2DAbsHistDP::Lau2DAbsHistDP(const LauDaughters* daughters, Bool_t useUpperHalfOnly, Bool_t squareDP) : diff --git a/src/Lau2DAbsHistDPPdf.cc b/src/Lau2DAbsHistDPPdf.cc --- a/src/Lau2DAbsHistDPPdf.cc +++ b/src/Lau2DAbsHistDPPdf.cc @@ -37,7 +37,6 @@ #include "LauRandom.hh" #include "LauVetoes.hh" -ClassImp(Lau2DAbsHistDPPdf) Lau2DAbsHistDPPdf::Lau2DAbsHistDPPdf(LauKinematics* kinematics, const LauVetoes* vetoes, diff --git a/src/Lau2DCubicSpline.cc b/src/Lau2DCubicSpline.cc --- a/src/Lau2DCubicSpline.cc +++ b/src/Lau2DCubicSpline.cc @@ -38,7 +38,6 @@ #include "Lau2DCubicSpline.hh" -ClassImp(Lau2DCubicSpline) Lau2DCubicSpline::~Lau2DCubicSpline() diff --git a/src/Lau2DHistDP.cc b/src/Lau2DHistDP.cc --- a/src/Lau2DHistDP.cc +++ b/src/Lau2DHistDP.cc @@ -38,7 +38,6 @@ #include "LauKinematics.hh" #include "LauRandom.hh" -ClassImp(Lau2DHistDP) Lau2DHistDP::Lau2DHistDP(const TH2* hist, const LauDaughters* daughters, diff --git a/src/Lau2DHistDPPdf.cc b/src/Lau2DHistDPPdf.cc --- a/src/Lau2DHistDPPdf.cc +++ b/src/Lau2DHistDPPdf.cc @@ -37,7 +37,6 @@ #include "LauRandom.hh" #include "LauVetoes.hh" -ClassImp(Lau2DHistDPPdf) Lau2DHistDPPdf::Lau2DHistDPPdf(const TH2* hist, LauKinematics* kinematics, const LauVetoes* vetoes, diff --git a/src/Lau2DHistPdf.cc b/src/Lau2DHistPdf.cc --- a/src/Lau2DHistPdf.cc +++ b/src/Lau2DHistPdf.cc @@ -41,7 +41,6 @@ class LauParameter; -ClassImp(Lau2DHistPdf) Lau2DHistPdf::Lau2DHistPdf(const std::vector& theVarNames, const TH2* hist, diff --git a/src/Lau2DSplineDP.cc b/src/Lau2DSplineDP.cc --- a/src/Lau2DSplineDP.cc +++ b/src/Lau2DSplineDP.cc @@ -39,7 +39,6 @@ #include "LauKinematics.hh" #include "LauRandom.hh" -ClassImp(Lau2DSplineDP) Lau2DSplineDP::Lau2DSplineDP(const TH2* hist, const LauDaughters* daughters, diff --git a/src/Lau2DSplineDPPdf.cc b/src/Lau2DSplineDPPdf.cc --- a/src/Lau2DSplineDPPdf.cc +++ b/src/Lau2DSplineDPPdf.cc @@ -39,7 +39,6 @@ #include "LauKinematics.hh" #include "LauRandom.hh" -ClassImp(Lau2DSplineDPPdf) Lau2DSplineDPPdf::Lau2DSplineDPPdf(const TH2* hist, LauKinematics* kinematics, const LauVetoes* vetoes, diff --git a/src/LauASqMaxFinder.cc b/src/LauASqMaxFinder.cc --- a/src/LauASqMaxFinder.cc +++ b/src/LauASqMaxFinder.cc @@ -40,7 +40,6 @@ #include #include -ClassImp( LauASqMaxFinder ) LauASqMaxFinder::LauASqMaxFinder(LauIsobarDynamics& iso) : iso_{iso} diff --git a/src/LauAbsBkgndDPModel.cc b/src/LauAbsBkgndDPModel.cc --- a/src/LauAbsBkgndDPModel.cc +++ b/src/LauAbsBkgndDPModel.cc @@ -29,7 +29,6 @@ #include "LauAbsBkgndDPModel.hh" #include "LauDaughters.hh" -ClassImp(LauAbsBkgndDPModel) LauAbsBkgndDPModel::LauAbsBkgndDPModel(LauDaughters* daughters, LauVetoes* vetoes) : diff --git a/src/LauAbsCoeffSet.cc b/src/LauAbsCoeffSet.cc --- a/src/LauAbsCoeffSet.cc +++ b/src/LauAbsCoeffSet.cc @@ -35,7 +35,6 @@ #include "LauParameter.hh" #include "LauRandom.hh" -ClassImp(LauAbsCoeffSet); TRandom* LauAbsCoeffSet::randomiser_ = 0; Double_t LauAbsCoeffSet::minMagnitude_ = -10.0; diff --git a/src/LauAbsFitModel.cc b/src/LauAbsFitModel.cc --- a/src/LauAbsFitModel.cc +++ b/src/LauAbsFitModel.cc @@ -47,7 +47,6 @@ #include "LauPrint.hh" #include "LauSPlot.hh" -ClassImp(LauAbsFitModel) LauAbsFitModel::LauAbsFitModel() : diff --git a/src/LauAbsIncohRes.cc b/src/LauAbsIncohRes.cc --- a/src/LauAbsIncohRes.cc +++ b/src/LauAbsIncohRes.cc @@ -30,7 +30,6 @@ #include "LauDaughters.hh" #include "LauResonanceInfo.hh" -ClassImp(LauAbsIncohRes) // Constructor diff --git a/src/LauAbsModIndPartWave.cc b/src/LauAbsModIndPartWave.cc --- a/src/LauAbsModIndPartWave.cc +++ b/src/LauAbsModIndPartWave.cc @@ -34,7 +34,6 @@ #include "LauAbsModIndPartWave.hh" #include "LauResonanceInfo.hh" -ClassImp(LauAbsModIndPartWave) LauAbsModIndPartWave::LauAbsModIndPartWave(LauResonanceInfo* resInfo, Int_t resPairAmpInt, const LauDaughters* daughters) : diff --git a/src/LauAbsPdf.cc b/src/LauAbsPdf.cc --- a/src/LauAbsPdf.cc +++ b/src/LauAbsPdf.cc @@ -38,7 +38,6 @@ #include "LauIntegrals.hh" #include "LauKinematics.hh" -ClassImp(LauAbsPdf) // Constructor for the abstract PDF class. LauAbsPdf::LauAbsPdf(const TString& theVarName, const std::vector& params, @@ -236,7 +235,10 @@ } if ( nVars != minAbscissas_.size() || nVars != maxAbscissas_.size() ) { std::cerr << "ERROR in LauAbsPdf::checkRange : Unexpected number of absicssas: " << nVars << std::endl; - std::cerr << " : " << this->IsA()->GetName() << " expects " << minAbscissas_.size() << std::endl; + std::cerr << " : Expected: " << minAbscissas_.size() << std::endl; + for ( auto [ _, varName ] : varNames_ ) { + std::cerr << " : " << varName << std::endl; + } return kFALSE; } diff --git a/src/LauAbsResonance.cc b/src/LauAbsResonance.cc --- a/src/LauAbsResonance.cc +++ b/src/LauAbsResonance.cc @@ -37,7 +37,6 @@ #include "LauParameter.hh" #include "LauResonanceInfo.hh" -ClassImp(LauAbsResonance) bool LauAbsResonance::isIncoherentModel(LauResonanceModel model) { switch(model) { diff --git a/src/LauArgusPdf.cc b/src/LauArgusPdf.cc --- a/src/LauArgusPdf.cc +++ b/src/LauArgusPdf.cc @@ -35,7 +35,6 @@ #include "LauArgusPdf.hh" #include "LauConstants.hh" -ClassImp(LauArgusPdf) LauArgusPdf::LauArgusPdf(const TString& theVarName, const std::vector& params, Double_t minAbscissa, Double_t maxAbscissa) : diff --git a/src/LauAsymmCalc.cc b/src/LauAsymmCalc.cc --- a/src/LauAsymmCalc.cc +++ b/src/LauAsymmCalc.cc @@ -30,7 +30,6 @@ #include "LauAsymmCalc.hh" -ClassImp(LauAsymmCalc) LauAsymmCalc::LauAsymmCalc(Double_t negValue, Double_t posValue) : diff --git a/src/LauBelleCPCoeffSet.cc b/src/LauBelleCPCoeffSet.cc --- a/src/LauBelleCPCoeffSet.cc +++ b/src/LauBelleCPCoeffSet.cc @@ -39,7 +39,6 @@ #include "LauParameter.hh" #include "LauPrint.hh" -ClassImp(LauBelleCPCoeffSet) LauBelleCPCoeffSet::LauBelleCPCoeffSet(const TString& compName, Double_t a, Double_t delta, Double_t b, Double_t phi, diff --git a/src/LauBelleNR.cc b/src/LauBelleNR.cc --- a/src/LauBelleNR.cc +++ b/src/LauBelleNR.cc @@ -35,7 +35,6 @@ #include "LauParameter.hh" #include "LauResonanceInfo.hh" -ClassImp(LauBelleNR) LauBelleNR::LauBelleNR(LauResonanceInfo* resInfo, const LauAbsResonance::LauResonanceModel resType, diff --git a/src/LauBelleSymNR.cc b/src/LauBelleSymNR.cc --- a/src/LauBelleSymNR.cc +++ b/src/LauBelleSymNR.cc @@ -35,7 +35,6 @@ #include "LauKinematics.hh" #include "LauResonanceInfo.hh" -ClassImp(LauBelleSymNR) LauBelleSymNR::LauBelleSymNR(LauResonanceInfo* resInfo, const LauAbsResonance::LauResonanceModel resType, diff --git a/src/LauBifurcatedGaussPdf.cc b/src/LauBifurcatedGaussPdf.cc --- a/src/LauBifurcatedGaussPdf.cc +++ b/src/LauBifurcatedGaussPdf.cc @@ -35,7 +35,6 @@ #include "LauBifurcatedGaussPdf.hh" #include "LauConstants.hh" -ClassImp(LauBifurcatedGaussPdf) LauBifurcatedGaussPdf::LauBifurcatedGaussPdf(const TString& theVarName, const std::vector& params, Double_t minAbscissa, Double_t maxAbscissa) : diff --git a/src/LauBkgndDPModel.cc b/src/LauBkgndDPModel.cc --- a/src/LauBkgndDPModel.cc +++ b/src/LauBkgndDPModel.cc @@ -41,7 +41,6 @@ #include "LauRandom.hh" #include "LauVetoes.hh" -ClassImp(LauBkgndDPModel) LauBkgndDPModel::LauBkgndDPModel(LauDaughters* daughters, LauVetoes* vetoes) : diff --git a/src/LauBlattWeisskopfFactor.cc b/src/LauBlattWeisskopfFactor.cc --- a/src/LauBlattWeisskopfFactor.cc +++ b/src/LauBlattWeisskopfFactor.cc @@ -34,7 +34,6 @@ #include "LauParameter.hh" #include "LauResonanceInfo.hh" -ClassImp(LauBlattWeisskopfFactor) // Constructor diff --git a/src/LauBlind.cc b/src/LauBlind.cc --- a/src/LauBlind.cc +++ b/src/LauBlind.cc @@ -31,7 +31,6 @@ #include "TMath.h" #include "TRandom3.h" -ClassImp(LauBlind) LauBlind::LauBlind() : diff --git a/src/LauBreitWignerRes.cc b/src/LauBreitWignerRes.cc --- a/src/LauBreitWignerRes.cc +++ b/src/LauBreitWignerRes.cc @@ -28,7 +28,6 @@ #include "LauBreitWignerRes.hh" -ClassImp(LauBreitWignerRes) LauBreitWignerRes::LauBreitWignerRes(LauResonanceInfo* resInfo, const Int_t resPairAmpInt, const LauDaughters* daughters) : diff --git a/src/LauCPFitModel.cc b/src/LauCPFitModel.cc --- a/src/LauCPFitModel.cc +++ b/src/LauCPFitModel.cc @@ -64,7 +64,6 @@ #include "LauRandom.hh" #include "LauScfMap.hh" -ClassImp(LauCPFitModel) LauCPFitModel::LauCPFitModel(LauIsobarDynamics* negModel, LauIsobarDynamics* posModel, Bool_t tagged, const TString& tagVarName) : LauAbsFitModel(), diff --git a/src/LauCacheData.cc b/src/LauCacheData.cc --- a/src/LauCacheData.cc +++ b/src/LauCacheData.cc @@ -28,7 +28,6 @@ #include "LauCacheData.hh" -ClassImp(LauCacheData) LauCacheData::LauCacheData() : diff --git a/src/LauCalcChiSq.cc b/src/LauCalcChiSq.cc --- a/src/LauCalcChiSq.cc +++ b/src/LauCalcChiSq.cc @@ -64,7 +64,6 @@ #include #include -ClassImp(LauCalcChiSq) LauCalcChiSq::LauCalcChiSq(const TString& inputFileName) : diff --git a/src/LauCartesianCPCoeffSet.cc b/src/LauCartesianCPCoeffSet.cc --- a/src/LauCartesianCPCoeffSet.cc +++ b/src/LauCartesianCPCoeffSet.cc @@ -39,7 +39,6 @@ #include "LauParameter.hh" #include "LauPrint.hh" -ClassImp(LauCartesianCPCoeffSet) LauCartesianCPCoeffSet::LauCartesianCPCoeffSet(const TString& compName, Double_t x, Double_t y, Double_t deltaX, Double_t deltaY, diff --git a/src/LauCartesianGammaCPCoeffSet.cc b/src/LauCartesianGammaCPCoeffSet.cc --- a/src/LauCartesianGammaCPCoeffSet.cc +++ b/src/LauCartesianGammaCPCoeffSet.cc @@ -39,7 +39,6 @@ #include "LauParameter.hh" #include "LauPrint.hh" -ClassImp(LauCartesianGammaCPCoeffSet) LauCartesianGammaCPCoeffSet::LauCartesianGammaCPCoeffSet(const TString& compName, const Double_t x, const Double_t y, const Double_t xCP, const Double_t yCP, const Double_t deltaXCP, const Double_t deltaYCP, diff --git a/src/LauChebychevPdf.cc b/src/LauChebychevPdf.cc --- a/src/LauChebychevPdf.cc +++ b/src/LauChebychevPdf.cc @@ -50,7 +50,6 @@ #include "LauChebychevPdf.hh" -ClassImp(LauChebychevPdf) LauChebychevPdf::LauChebychevPdf(const TString& theVarName, const std::vector& params, Double_t minAbscissa, Double_t maxAbscissa) : LauAbsPdf(theVarName, params, minAbscissa, maxAbscissa), diff --git a/src/LauCleoCPCoeffSet.cc b/src/LauCleoCPCoeffSet.cc --- a/src/LauCleoCPCoeffSet.cc +++ b/src/LauCleoCPCoeffSet.cc @@ -39,7 +39,6 @@ #include "LauParameter.hh" #include "LauPrint.hh" -ClassImp(LauCleoCPCoeffSet) LauCleoCPCoeffSet::LauCleoCPCoeffSet(const TString& compName, Double_t a, Double_t delta, Double_t b, Double_t phi, diff --git a/src/LauComplex.cc b/src/LauComplex.cc --- a/src/LauComplex.cc +++ b/src/LauComplex.cc @@ -46,7 +46,6 @@ #include "LauComplex.hh" -ClassImp(LauComplex); void LauComplex::print() const diff --git a/src/LauCruijffPdf.cc b/src/LauCruijffPdf.cc --- a/src/LauCruijffPdf.cc +++ b/src/LauCruijffPdf.cc @@ -55,7 +55,6 @@ #include "LauCruijffPdf.hh" #include "LauConstants.hh" -ClassImp(LauCruijffPdf) LauCruijffPdf::LauCruijffPdf(const TString& theVarName, const vector& params, Double_t minAbscissa, Double_t maxAbscissa) : LauAbsPdf(theVarName, params, minAbscissa, maxAbscissa), diff --git a/src/LauCrystalBallPdf.cc b/src/LauCrystalBallPdf.cc --- a/src/LauCrystalBallPdf.cc +++ b/src/LauCrystalBallPdf.cc @@ -55,7 +55,6 @@ #include "LauConstants.hh" #include "LauCrystalBallPdf.hh" -ClassImp(LauCrystalBallPdf) LauCrystalBallPdf::LauCrystalBallPdf(const TString& theVarName, const vector& params, Double_t minAbscissa, Double_t maxAbscissa) : diff --git a/src/LauDPDepBifurGaussPdf.cc b/src/LauDPDepBifurGaussPdf.cc --- a/src/LauDPDepBifurGaussPdf.cc +++ b/src/LauDPDepBifurGaussPdf.cc @@ -45,7 +45,6 @@ #include "LauKinematics.hh" #include "LauDPDepBifurGaussPdf.hh" -ClassImp(LauDPDepBifurGaussPdf) LauDPDepBifurGaussPdf::LauDPDepBifurGaussPdf(const TString& theVarName, const vector& params, diff --git a/src/LauDPDepCruijffPdf.cc b/src/LauDPDepCruijffPdf.cc --- a/src/LauDPDepCruijffPdf.cc +++ b/src/LauDPDepCruijffPdf.cc @@ -40,7 +40,6 @@ #include "LauDPDepCruijffPdf.hh" #include "LauKinematics.hh" -ClassImp(LauDPDepCruijffPdf) LauDPDepCruijffPdf::LauDPDepCruijffPdf(const TString& theVarName, const std::vector& params, diff --git a/src/LauDPDepGaussPdf.cc b/src/LauDPDepGaussPdf.cc --- a/src/LauDPDepGaussPdf.cc +++ b/src/LauDPDepGaussPdf.cc @@ -40,7 +40,6 @@ #include "LauDPDepGaussPdf.hh" #include "LauKinematics.hh" -ClassImp(LauDPDepGaussPdf) LauDPDepGaussPdf::LauDPDepGaussPdf(const TString& theVarName, const std::vector& params, diff --git a/src/LauDPDepMapPdf.cc b/src/LauDPDepMapPdf.cc --- a/src/LauDPDepMapPdf.cc +++ b/src/LauDPDepMapPdf.cc @@ -42,7 +42,6 @@ #include "LauParameter.hh" #include "LauDPDepMapPdf.hh" -ClassImp(LauDPDepMapPdf) LauDPDepMapPdf::LauDPDepMapPdf(const std::vector& pdfs, diff --git a/src/LauDPDepSumPdf.cc b/src/LauDPDepSumPdf.cc --- a/src/LauDPDepSumPdf.cc +++ b/src/LauDPDepSumPdf.cc @@ -42,7 +42,6 @@ #include "LauParameter.hh" #include "LauDPDepSumPdf.hh" -ClassImp(LauDPDepSumPdf) LauDPDepSumPdf::LauDPDepSumPdf(LauAbsPdf* pdf1, LauAbsPdf* pdf2, diff --git a/src/LauDPPartialIntegralInfo.cc b/src/LauDPPartialIntegralInfo.cc --- a/src/LauDPPartialIntegralInfo.cc +++ b/src/LauDPPartialIntegralInfo.cc @@ -32,7 +32,6 @@ #include "LauIntegrals.hh" #include "LauKinematics.hh" -ClassImp(LauDPPartialIntegralInfo) LauDPPartialIntegralInfo::LauDPPartialIntegralInfo(const Double_t minm13, const Double_t maxm13, diff --git a/src/LauDabbaRes.cc b/src/LauDabbaRes.cc --- a/src/LauDabbaRes.cc +++ b/src/LauDabbaRes.cc @@ -34,7 +34,6 @@ #include "LauDabbaRes.hh" #include "LauResonanceInfo.hh" -ClassImp(LauDabbaRes) LauDabbaRes::LauDabbaRes(LauResonanceInfo* resInfo, const Int_t resPairAmpInt, const LauDaughters* daughters) : diff --git a/src/LauDatabasePDG.cc b/src/LauDatabasePDG.cc --- a/src/LauDatabasePDG.cc +++ b/src/LauDatabasePDG.cc @@ -38,7 +38,6 @@ LauDatabasePDG* LauDatabasePDG::theInstance_ = 0; -ClassImp(LauDatabasePDG) // Constructor diff --git a/src/LauDaughters.cc b/src/LauDaughters.cc --- a/src/LauDaughters.cc +++ b/src/LauDaughters.cc @@ -35,7 +35,6 @@ #include "LauKinematics.hh" #include "LauParticlePDG.hh" -ClassImp(LauDaughters) LauDaughters::LauDaughters(Int_t codeParent, Int_t code1, Int_t code2, Int_t code3, Bool_t useSquareDP) : diff --git a/src/LauEFKLLMRes.cc b/src/LauEFKLLMRes.cc --- a/src/LauEFKLLMRes.cc +++ b/src/LauEFKLLMRes.cc @@ -35,7 +35,6 @@ #include "LauTextFileParser.hh" -ClassImp(LauEFKLLMRes); Lau1DCubicSpline* LauEFKLLMRes::magSpline_ = 0; diff --git a/src/LauEffModel.cc b/src/LauEffModel.cc --- a/src/LauEffModel.cc +++ b/src/LauEffModel.cc @@ -37,7 +37,6 @@ #include "LauKinematics.hh" #include "LauVetoes.hh" -ClassImp(LauEffModel) LauEffModel::LauEffModel(const LauDaughters* daughters, const LauVetoes* vetoes) : diff --git a/src/LauEmbeddedData.cc b/src/LauEmbeddedData.cc --- a/src/LauEmbeddedData.cc +++ b/src/LauEmbeddedData.cc @@ -38,7 +38,6 @@ #include "LauKinematics.hh" #include "LauRandom.hh" -ClassImp(LauEmbeddedData) LauEmbeddedData::LauEmbeddedData(const TString& fileName, const TString& treeName, Bool_t allowReuseOfEvents) : diff --git a/src/LauExponentialPdf.cc b/src/LauExponentialPdf.cc --- a/src/LauExponentialPdf.cc +++ b/src/LauExponentialPdf.cc @@ -39,7 +39,6 @@ #include "LauConstants.hh" #include "LauExponentialPdf.hh" -ClassImp(LauExponentialPdf) LauExponentialPdf::LauExponentialPdf(const TString& theVarName, const vector& params, Double_t minAbscissa, Double_t maxAbscissa) : diff --git a/src/LauFitDataTree.cc b/src/LauFitDataTree.cc --- a/src/LauFitDataTree.cc +++ b/src/LauFitDataTree.cc @@ -37,7 +37,6 @@ #include "LauFitDataTree.hh" -ClassImp(LauFitDataTree) LauFitDataTree::LauFitDataTree(const TString& rootFileName, const TString& rootTreeName) : diff --git a/src/LauFitNtuple.cc b/src/LauFitNtuple.cc --- a/src/LauFitNtuple.cc +++ b/src/LauFitNtuple.cc @@ -40,7 +40,6 @@ #include "LauParameter.hh" #include "LauParamFixed.hh" -ClassImp(LauFitNtuple) LauFitNtuple::LauFitNtuple(const TString& fileName, Bool_t storeAsymErrors) : diff --git a/src/LauFitObject.cc b/src/LauFitObject.cc --- a/src/LauFitObject.cc +++ b/src/LauFitObject.cc @@ -37,7 +37,6 @@ #include "LauFitObject.hh" #include "LauRandom.hh" -ClassImp(LauFitObject) LauFitObject::LauFitObject() : TObject(), twoStageFit_(kFALSE), diff --git a/src/LauFitter.cc b/src/LauFitter.cc --- a/src/LauFitter.cc +++ b/src/LauFitter.cc @@ -40,7 +40,6 @@ LauOutputLevel LauFitter::fitterVerbosity_ = LauOutputLevel::Standard; UInt_t LauFitter::fitterMaxPars_ = 100; -ClassImp(LauFitter) void LauFitter::setFitterType( const Type type ) { diff --git a/src/LauFlatNR.cc b/src/LauFlatNR.cc --- a/src/LauFlatNR.cc +++ b/src/LauFlatNR.cc @@ -31,7 +31,6 @@ #include "LauKinematics.hh" #include "LauFlatNR.hh" -ClassImp(LauFlatNR) LauFlatNR::LauFlatNR(LauResonanceInfo* resInfo, const Int_t resPairAmpInt, const LauDaughters* daughters) : LauAbsResonance(resInfo, resPairAmpInt, daughters) diff --git a/src/LauFlatteRes.cc b/src/LauFlatteRes.cc --- a/src/LauFlatteRes.cc +++ b/src/LauFlatteRes.cc @@ -34,7 +34,6 @@ #include "TSystem.h" -ClassImp(LauFlatteRes) LauFlatteRes::LauFlatteRes(LauResonanceInfo* resInfo, const Int_t resPairAmpInt, const LauDaughters* daughters) : diff --git a/src/LauFormulaPar.cc b/src/LauFormulaPar.cc --- a/src/LauFormulaPar.cc +++ b/src/LauFormulaPar.cc @@ -39,7 +39,6 @@ #include "LauParameter.hh" #include "LauRandom.hh" -ClassImp(LauFormulaPar) LauFormulaPar::LauFormulaPar(const TString& forName, const TString& formula, const std::vector& params) : diff --git a/src/LauGaussIncohRes.cc b/src/LauGaussIncohRes.cc --- a/src/LauGaussIncohRes.cc +++ b/src/LauGaussIncohRes.cc @@ -32,7 +32,6 @@ #include "LauGaussIncohRes.hh" #include "LauKinematics.hh" -ClassImp(LauGaussIncohRes) LauGaussIncohRes::LauGaussIncohRes(LauResonanceInfo* resInfo, const Int_t resPairAmpInt, const LauDaughters* daughters) : LauAbsIncohRes(resInfo, resPairAmpInt, daughters) diff --git a/src/LauGaussPdf.cc b/src/LauGaussPdf.cc --- a/src/LauGaussPdf.cc +++ b/src/LauGaussPdf.cc @@ -39,7 +39,6 @@ #include "LauConstants.hh" #include "LauGaussPdf.hh" -ClassImp(LauGaussPdf) LauGaussPdf::LauGaussPdf(const TString& theVarName, const vector& params, Double_t minAbscissa, Double_t maxAbscissa) : diff --git a/src/LauGenNtuple.cc b/src/LauGenNtuple.cc --- a/src/LauGenNtuple.cc +++ b/src/LauGenNtuple.cc @@ -36,7 +36,6 @@ #include "LauGenNtuple.hh" -ClassImp(LauGenNtuple) LauGenNtuple::LauGenNtuple(const TString& rootFileName, const TString& rootTreeName) : diff --git a/src/LauGounarisSakuraiRes.cc b/src/LauGounarisSakuraiRes.cc --- a/src/LauGounarisSakuraiRes.cc +++ b/src/LauGounarisSakuraiRes.cc @@ -31,7 +31,6 @@ #include "LauConstants.hh" #include "LauGounarisSakuraiRes.hh" -ClassImp(LauGounarisSakuraiRes) LauGounarisSakuraiRes::LauGounarisSakuraiRes(LauResonanceInfo* resInfo, const Int_t resPairAmpInt, const LauDaughters* daughters) : diff --git a/src/LauIntegrals.cc b/src/LauIntegrals.cc --- a/src/LauIntegrals.cc +++ b/src/LauIntegrals.cc @@ -36,7 +36,6 @@ #include "LauIntegrals.hh" -ClassImp(LauIntegrals) LauIntegrals::LauIntegrals(Double_t weightsPrecision) : diff --git a/src/LauIsobarDynamics.cc b/src/LauIsobarDynamics.cc --- a/src/LauIsobarDynamics.cc +++ b/src/LauIsobarDynamics.cc @@ -60,7 +60,6 @@ #include "LauRhoOmegaMix.hh" #include "LauASqMaxFinder.hh" -ClassImp(LauIsobarDynamics) // for Kpipi: only one scfFraction 2D histogram is needed LauIsobarDynamics::LauIsobarDynamics(LauDaughters* daughters, LauAbsEffModel* effModel, LauAbsEffModel* scfFractionModel) : diff --git a/src/LauKMatrixProdPole.cc b/src/LauKMatrixProdPole.cc --- a/src/LauKMatrixProdPole.cc +++ b/src/LauKMatrixProdPole.cc @@ -32,7 +32,6 @@ #include -ClassImp(LauKMatrixProdPole) LauKMatrixProdPole::LauKMatrixProdPole( const TString& poleName, Int_t poleIndex, Int_t resPairAmpInt, LauKMatrixPropagator* propagator, const LauDaughters* daughters, diff --git a/src/LauKMatrixProdSVP.cc b/src/LauKMatrixProdSVP.cc --- a/src/LauKMatrixProdSVP.cc +++ b/src/LauKMatrixProdSVP.cc @@ -31,7 +31,6 @@ #include -ClassImp(LauKMatrixProdSVP) LauKMatrixProdSVP::LauKMatrixProdSVP( const TString& SVPName, Int_t channelIndex, Int_t resPairAmpInt, LauKMatrixPropagator* propagator, const LauDaughters* daughters, diff --git a/src/LauKMatrixPropFactory.cc b/src/LauKMatrixPropFactory.cc --- a/src/LauKMatrixPropFactory.cc +++ b/src/LauKMatrixPropFactory.cc @@ -40,7 +40,6 @@ // the singleton instance LauKMatrixPropFactory* LauKMatrixPropFactory::theFactory_ = 0; -ClassImp(LauKMatrixPropFactory) LauKMatrixPropFactory::LauKMatrixPropFactory() { diff --git a/src/LauKMatrixPropagator.cc b/src/LauKMatrixPropagator.cc --- a/src/LauKMatrixPropagator.cc +++ b/src/LauKMatrixPropagator.cc @@ -43,7 +43,6 @@ using std::endl; using std::cerr; -ClassImp(LauKMatrixPropagator) LauKMatrixPropagator::LauKMatrixPropagator(const TString& name, const TString& paramFile, Int_t resPairAmpInt, Int_t nChannels, diff --git a/src/LauKappaRes.cc b/src/LauKappaRes.cc --- a/src/LauKappaRes.cc +++ b/src/LauKappaRes.cc @@ -32,7 +32,6 @@ #include "LauKappaRes.hh" #include "LauResonanceInfo.hh" -ClassImp(LauKappaRes) LauKappaRes::LauKappaRes(LauResonanceInfo* resInfo, const Int_t resPairAmpInt, const LauDaughters* daughters) : diff --git a/src/LauKinematics.cc b/src/LauKinematics.cc --- a/src/LauKinematics.cc +++ b/src/LauKinematics.cc @@ -36,7 +36,6 @@ #include "LauKinematics.hh" #include "LauRandom.hh" -ClassImp(LauKinematics) LauKinematics::LauKinematics(const Double_t m1, const Double_t m2, const Double_t m3, const Double_t mParent, const Bool_t calcSquareDPCoords, const Bool_t symmetricalDP, const Bool_t fullySymmetricDP) : diff --git a/src/LauLASSBWRes.cc b/src/LauLASSBWRes.cc --- a/src/LauLASSBWRes.cc +++ b/src/LauLASSBWRes.cc @@ -32,7 +32,6 @@ #include "LauLASSBWRes.hh" #include "LauResonanceInfo.hh" -ClassImp(LauLASSBWRes) LauLASSBWRes::LauLASSBWRes(LauResonanceInfo* resInfo, const Int_t resPairAmpInt, const LauDaughters* daughters) : diff --git a/src/LauLASSNRRes.cc b/src/LauLASSNRRes.cc --- a/src/LauLASSNRRes.cc +++ b/src/LauLASSNRRes.cc @@ -32,7 +32,6 @@ #include "LauLASSNRRes.hh" #include "LauResonanceInfo.hh" -ClassImp(LauLASSNRRes) LauLASSNRRes::LauLASSNRRes(LauResonanceInfo* resInfo, const Int_t resPairAmpInt, const LauDaughters* daughters) : diff --git a/src/LauLASSRes.cc b/src/LauLASSRes.cc --- a/src/LauLASSRes.cc +++ b/src/LauLASSRes.cc @@ -32,7 +32,6 @@ #include "LauLASSRes.hh" #include "LauResonanceInfo.hh" -ClassImp(LauLASSRes) LauLASSRes::LauLASSRes(LauResonanceInfo* resInfo, const Int_t resPairAmpInt, const LauDaughters* daughters) : diff --git a/src/LauLinearPdf.cc b/src/LauLinearPdf.cc --- a/src/LauLinearPdf.cc +++ b/src/LauLinearPdf.cc @@ -39,7 +39,6 @@ #include "LauConstants.hh" #include "LauLinearPdf.hh" -ClassImp(LauLinearPdf) LauLinearPdf::LauLinearPdf(const TString& theVarName, const vector& params, Double_t minAbscissa, Double_t maxAbscissa) : diff --git a/src/LauMagPhaseCPCoeffSet.cc b/src/LauMagPhaseCPCoeffSet.cc --- a/src/LauMagPhaseCPCoeffSet.cc +++ b/src/LauMagPhaseCPCoeffSet.cc @@ -39,7 +39,6 @@ #include "LauParameter.hh" #include "LauPrint.hh" -ClassImp(LauMagPhaseCPCoeffSet) LauMagPhaseCPCoeffSet::LauMagPhaseCPCoeffSet(const TString& compName, Double_t mag, Double_t phase, Double_t magBar, Double_t phaseBar, diff --git a/src/LauMagPhaseCoeffSet.cc b/src/LauMagPhaseCoeffSet.cc --- a/src/LauMagPhaseCoeffSet.cc +++ b/src/LauMagPhaseCoeffSet.cc @@ -39,7 +39,6 @@ #include "LauParameter.hh" #include "LauPrint.hh" -ClassImp(LauMagPhaseCoeffSet) LauMagPhaseCoeffSet::LauMagPhaseCoeffSet(const TString& compName, Double_t magnitude, Double_t phase, Bool_t magFixed, Bool_t phaseFixed) : diff --git a/src/LauMergeDataFiles.cc b/src/LauMergeDataFiles.cc --- a/src/LauMergeDataFiles.cc +++ b/src/LauMergeDataFiles.cc @@ -35,7 +35,6 @@ #include "TObjArray.h" #include "TSystem.h" -ClassImp(LauMergeDataFiles) LauMergeDataFiles::LauMergeDataFiles(const TString& fileName1, const TString& fileName2, const TString& treeName) : diff --git a/src/LauMinuit.cc b/src/LauMinuit.cc --- a/src/LauMinuit.cc +++ b/src/LauMinuit.cc @@ -48,7 +48,6 @@ // and use the member functions to access the parameters/variables. extern void logLikeFun(Int_t &npar, Double_t *gin, Double_t &f, Double_t *par, Int_t iflag); -ClassImp(LauMinuit) LauMinuit::LauMinuit( const UInt_t maxPar, const LauOutputLevel verbosity ) : LauAbsFitter(), diff --git a/src/LauModIndPartWaveMagPhase.cc b/src/LauModIndPartWaveMagPhase.cc --- a/src/LauModIndPartWaveMagPhase.cc +++ b/src/LauModIndPartWaveMagPhase.cc @@ -35,7 +35,6 @@ #include "LauModIndPartWaveMagPhase.hh" #include "LauResonanceInfo.hh" -ClassImp(LauModIndPartWaveMagPhase) LauModIndPartWaveMagPhase::LauModIndPartWaveMagPhase(LauResonanceInfo* resInfo, Int_t resPairAmpInt, const LauDaughters* daughters) : diff --git a/src/LauModIndPartWaveRealImag.cc b/src/LauModIndPartWaveRealImag.cc --- a/src/LauModIndPartWaveRealImag.cc +++ b/src/LauModIndPartWaveRealImag.cc @@ -35,7 +35,6 @@ #include "LauModIndPartWaveRealImag.hh" #include "LauResonanceInfo.hh" -ClassImp(LauModIndPartWaveRealImag) LauModIndPartWaveRealImag::LauModIndPartWaveRealImag(LauResonanceInfo* resInfo, Int_t resPairAmpInt, const LauDaughters* daughters) : diff --git a/src/LauNRAmplitude.cc b/src/LauNRAmplitude.cc --- a/src/LauNRAmplitude.cc +++ b/src/LauNRAmplitude.cc @@ -32,7 +32,6 @@ #include "LauNRAmplitude.hh" #include "LauResonanceInfo.hh" -ClassImp(LauNRAmplitude) LauNRAmplitude::LauNRAmplitude(LauResonanceInfo* resInfo, const Int_t resPairAmpInt, const LauDaughters* daughters) : LauAbsResonance(resInfo, resPairAmpInt, daughters), diff --git a/src/LauNovosibirskPdf.cc b/src/LauNovosibirskPdf.cc --- a/src/LauNovosibirskPdf.cc +++ b/src/LauNovosibirskPdf.cc @@ -38,7 +38,6 @@ #include "LauNovosibirskPdf.hh" #include "LauConstants.hh" -ClassImp(LauNovosibirskPdf) LauNovosibirskPdf::LauNovosibirskPdf(const TString& theVarName, const vector& params, Double_t minAbscissa, Double_t maxAbscissa) : LauAbsPdf(theVarName, params, minAbscissa, maxAbscissa), diff --git a/src/LauParameter.cc b/src/LauParameter.cc --- a/src/LauParameter.cc +++ b/src/LauParameter.cc @@ -38,7 +38,6 @@ #include "LauParameter.hh" #include "LauRandom.hh" -ClassImp(LauParameter) LauParameter::LauParameter() : diff --git a/src/LauParametricStepFuncPdf.cc b/src/LauParametricStepFuncPdf.cc --- a/src/LauParametricStepFuncPdf.cc +++ b/src/LauParametricStepFuncPdf.cc @@ -56,7 +56,6 @@ #include "LauConstants.hh" #include "LauParametricStepFuncPdf.hh" -ClassImp(LauParametricStepFuncPdf) LauParametricStepFuncPdf::LauParametricStepFuncPdf(const TString& theVarName, const vector& params, const vector& limits, NormBin normalisationBin) : diff --git a/src/LauParticlePDG.cc b/src/LauParticlePDG.cc --- a/src/LauParticlePDG.cc +++ b/src/LauParticlePDG.cc @@ -38,7 +38,6 @@ #include "LauParticlePDG.hh" -ClassImp(LauParticlePDG) LauParticlePDG::LauParticlePDG(const TParticlePDG* particle) : theParticle_(particle), diff --git a/src/LauPolNR.cc b/src/LauPolNR.cc --- a/src/LauPolNR.cc +++ b/src/LauPolNR.cc @@ -33,7 +33,6 @@ #include "LauPolNR.hh" #include "LauDaughters.hh" -ClassImp(LauPolNR) LauPolNR::LauPolNR(LauResonanceInfo* resInfo, const Int_t resPairAmpInt, const LauDaughters* daughters) : diff --git a/src/LauPolarFormFactorNR.cc b/src/LauPolarFormFactorNR.cc --- a/src/LauPolarFormFactorNR.cc +++ b/src/LauPolarFormFactorNR.cc @@ -36,7 +36,6 @@ #include "LauParameter.hh" #include "LauResonanceInfo.hh" -ClassImp(LauPolarFormFactorNR) LauPolarFormFactorNR::LauPolarFormFactorNR(LauResonanceInfo* resInfo, const LauAbsResonance::LauResonanceModel resType, const Int_t resPairAmpInt, const LauDaughters* daughters) : diff --git a/src/LauPolarFormFactorSymNR.cc b/src/LauPolarFormFactorSymNR.cc --- a/src/LauPolarFormFactorSymNR.cc +++ b/src/LauPolarFormFactorSymNR.cc @@ -36,7 +36,6 @@ #include "LauParameter.hh" #include "LauResonanceInfo.hh" -ClassImp(LauPolarFormFactorSymNR) LauPolarFormFactorSymNR::LauPolarFormFactorSymNR(LauResonanceInfo* resInfo, const LauAbsResonance::LauResonanceModel resType, const Int_t resPairAmpInt, const LauDaughters* daughters) : diff --git a/src/LauPolarGammaCPCoeffSet.cc b/src/LauPolarGammaCPCoeffSet.cc --- a/src/LauPolarGammaCPCoeffSet.cc +++ b/src/LauPolarGammaCPCoeffSet.cc @@ -43,7 +43,6 @@ LauParameter* LauPolarGammaCPCoeffSet::rDGlobal_ = 0; LauParameter* LauPolarGammaCPCoeffSet::deltaDGlobal_ = 0; -ClassImp(LauPolarGammaCPCoeffSet) LauPolarGammaCPCoeffSet::LauPolarGammaCPCoeffSet(const TString& compName, const DecayType decayType, diff --git a/src/LauPoleRes.cc b/src/LauPoleRes.cc --- a/src/LauPoleRes.cc +++ b/src/LauPoleRes.cc @@ -28,7 +28,6 @@ #include "LauPoleRes.hh" -ClassImp(LauPoleRes) LauPoleRes::LauPoleRes(LauResonanceInfo* resInfo, const Int_t resPairAmpInt, const LauDaughters* daughters) : diff --git a/src/LauPrint.cc b/src/LauPrint.cc --- a/src/LauPrint.cc +++ b/src/LauPrint.cc @@ -32,7 +32,6 @@ #include "LauPrint.hh" -ClassImp(LauPrint) LauPrint::LauPrint() diff --git a/src/LauRealImagCPCoeffSet.cc b/src/LauRealImagCPCoeffSet.cc --- a/src/LauRealImagCPCoeffSet.cc +++ b/src/LauRealImagCPCoeffSet.cc @@ -39,7 +39,6 @@ #include "LauParameter.hh" #include "LauPrint.hh" -ClassImp(LauRealImagCPCoeffSet) LauRealImagCPCoeffSet::LauRealImagCPCoeffSet(const TString& compName, Double_t x, Double_t y, Double_t xbar, Double_t ybar, diff --git a/src/LauRealImagCoeffSet.cc b/src/LauRealImagCoeffSet.cc --- a/src/LauRealImagCoeffSet.cc +++ b/src/LauRealImagCoeffSet.cc @@ -39,7 +39,6 @@ #include "LauParameter.hh" #include "LauPrint.hh" -ClassImp(LauRealImagCoeffSet) LauRealImagCoeffSet::LauRealImagCoeffSet(const TString& compName, Double_t x, Double_t y, Bool_t xFixed, Bool_t yFixed) : diff --git a/src/LauRealImagGammaCPCoeffSet.cc b/src/LauRealImagGammaCPCoeffSet.cc --- a/src/LauRealImagGammaCPCoeffSet.cc +++ b/src/LauRealImagGammaCPCoeffSet.cc @@ -39,7 +39,6 @@ #include "LauParameter.hh" #include "LauPrint.hh" -ClassImp(LauRealImagGammaCPCoeffSet) LauRealImagGammaCPCoeffSet::LauRealImagGammaCPCoeffSet(const TString& compName, const Double_t x, const Double_t y, const Double_t xCP, const Double_t yCP, const Double_t xbarCP, const Double_t ybarCP, diff --git a/src/LauRelBreitWignerRes.cc b/src/LauRelBreitWignerRes.cc --- a/src/LauRelBreitWignerRes.cc +++ b/src/LauRelBreitWignerRes.cc @@ -31,7 +31,6 @@ #include "LauConstants.hh" #include "LauRelBreitWignerRes.hh" -ClassImp(LauRelBreitWignerRes) LauRelBreitWignerRes::LauRelBreitWignerRes(LauResonanceInfo* resInfo, const Int_t resPairAmpInt, const LauDaughters* daughters) : diff --git a/src/LauRescattering2Res.cc b/src/LauRescattering2Res.cc --- a/src/LauRescattering2Res.cc +++ b/src/LauRescattering2Res.cc @@ -32,7 +32,6 @@ #include "LauRescattering2Res.hh" #include "LauResonanceInfo.hh" -ClassImp(LauRescattering2Res) LauRescattering2Res::LauRescattering2Res(LauResonanceInfo* resInfo, const Int_t resPairAmpInt, const LauDaughters* daughters) : LauAbsResonance(resInfo, resPairAmpInt, daughters), diff --git a/src/LauRescatteringRes.cc b/src/LauRescatteringRes.cc --- a/src/LauRescatteringRes.cc +++ b/src/LauRescatteringRes.cc @@ -37,7 +37,6 @@ #include "LauParameter.hh" #include "LauResonanceInfo.hh" -ClassImp(LauRescatteringRes) LauRescatteringRes::LauRescatteringRes(LauResonanceInfo* resInfo, const LauAbsResonance::LauResonanceModel resType, diff --git a/src/LauResonanceInfo.cc b/src/LauResonanceInfo.cc --- a/src/LauResonanceInfo.cc +++ b/src/LauResonanceInfo.cc @@ -31,7 +31,6 @@ #include "LauParameter.hh" #include "LauResonanceInfo.hh" -ClassImp(LauResonanceInfo) LauResonanceInfo::LauResonanceInfo(const TString& name, const Double_t mass, const Double_t width, const Int_t spin, const Int_t charge, const LauBlattWeisskopfFactor::BlattWeisskopfCategory bwCategory, const Double_t bwRadius) : diff --git a/src/LauResonanceMaker.cc b/src/LauResonanceMaker.cc --- a/src/LauResonanceMaker.cc +++ b/src/LauResonanceMaker.cc @@ -58,7 +58,6 @@ #include "LauRhoOmegaMix.hh" #include "LauSigmaRes.hh" -ClassImp(LauResonanceMaker); LauResonanceMaker* LauResonanceMaker::resonanceMaker_ = 0; diff --git a/src/LauResultsExtractor.cc b/src/LauResultsExtractor.cc --- a/src/LauResultsExtractor.cc +++ b/src/LauResultsExtractor.cc @@ -41,7 +41,6 @@ #include "TObjArray.h" #include "TSystem.h" -ClassImp(LauResultsExtractor) LauResultsExtractor::LauResultsExtractor(const TString& inputFileName, const TString& outputFileName, const TString& treeName) : diff --git a/src/LauRhoOmegaMix.cc b/src/LauRhoOmegaMix.cc --- a/src/LauRhoOmegaMix.cc +++ b/src/LauRhoOmegaMix.cc @@ -36,7 +36,6 @@ #include "LauResonanceInfo.hh" #include "LauResonanceMaker.hh" -ClassImp(LauRhoOmegaMix) LauRhoOmegaMix::LauRhoOmegaMix(LauResonanceInfo* resInfo, const LauAbsResonance::LauResonanceModel resType, diff --git a/src/LauRooFitTask.cc b/src/LauRooFitTask.cc --- a/src/LauRooFitTask.cc +++ b/src/LauRooFitTask.cc @@ -42,7 +42,6 @@ #include "LauSimFitTask.hh" #include "LauRooFitTask.hh" -ClassImp(LauRooFitTask) LauRooFitTask::LauRooFitTask( RooAbsPdf& model, const Bool_t extended, const RooArgSet& vars, const TString& weightVarName ) : diff --git a/src/LauSPlot.cc b/src/LauSPlot.cc --- a/src/LauSPlot.cc +++ b/src/LauSPlot.cc @@ -57,7 +57,6 @@ extern void Yields(Int_t &, Double_t *, Double_t &f, Double_t *x, Int_t iflag); -ClassImp(LauSPlot) LauSPlot::LauSPlot(const TString& fileName, const TString& treeName, diff --git a/src/LauScfMap.cc b/src/LauScfMap.cc --- a/src/LauScfMap.cc +++ b/src/LauScfMap.cc @@ -41,7 +41,6 @@ #include "LauScfMap.hh" -ClassImp(LauScfMap) LauScfMap::LauScfMap(): diff --git a/src/LauSigmaRes.cc b/src/LauSigmaRes.cc --- a/src/LauSigmaRes.cc +++ b/src/LauSigmaRes.cc @@ -32,7 +32,6 @@ #include "LauSigmaRes.hh" #include "LauResonanceInfo.hh" -ClassImp(LauSigmaRes) LauSigmaRes::LauSigmaRes(LauResonanceInfo* resInfo, const Int_t resPairAmpInt, const LauDaughters* daughters) : diff --git a/src/LauSigmoidPdf.cc b/src/LauSigmoidPdf.cc --- a/src/LauSigmoidPdf.cc +++ b/src/LauSigmoidPdf.cc @@ -40,7 +40,6 @@ #include "LauConstants.hh" #include "LauSigmoidPdf.hh" -ClassImp(LauSigmoidPdf) LauSigmoidPdf::LauSigmoidPdf(const TString& theVarName, const vector& params, Double_t minAbscissa, Double_t maxAbscissa) : diff --git a/src/LauSimFitCoordinator.cc b/src/LauSimFitCoordinator.cc --- a/src/LauSimFitCoordinator.cc +++ b/src/LauSimFitCoordinator.cc @@ -49,7 +49,6 @@ #include "LauSimFitCoordinator.hh" -ClassImp(LauSimFitCoordinator) LauSimFitCoordinator::LauSimFitCoordinator( UInt_t numTasks, UInt_t port ) : diff --git a/src/LauSimFitTask.cc b/src/LauSimFitTask.cc --- a/src/LauSimFitTask.cc +++ b/src/LauSimFitTask.cc @@ -40,7 +40,6 @@ #include "LauFitNtuple.hh" -ClassImp(LauSimFitTask) LauSimFitTask::LauSimFitTask() : diff --git a/src/LauSimpleFitModel.cc b/src/LauSimpleFitModel.cc --- a/src/LauSimpleFitModel.cc +++ b/src/LauSimpleFitModel.cc @@ -59,7 +59,6 @@ #include "TStyle.h" #include "TCanvas.h" -ClassImp(LauSimpleFitModel) LauSimpleFitModel::LauSimpleFitModel(LauIsobarDynamics* sigModel) : LauAbsFitModel(), diff --git a/src/LauSumPdf.cc b/src/LauSumPdf.cc --- a/src/LauSumPdf.cc +++ b/src/LauSumPdf.cc @@ -36,7 +36,6 @@ #include "LauParameter.hh" #include "LauSumPdf.hh" -ClassImp(LauSumPdf) LauSumPdf::LauSumPdf(LauAbsPdf* pdf1, LauAbsPdf* pdf2, LauParameter* frac) : diff --git a/src/LauVetoes.cc b/src/LauVetoes.cc --- a/src/LauVetoes.cc +++ b/src/LauVetoes.cc @@ -31,7 +31,6 @@ #include "LauKinematics.hh" #include "LauVetoes.hh" -ClassImp(LauVetoes) LauVetoes::LauVetoes() : diff --git a/src/LauWeightedSumEffModel.cc b/src/LauWeightedSumEffModel.cc --- a/src/LauWeightedSumEffModel.cc +++ b/src/LauWeightedSumEffModel.cc @@ -37,7 +37,6 @@ #include "LauKinematics.hh" #include "LauVetoes.hh" -ClassImp(LauWeightedSumEffModel) LauWeightedSumEffModel::LauWeightedSumEffModel(const LauDaughters* daughters) :