added cmsMass to epemParser

Examples/Tutorial/Jamfile

 
 build-project DfuncClebschG ;
 build-project MinuitFit ;
-build-project FitIF ;
-build-project FitIF2 ;
+# build-project FitIF ;
+# build-project FitIF2 ;
 build-project LineShapes ;

Examples/epem/epemReactionApp.cc

@@ -80,7 +80,6 @@ int main(int __argc,char *__argv[]){
   boost::shared_ptr<FitParamsBase> theFitParamBase=boost::shared_ptr<FitParamsBase>(new FitParamsBase());
 
 
-
   const std::string datFile=theAppParams->dataFile();
   const std::string mcFile=theAppParams->mcFile();
   Info << "data file: " << datFile ;  // << endmsg;

epemUtils/epemEnv.cc

@@ -18,7 +18,7 @@
 
 epemEnv* epemEnv::_instance=0;
 
-epemEnv* epemEnv::instance()
+epemEnv* epemEnv::instance() 
 {
   if (0==_instance) _instance = new epemEnv();
   return _instance;
@@ -26,15 +26,16 @@ epemEnv* epemEnv::instance()
 
 epemEnv::epemEnv() :
   AbsEnv()
+  , _cmsMass(3.096916)
 {
 }
 epemEnv::~epemEnv(){
 }
 
 void epemEnv::setup(epemParser* theEpEmParser){
-
+ 
   AbsEnv::setup(theEpEmParser);
-
+  
   std::vector<std::string>::const_iterator itStr;
 
 
@@ -167,7 +168,7 @@ void epemEnv::setup(epemParser* theEpEmParser){
     _angleHistDataVec.push_back(currentAngleHistData);
   }
 
-
+  _cmsMass=theEpEmParser->cmsMass();
 }
 
 

epemUtils/epemEnv.hh

@@ -30,13 +30,13 @@ public:
   void setup(epemParser* theEpEmParser);
 
   boost::shared_ptr<epemReaction> reaction() {return _epemReaction;}
-  
+  const double cmsMass() {return _cmsMass;}  
 
 protected:  
 
   epemEnv();
   static epemEnv* _instance;
-
+  double _cmsMass;
   boost::shared_ptr<epemReaction> _epemReaction;
   std::vector<std::string> _spinDensity;
 };

epemUtils/epemHist.cc

@@ -43,9 +43,10 @@ void epemHist::initRootStuff(){
     std::string histName="Data"+tmpBaseName;
     std::string histDescription = "M("+tmpMassHistData->_name+") (data)";
 
-    double psiMass = epemEnv::instance()->particleTable()->particle("Jpsi")->mass();
+    //    double psiMass = epemEnv::instance()->particleTable()->particle("Jpsi")->mass();
     double massMin = 0;
-    double massMax = psiMass;
+    //    double massMax = psiMass;
+    double massMax = epemEnv::instance()->cmsMass();
 
     std::vector<std::string> fspNames=tmpMassHistData->_fspNames;
     std::vector<Particle*> allFsp =  epemEnv::instance()->finalStateParticles();

epemUtils/epemParser.cc

@@ -22,7 +22,8 @@ epemParser::epemParser(int argc,char **argv):
   
   po::options_description config("Configuration file options");
   config.add_options()
-    ("spinDensity", po::value< vector<string> >(&_spinDensity), "particles for spin density matrix calculation")
+    ("spinDensity", po::value< vector<string> >(&_spinDensity), "particles for spin density matrix calculation") 
+    ("cmsMass", po::value<double>(&_cmsMass), "CMS mass")
     ;
   _config->add(config);
   
@@ -33,15 +34,16 @@ bool epemParser::parseCommandLine(int argc, char **argv)
 {
   ParserBase::parseCommandLine(argc, argv);
 
+  std::cout << "\ncms mass:\t" << _cmsMass << std::endl;
 
   std::vector<std::string>::const_iterator it;
-
+  
   std::cout << "\nspin density matrix calculation for particles" << std::endl;
-  for (it=_spinDensity.begin(); it!=_spinDensity.end(); ++it){
-     std::cout << (*it) << "\n";
-  }
-
+   for (it=_spinDensity.begin(); it!=_spinDensity.end(); ++it){
+      std::cout << (*it) << "\n";
+   }
+  
   std::cout << std::endl;
-
+  
   return true;
 }

epemUtils/epemParser.hh

@@ -16,11 +16,13 @@ class epemParser : public ParserBase
   epemParser(int argc,char **argv);
   virtual ~epemParser(){;}
 
-  const std::vector<std::string>& spinDensityNames() const { return _spinDensity;}
+  //  const std::vector<std::string>& spinDensityNames() const { return _spinDensity;}
+  const double cmsMass() {return _cmsMass;}
 
 protected:
   virtual bool parseCommandLine(int argc,char **argv); 
 
+  double _cmsMass;
   std::vector<std::string> _spinDensity;
 };