pbarpToOmegaPi: changed lh calculation and scope of the parameters

Examples/pbarpToOmegaPi/GInfoFunction.hh

@@ -126,7 +126,7 @@ public:
 				if(p==0) {
 				  OmegaPiData::fitParamVal theParamVal;
 				  assert(gdii_ptr->getFitParams(theParamVal));
-				  std::cout << generation << ": " << currentEvaluation << std::endl;
+				  std::cout << generation << ": logLh = " << currentEvaluation << std::endl;
 
 				  gdii_ptr->printFitParams(theParamVal);
 				}

Examples/pbarpToOmegaPi/GOmegaPiIndividual.hh

@@ -426,9 +426,6 @@ protected:
     assert(getFitParams(theFitParmValTmp));   
     result=_omegaPiLhPtr->calcLogLh(theFitParmValTmp);
 
-    std::cout << "logLh="<< result << std::endl;
-    printFitParams(theFitParmValTmp);
-    
     return result;
   }
   
@@ -454,7 +451,7 @@ private:
     for ( itJPCLS=theJPCLSs.begin(); itJPCLS!=theJPCLSs.end(); ++itJPCLS){
       //now fill the fitParameterMap
       
-      boost::shared_ptr<GBoundedDouble> gbd_ptr(new GBoundedDouble(-10., 10.) ); //JPCLS magnitude
+      boost::shared_ptr<GBoundedDouble> gbd_ptr(new GBoundedDouble(0., 1.) ); //JPCLS magnitude
       theGbdc_ptr->push_back(gbd_ptr);
 
       if (counter>0){ 

Examples/pbarpToOmegaPi/MOmegaPiFcn.cc

@@ -74,7 +74,7 @@ void  MOmegaPiFcn::setMnUsrParams(MnUserParameters& upar){
     //now fill the fitParameterMap
     std::string magStr=(*itJPCLS)->name()+"S"+"mag";
     std::string phiStr=(*itJPCLS)->name()+"S"+"phi";
-    upar.Add(magStr, 0.5, .1, -10., 10.);
+    upar.Add(magStr, 0.5, .1, 0., 1.);
     if (counter>0) upar.Add(phiStr, 0., .1, -M_PI, M_PI);
     counter++; 
   }
@@ -85,7 +85,7 @@ void  MOmegaPiFcn::setMnUsrParams(MnUserParameters& upar){
     //now fill the fitParameterMap
     std::string magStr=(*itJPCLS)->name()+"T0"+"mag";
     std::string phiStr=(*itJPCLS)->name()+"T0"+"phi";
-    upar.Add(magStr, 0.5, .1, -10., 10.);
+    upar.Add(magStr, 0.5, .1, 0., 1.);
     if (counter>0) upar.Add(phiStr, 0., .1, -M_PI, M_PI);
     counter++; 
   }
@@ -96,7 +96,7 @@ void  MOmegaPiFcn::setMnUsrParams(MnUserParameters& upar){
     //now fill the fitParameterMap
     std::string magStr=(*itJPCLS)->name()+"T1"+"mag";
     std::string phiStr=(*itJPCLS)->name()+"T1"+"phi";
-    upar.Add(magStr, 0.5, .1, -10., 10.);
+    upar.Add(magStr, 0.5, .1, 0., 1.);
     if (counter>0) upar.Add(phiStr, 0., .1, -M_PI, M_PI);
     counter++; 
   }

Examples/pbarpToOmegaPi/OmegaPiLh.cc

@@ -96,7 +96,7 @@ complex<double> OmegaPiLh::calcCoherentAmp(Spin lamgamma, Spin Minit, std::map<
       double theMag=it->second.first;
       double thePhi=it->second.second;
       complex<double> expiphi(cos(thePhi), sin(thePhi));
-      result+=theMag*expiphi*omegaDecAmp*Clebsch(theJPCLS->L,0,1, lamomega,theJPCLS->J, lamomega)*conj(theData.Dfp[theJPCLS->J][Minit][lamomega]); //Clebsch(1,lamomega,0,0,1,lamomega)=1    
+      result+=sqrt(2*theJPCLS->L+1)*sqrt(3)*theMag*expiphi*omegaDecAmp*Clebsch(theJPCLS->L,0,1, lamomega,theJPCLS->J, lamomega)*conj(theData.Dfp[theJPCLS->J][Minit][lamomega]); //Clebsch(1,lamomega,0,0,1,lamomega)=1    
     } 
 
   }