merge c20413, c20415, c20855, c20871 from trunk to rel-1-4-3. Include also...

merge c20413, c20415, c20855, c20871 from trunk to rel-1-4-3. Include also METS mu_F consistency patch.

MODEL/Interaction_Models/Interaction_Model_Higgs_THDM.C

@@ -65,7 +65,7 @@ void Interaction_Model_Higgs_THDM::c_FFS(std::vector<Single_Vertex>& vertex,int&
       for(short int j=1;j<17;j++) {
 	if (j==7) j=11;
 	Flavour fl1 = Flavour((kf_code)(j)); 
-       	if(fl1.IsOn() && fl1.IsFermion() && fl1.IsDowntype() && (fl1.Yuk() > 1.)) {
+       	if(fl1.IsOn() && fl1.IsFermion() && fl1.IsDowntype() && (fl1.Yuk() > 0.)) {
 	  
 	  vertex[vanz].in[0] = fl1; 
 	  vertex[vanz].in[1] = flav;
@@ -101,7 +101,7 @@ void Interaction_Model_Higgs_THDM::c_FFS(std::vector<Single_Vertex>& vertex,int&
       for(short int t=1;t<17;t++) {
 	if (t==7) t=11;
 	Flavour fl1 = Flavour((kf_code)(t)); 
-	if(fl1.IsOn() && fl1.IsQuark() && fl1.IsUptype() && (fl1.Yuk() > 1.)) {
+	if(fl1.IsOn() && fl1.IsQuark() && fl1.IsUptype() && (fl1.Yuk() > 0.)) {
 	  
 	  vertex[vanz].in[0] = fl1; 
 	  vertex[vanz].in[1] = flav;
@@ -140,7 +140,7 @@ void Interaction_Model_Higgs_THDM::c_FFS(std::vector<Single_Vertex>& vertex,int&
     for(short int k=1;k<17;k++) {
       if (k==7) k=11;
       Flavour fl1 = Flavour((kf_code)(k)); 
-      if(fl1.IsOn() && fl1.IsFermion() && fl1.IsDowntype() && (fl1.Yuk() > 1.)) {
+      if(fl1.IsOn() && fl1.IsFermion() && fl1.IsDowntype() && (fl1.Yuk() > 0.)) {
 		
 	vertex[vanz].in[0] = fl1; 
 	vertex[vanz].in[1] = flA0;
@@ -177,7 +177,7 @@ void Interaction_Model_Higgs_THDM::c_FFS(std::vector<Single_Vertex>& vertex,int&
     
     for(short int z=1;z<7;z++) { 
       Flavour fl1 = Flavour((kf_code)(z)); 
-      if(fl1.IsOn() && fl1.IsQuark() && fl1.IsUptype() && (fl1.Yuk() > 1.)) {
+      if(fl1.IsOn() && fl1.IsQuark() && fl1.IsUptype() && (fl1.Yuk() > 0.)) {
 	
 	vertex[vanz].in[0] = fl1; 
 	vertex[vanz].in[1] = flA0;
@@ -214,7 +214,7 @@ void Interaction_Model_Higgs_THDM::c_FFS(std::vector<Single_Vertex>& vertex,int&
 
     for(short int i=11;i<17;i++) {
       Flavour fl1 = Flavour((kf_code)(i)); 
-      if(fl1.IsOn() && fl1.IsLepton() && fl1.IsDowntype() && (fl1.Yuk() > 1.)) {
+      if(fl1.IsOn() && fl1.IsLepton() && fl1.IsDowntype() && (fl1.Yuk() > 0.)) {
 	Flavour fl2 = Flavour((kf_code)(i=i+1));
 	if(fl2.IsOn() && fl2.IsLepton() && fl2.IsUptype() ) {
 	  
@@ -252,7 +252,7 @@ void Interaction_Model_Higgs_THDM::c_FFS(std::vector<Single_Vertex>& vertex,int&
 	for(short int k=1;k<7;k++) {
 	  Flavour fl2 = Flavour((kf_code)(k));
 	  if(fl2.IsOn() && fl2.IsQuark() && fl2.IsUptype() && 
-	     ((fl1.Yuk() > 1.) || (fl2.Yuk() > 1.)) ) {
+	     ((fl1.Yuk() > 0.) || (fl2.Yuk() > 0.)) ) {
 	    
             int geni=(fl1.Kfcode()-1)/2; //downtype
 	    int genj=(fl2.Kfcode()-2)/2; //uptype

MODEL/Interaction_Models/Vertex.C

@@ -26,8 +26,7 @@ Vertex::Vertex(Interaction_Model_Base * _model)
 
   int vanz  = 0;
   int vanz4 = 0;  
-
-
+  
   msg_Debugging()<<"   Setting vertices..."<<endl;
   _model->c_FFV(m_v,vanz);
   msg_Debugging()<<"   FFV  : vanz, vanz4: "<<vanz<<", "<<vanz4<<endl;

MODEL/Main/MSSM.C

@@ -43,6 +43,7 @@ bool MSSM::ModelInit(const PDF::ISR_Handler_Map& isr)
   p_sm->ModelInit(isr);
   p_numbers   = p_sm->ExtractScalarNumbers();
   p_constants = p_sm->ExtractScalarConstants();
+  p_complexconstants = p_sm->ExtractComplexConstants();
   p_functions = p_sm->ExtractScalarFunctions();
   p_matrices  = p_sm->ExtractComplexMatrices();
 

MODEL/Main/SM_MSSM_EHC.C

@@ -123,10 +123,6 @@ MSSM_EHC::MSSM_EHC(std::string _dir,std::string _file,bool _elementary) :
 {
   p_mssm = new MSSM(m_dir,m_file,false);
   ParticleInit();
-  if (m_elementary) {
-    ATOOLS::OutputParticles(msg->Info());
-    ATOOLS::OutputContainers(msg->Info());
-  }
 }
 
 bool MSSM_EHC::ModelInit(const PDF::ISR_Handler_Map& isr)
@@ -149,6 +145,11 @@ bool MSSM_EHC::ModelInit(const PDF::ISR_Handler_Map& isr)
   
   FillSpectrum(isr);
 
+  if (m_elementary) {
+    ATOOLS::OutputParticles(msg->Info());
+    ATOOLS::OutputContainers(msg->Info());
+  }
+
   return true;
 }
 

PHASIC++/Scales/METS_Scale_Setter.C

@@ -266,13 +266,6 @@ double METS_Scale_Setter::Calculate
 		       -momenta[i][2],-momenta[i][3]);
   }
   if (mode==0) return CalculateMyScale(momenta,mode);
-  if (m_mode==2 || (m_mode==1 && !p_caller->LookUp())) {
-    p_caller->Integrator()->SetMomenta(momenta);
-    p_caller->Integrator()->SwapInOrder();
-    double muf2(CalculateMyScale(p_caller->Integrator()->Momenta(),1));
-    p_caller->Integrator()->RestoreInOrder();
-    return muf2;
-  }
   return m_scale[stp::fac];
 }
 

PHASIC++/Selectors/Cut_Data.C

 #include "PHASIC++/Selectors/Cut_Data.H"
 
 #include "ATOOLS/Org/Run_Parameter.H"
+#include "ATOOLS/Org/Data_Reader.H"
 #include "ATOOLS/Org/MyStrStream.H"
 #include "ATOOLS/Math/Poincare.H"
 #include "ATOOLS/Org/Message.H"
@@ -81,19 +82,14 @@ void Cut_Data::Init(int _nin,const Flavour_Vector &_fl) {
   }
   smin = sqr(smin);
 
+  Data_Reader read(" ",";","!","=");
+  double sijminfac = read.GetValue<double>("INT_MINSIJ_FACTOR", 1.e-12);
   for (int i=0;i<ncut;i++) {
     for (int j=i;j<ncut;j++) {
       cosmin[i][j] = cosmin[j][i] = cosmin_save[i][j] = -1.;
       cosmax[i][j] = cosmax[j][i] = cosmax_save[i][j] = 1.;
-      /*      double sc =
-	+sqr(fl[i].SelMass())+sqr(fl[j].SelMass())
-	+2.*energymin[i]*energymin[j]
-	-2.*sqrt(dabs(sqr(energymin[i])-sqr(fl[i].SelMass())))
-	*sqrt(dabs(sqr(energymin[j])-sqr(fl[j].SelMass())))
-	*cosmax[i][j];*/
       scut[i][j] = scut[j][i] = scut_save[i][j] =
-	(i<nin)^(j<nin)?0.0:1.e-12*sqr(rpa->gen.Ecms());
-	//Max(sc,1.e-12*sqr(rpa->gen.Ecms()));
+              (i<nin)^(j<nin)?0.0:sijminfac*sqr(rpa->gen.Ecms());
     }
   }  
 }

PHASIC++/Selectors/Standard_Selector.C

@@ -1139,7 +1139,7 @@ bool IMass_Selector::Trigger(const Vec4D_Vector & mom)
     for (int j=i+1;j<m_n;j++) {
       massij = value[i*m_n+j] = sqrt((mom[i]+mom[j]).Abs2());
       if (m_sel_log->Hit( ((massij < massmin[i][j]) || 
-			 (massij > massmax[i][j])) )) return 0;
+			   (massij > massmax[i][j])) )) return 0;
     }
   }
   return 1;
@@ -1270,7 +1270,7 @@ bool IQ2_Selector::Trigger(const Vec4D_Vector & mom)
     for (int j=m_nin;j<m_n;j++) {
       massij = value[i*m_n+j] = -(mom[i]-mom[j]).Abs2();
       if (m_sel_log->Hit( ((massij < massmin[i][j]) || 
-			 (massij > massmax[i][j])) )) return 0;
+			   (massij > massmax[i][j])) )) return 0;
     }
   }
   return 1;
@@ -1397,9 +1397,7 @@ bool Delta_Eta_Selector::Trigger(const Vec4D_Vector & mom)
   double detaij;
   for (int i=m_nin;i<m_n;i++) {
     for (int j=i+1;j<m_n;j++) {
-      detaij = value[i*m_n+j] = mom[i].DEta(mom[j]);
-//       PRINT_INFO("("<<m_fl[i]<<" "<<m_fl[j]<<") : "<<detaij
-// 		 <<" in {"<<detamin[i][j]<<", "<<detamax[i][j]<<"}");
+      detaij = abs(value[i*m_n+j] = mom[i].DEta(mom[j]));
       if (m_sel_log->Hit( ((detaij < detamin[i][j]) || 
 			   (detaij > detamax[i][j])) )) return 0;
     }
@@ -1507,8 +1505,6 @@ bool Delta_Phi_Selector::Trigger(const Vec4D_Vector & mom)
   for (int i=m_nin;i<m_n;i++) {
     for (int j=i+1;j<m_n;j++) {
       dphiij = value[i*m_n+j] = mom[i].DPhi(mom[j]);
-//       PRINT_INFO("("<<m_fl[i]<<" "<<m_fl[j]<<") : "<<dphiij
-// 		 <<" in {"<<dphimin[i][j]<<", "<<dphimax[i][j]<<"}");
       if (m_sel_log->Hit( ((dphiij < dphimin[i][j]) || 
 			   (dphiij > dphimax[i][j])) )) return 0;
     }