Merge branch 'feature/move-code-r9' into 'bugfix/split-CDCDedxPID-module-into-two-release9'

Move code between different packages for release/09-00

See merge request belle2/software/basf2!4045

Author: Frankenfrog

alignment/SConscript

@@ -1,6 +1,6 @@
 Import('env')
 
-env['LIBS'] = ['framework', 'cdc_dataobjects',
+env['LIBS'] = ['framework', 'cdc_dataobjects', 'cdc_dbobjects',
                'genfit2', '$ROOT_LIBS', 'EG', 'svd', 'pxd',
                'alignment_dataobjects', 'calibration', 'calibration_dataobjects',
                'klm_dataobjects', 'klm_dbobjects', 'klm', 'cdc', 'alignment_dbobjects',

cdc/SConscript

@@ -1,7 +1,7 @@
 Import('env')
 
-env['LIBS'] = ['framework', 'geometry', 'simulation', 'calibration',
-               '$ROOT_LIBS', 'Geom', 'EG', 'cdc_dataobjects',
+env['LIBS'] = ['framework', 'geometry', 'simulation', 'analysis', 'analysis_dataobjects',
+               '$ROOT_LIBS', 'Geom', 'EG', 'cdc_dataobjects', 'cdc_dbobjects',
                '$GEANT4_LIBS', 'CLHEP', 'mdst_dataobjects', 'simulation_dataobjects', "boost_iostreams"]
 
 #env.Append(CPPDEFINES = {'CDC_DEBUG':None})

reconstruction/calibration/include/CDCDedx1DCellAlgorithm.h renamed to cdc/calibration/CDCdEdx/include/CDCDedx1DCellAlgorithm.h

@@ -22,7 +22,7 @@
 #include <TRandom.h>
 
 
-#include <reconstruction/dbobjects/CDCDedx1DCell.h>
+#include <cdc/dbobjects/CDCDedx1DCell.h>
 #include <calibration/CalibrationAlgorithm.h>
 #include <framework/database/DBObjPtr.h>
 
@@ -57,12 +57,12 @@ namespace Belle2 {
     void setVariableBins(bool value) {isVarBins = value;}
 
     /**
-    * funtion to set truncation method (local vs global)
+    * function to set truncation method (local vs global)
     */
     void setLayerTrunc(bool value = false) {isFixTrunc = value;}
 
     /**
-    * set false if generating absoulte (not relative)
+    * set false if generating absolute (not relative)
     * payload
     */
     void setMergePayload(bool value) { isMerge = value;}
@@ -78,7 +78,7 @@ namespace Belle2 {
     void setRotSymmetry(bool value) {isRotSymm = value;}
 
     /**
-     * function to set bins of trunction from histogram
+     * function to set bins of truncation from histogram
     */
     void setTrucationBins(double lowedge, double upedge)
     {
@@ -91,12 +91,12 @@ namespace Belle2 {
     void enableExtraPlots(bool value = false) {isMakePlots = value;}
 
     /**
-    * funtion to set pt limit
+    * function to set pt limit
     */
     void setPtLimit(double value) {m_ptMax = value;}
 
     /**
-    * funtion to set cos #theta limit
+    * function to set cos \f$\theta\f$ limit
     */
     void setCosLimit(double value) {m_cosMax = value;}
 
@@ -116,7 +116,7 @@ namespace Belle2 {
     }
 
     /**
-    * class funtion to set rotation symmetry
+    * class function to set rotation symmetry
     */
     int rotationalBin(int nbin, int ibin)
     {
@@ -133,7 +133,7 @@ namespace Belle2 {
     void getExpRunInfo();
 
     /**
-    * class function to create vectors for bin mappping (Var->symm)
+    * class function to create vectors for bin mapping (Var->symm)
     */
     void CreateBinMapping();
 
@@ -143,7 +143,7 @@ namespace Belle2 {
     void defineHisto(std::vector<TH1D*>  hdedxhit[2],  TH1D* hdedxlay[2], TH1D* hentalay[2]);
 
     /**
-    * function to get bins of trunction from histogram
+    * function to get bins of truncation from histogram
     */
     void getTruncatedBins(TH1D* hist, int& binlow, int& binhigh);
 
@@ -153,28 +153,28 @@ namespace Belle2 {
     double getTruncationMean(TH1D* hist, int binlow, int binhigh);
 
     /**
-     * funtion to generate final constants
+     * function to generate final constants
      */
     void createPayload();
 
     /**
-     * funtion to plot merging factor
+     * function to plot merging factor
      */
     void plotMergeFactor(std::map<int, std::vector<double>> bounds, const std::array<int, 2> nDev,
                          std::map<int, std::vector<int>> steps);
 
     /**
-    * function to draw the dE/dx histrogram in enta bins
+    * function to draw the dE/dx histogram in enta bins
     */
     void plotdedxHist(std::vector<TH1D*> hdedxhit[2]);
 
     /**
-    * funtion to draw dedx dist. for Inner/outer layer
+    * function to draw dedx dist. for Inner/outer layer
     */
     void plotLayerDist(TH1D* hdedxL[2]);
 
     /**
-    * funtion to draw pt vs costh and entrance angle distribution for Inner/Outer layer
+    * function to draw pt vs costh and entrance angle distribution for Inner/Outer layer
     */
     void plotQaPars(TH1D* hentalay[2], TH2D* hptcosth);
 
@@ -205,7 +205,7 @@ namespace Belle2 {
     double m_eaMin; /**< lower edge of enta angle */
     double m_eaMax; /**< upper edge of enta angle */
     double m_eaBW; /**< binwdith of enta angle bin */
-    int m_eaBin; /**< # of bins for etna angle */
+    int m_eaBin; /**< # of bins for enta angle */
 
     double m_dedxMin;  /**< lower edge of dedxhit */
     double m_dedxMax;  /**< upper edge of dedxhit */
@@ -214,18 +214,17 @@ namespace Belle2 {
     double m_ptMax; /**< a limit on transverse momentum  */
     double m_cosMax; /**< a limit on cos theta  */
 
-    double m_truncMin; /**< lower thershold on truncation*/
-    double m_truncMax; /**< uppr thershold on truncation */
+    double m_truncMin; /**< lower threshold on truncation*/
+    double m_truncMax; /**< upper threshold on truncation */
 
     int m_binSplit;/**< multiply nbins by this factor in full range */
-    int m_binMerge;/**< merge bins by this factor in (-pi/2 <-> -pi/4) and (pi/4 <-> pi/2) region*/
 
     double m_chargeType; /**< charge type for baseline adj */
-    double m_adjustFac;/**< faactor with that one what to adjust baseline */
+    double m_adjustFac;/**< factor with that one what to adjust baseline */
 
     bool isFixTrunc; /**< true = fix window for all out/inner layers */
     bool isVarBins;  /**< true: if variable bin size is requested */
-    bool isRotSymm; /**< if rotation symmtery requested */
+    bool isRotSymm; /**< if rotation symmetry requested */
     bool isMakePlots; /**< produce plots for status */
     bool isPrintLog; /**< print more debug information */
     bool isMerge; /**< print more debug information */
@@ -234,9 +233,9 @@ namespace Belle2 {
     std::string m_runExp; /**< add suffix to all plot name  */
     std::string m_label[2] = {"IL", "OL"}; /**< add inner/outer layer label */
 
-    std::vector<int> m_eaBinLocal; /**< # of var bins for etna angle */
-    std::array<std::vector<int>, 2> m_binIndex; /**< symm/Var bin numebrs */
-    std::array<std::vector<double>, 2>m_binValue; /**< etna Var bin values */
+    std::vector<int> m_eaBinLocal; /**< # of var bins for enta angle */
+    std::array<std::vector<int>, 2> m_binIndex; /**< symm/Var bin numbers */
+    std::array<std::vector<double>, 2>m_binValue; /**< enta Var bin values */
 
     std::vector<std::vector<double>> m_onedcors; /**< final vectors of calibration  */
 

reconstruction/calibration/include/CDCDedx2DCellAlgorithm.h renamed to cdc/calibration/CDCdEdx/include/CDCDedx2DCellAlgorithm.h

@@ -26,8 +26,8 @@
 #include <framework/database/DBObjPtr.h>
 #include <framework/database/IntervalOfValidity.h>
 
-#include <reconstruction/dbobjects/CDCDedxBadWires.h>
-#include <reconstruction/dbobjects/CDCDedxWireGain.h>
+#include <cdc/dbobjects/CDCDedxBadWires.h>
+#include <cdc/dbobjects/CDCDedxWireGain.h>
 
 #include <calibration/CalibrationAlgorithm.h>
 

reconstruction/calibration/include/CDCDedxBadWireAlgorithm.h renamed to cdc/calibration/CDCdEdx/include/CDCDedxBadWireAlgorithm.h

@@ -14,7 +14,7 @@
 #include<map>
 #include<vector>
 
-#include <reconstruction/dbobjects/CDCDedxCosineEdge.h>
+#include <cdc/dbobjects/CDCDedxCosineEdge.h>
 #include <calibration/CalibrationAlgorithm.h>
 #include <framework/database/DBObjPtr.h>
 

reconstruction/calibration/include/CDCDedxCosEdgeAlgorithm.h renamed to cdc/calibration/CDCdEdx/include/CDCDedxCosEdgeAlgorithm.h

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <reconstruction/dbobjects/CDCDedxCosineCor.h>
+#include <cdc/dbobjects/CDCDedxCosineCor.h>
 #include <calibration/CalibrationAlgorithm.h>
 #include <framework/database/DBObjPtr.h>
 #include <TH1D.h>

reconstruction/calibration/include/CDCDedxCosineAlgorithm.h renamed to cdc/calibration/CDCdEdx/include/CDCDedxCosineAlgorithm.h

@@ -22,9 +22,9 @@
 
 #include <calibration/CalibrationAlgorithm.h>
 #include <framework/database/DBObjPtr.h>
-#include <reconstruction/dbobjects/CDCDedxInjectionTime.h>
-#include <reconstruction/utility/CDCDedxMeanPred.h>
-#include <reconstruction/utility/CDCDedxSigmaPred.h>
+#include <cdc/dbobjects/CDCDedxInjectionTime.h>
+#include <cdc/utilities/CDCDedxMeanPred.h>
+#include <cdc/utilities/CDCDedxSigmaPred.h>
 #include <framework/gearbox/Const.h>
 
 // namespace constants

reconstruction/calibration/include/CDCDedxInjectTimeAlgorithm.h renamed to cdc/calibration/CDCdEdx/include/CDCDedxInjectTimeAlgorithm.h

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <reconstruction/dbobjects/CDCDedxRunGain.h>
+#include <cdc/dbobjects/CDCDedxRunGain.h>
 #include <calibration/CalibrationAlgorithm.h>
 #include <framework/database/DBObjPtr.h>
 #include <TH1D.h>