Merge pull request #186 from alspellm/current_branch_20231024

New vertex ana tupilization

analysis/data/v0_projection_2016_mc_7800_config.json

@@ -0,0 +1,10 @@
+{
+    "7800": {
+        "target_position": -4.3,
+        "rotated_mean_x": -2.31164e-01,
+        "rotated_mean_y": -5.15632e-02,
+        "rotated_sigma_x": 2.01293e-01,
+        "rotated_sigma_y": 8.16385e-02,
+        "rotation_angle_mrad": -120.719
+    }
+}

analysis/data/v0_projection_2016_mc_signal_config.json

@@ -0,0 +1,10 @@
+{
+    "7800": {
+        "target_position": -4.3,
+        "rotated_mean_x": 0.00032589410352742634,
+        "rotated_mean_y": 0.0005273697881972964,
+        "rotated_sigma_x": 0.19701452441142028,
+        "rotated_sigma_y": 0.09424252765235556,
+        "rotation_angle_mrad": -171.21036357655905
+    }
+}

analysis/include/HistoManager.h

@@ -182,7 +182,7 @@ class HistoManager {
                      std::string xtitle, int nbinsX, float xmin, float xmax,
                      std::string ytitle, int nbinsY, float ymin, float ymax,
                      std::string ztitle, int nbinsZ, float zmin, float zmax);
-
+        
         /**
          * @brief description
          * 
@@ -257,6 +257,20 @@ class HistoManager {
          */
         void Fill2DHisto(const std::string& histoName, float valuex, float valuey, float weight=1.);
 
+
+        /**
+         * @brief description
+         * 
+         * @param histoName 
+         * @param valuex 
+         * @param valuey
+         * @param valuez
+         * @param weight 
+         */
+        void Fill3DHisto(const std::string& histoName, float valuex, float valuey, float valuez, float weight=1.);
+
+
+
         /**
          * @brief Get histograms from input file
          * 

analysis/include/MutableTTree.h

@@ -87,6 +87,10 @@ class MutableTTree {
          */
         bool variableExists(std::string variable);
 
+        virtual void addVariable(std::string variableName, double param)=0;
+
+        void addVariableToTBranch(const std::string& variableName);
+
         ~MutableTTree();
 
     protected:

analysis/include/SimpAnaTTree.h

@@ -64,9 +64,20 @@ class SimpAnaTTree : public MutableTTree {
 
         void addVariable_unc_vtx_abs_delta_z0tanlambda();
 
+        //V0 target projection
+        //void vertex_target_projection(double target_pos);
+        //void vertex_target_projection_rotation(double angle); 
+        //void addVariable_unc_vtx_proj_significance();
+
+        void addVariable(std::string variableName, double param) override;
+
+        //Restructring add variables
+        void unc_vtx_ele_zalpha(double slope);
+        void unc_vtx_pos_zalpha(double slope);
+        void unc_vtx_deltaZ();
+
         //misc
         bool impactParameterCut2016Canonical(double mass);
-        bool testImpactParameterCut();
 
     private:
         double skipCutVarValue_ = -9876543210.0;//<! if cut variable is not defined for an event, assign this value

analysis/include/SimpEquations.h

@@ -21,25 +21,37 @@ class SimpEquations {
 
         void loadParametersConfig(const std::string paramsConfigFile);
 
-        double rate_2pi(double m_Ap, double m_pi, double m_V, double alpha_D);
-
-        double rate_Vpi(double m_Ap, double m_pi, double m_V, double alpha_D, double f_pi, bool rho, bool phi);
-
-        double br_Vpi(double m_Ap, double m_pi, double m_V, double alpha_D, double f_pi, bool rho, bool phi);
-
-        double br_2V(double m_Ap,double m_pi,double m_V,double alpha_D,double f_pi,double rho,double phi);
+        double rate_2pi(double m_Ap, double m_pi, double m_V, double alpha_dark);
+
+        double rate_Vrho_pi(double m_Ap, double m_pi, double m_V,
+                        double alpha_dark, double f_pi);
+        double rate_Vphi_pi(double m_Ap, double m_pi, double m_V,
+                        double alpha_dark, double f_pi);
+        double rate_Vcharged_pi(double m_Ap, double m_pi, double m_V,
+                        double alpha_dark, double f_pi);
+        double br_2pi(double m_Ap, double m_pi, double m_V, 
+                double alpha_dark, double f_pi);
+        double br_Vrho_pi(double m_Ap, double m_pi, double m_V, double alpha_dark,
+                double f_pi);
+
+        double br_Vphi_pi(double m_Ap, double m_pi, double m_V, double alpha_dark,
+                double f_pi);
+        double br_Vcharged_pi(double m_Ap, double m_pi, double m_V, 
+                double alpha_dark, double f_pi);
+
+        double br_2V(double m_Ap,double m_pi,double m_V,double alpha_dark,double f_pi,double rho,double phi);
 
         double Tv(bool rho,bool phi);
 
         double Beta(double x,double y);
 
-        double rate_2V(double m_Ap,double m_V,double alpha_D);
+        double rate_2V(double m_Ap,double m_V,double alpha_dark);
 
         double f(double r);
 
-        double rate_2l(double m_Ap,double m_pi,double m_V,double eps,double alpha_D,double f_pi,double m_l,bool rho);
+        double rate_2l(double m_Ap,double m_pi,double m_V,double eps,double alpha_dark,double f_pi,double m_l,bool rho);
 
-        double getCtau(double m_Ap,double m_pi,double m_V,double eps,double alpha_D,double f_pi,double m_l,bool rho);
+        double getCtau(double m_Ap,double m_pi,double m_V,double eps,double alpha_dark,double f_pi,double m_l,bool rho);
 
         double gamma(double m_V,double E_V);
 
@@ -51,14 +63,14 @@ class SimpEquations {
 
         double controlRegionBackgroundRate(double m_Ap);
 
-        double expectedSignalCalculation(double m_V, double eps, bool rho, bool phi,
+        double expectedSignalCalculation(double m_V, double eps, bool rho,
                         double E_V, TEfficiency* effCalc_h, double target_pos, double zcut);
 
-        double expectedSignalCalculation(double m_Ap, double m_pi, double m_V, double eps, double alpha_D,
-            double f_pi, double m_l, bool rho, bool phi, double E_V, TEfficiency* effCalc_h, double target_pos, 
+        double expectedSignalCalculation(double m_Ap, double m_pi, double m_V, double eps, double alpha_dark,
+            double f_pi, double m_l, bool rho,double E_V, TEfficiency* effCalc_h, double target_pos, 
             double zcut);
 
-        double expectedSignalCalculation(double m_V, double eps, bool rho, bool phi, double E_V, 
+        double expectedSignalCalculation(double m_V, double eps, bool rho, double E_V, 
                 TEfficiency* effCalc_h, double dNdm, double radFrac, double radAcc, double target_pos, double zcut);
 
         double getAprimeMassFromVectorMass(double m_V){return m_V * mass_ratio_Ap_to_Vd_;};
@@ -71,6 +83,6 @@ class SimpEquations {
         double mass_ratio_Ap_to_Vd_ = 3.0/1.8;//!< default Ap to dark vector mass ratio
         double ratio_mPi_to_fPi_ = 4.*M_PI;//!< defualt dark pion mass to decay constant ratio
         double m_l_ = 0.511;//!< default lepton mass (ele/pos only)
-        double alpha_D_ = 0.1;//!< default A' to dark meson coupling
+        double alpha_dark_ = 0.1;//!< default A' to dark meson coupling
 
 };

analysis/include/ZBiHistos.h

@@ -123,7 +123,11 @@ class ZBiHistos : public HistoManager{
          * 
          */
         TF1* fitExponentialPlusConst(std::string histogramName, double starnt_nevents);
-
+        /**
+         * @brief description
+         * 
+         */
+        TF1* fitExponentialPlusExp(std::string histogramName, double starnt_nevents);
         /**
          * @brief description
          *