Ticket #75: cps_threading_1.patch

COMIX/Phasespace/PS_Channel.C

@@ -193 +193 @@
 (const Current_Base *cur,const size_t &id)
 {
   if (cur!=NULL) {
-    CVegas_Map::const_iterator vit(m_pcmap.find(cur));
-    if (vit!=m_pcmap.end()) return vit->second;
 #ifdef USING__Threading
     pthread_mutex_lock(&m_vgs_mtx);
 #endif
-    m_pcmap[cur]=GetVegas("P_"+cur->PSInfo());
+    Vegas *vgs(NULL);
+    CVegas_Map::const_iterator vit(m_pcmap.find(cur));
+    if (vit!=m_pcmap.end()) vgs=vit->second;
+    else vgs=m_pcmap[cur]=GetVegas("P_"+cur->PSInfo());
 #ifdef USING__Threading
     pthread_mutex_unlock(&m_vgs_mtx);
 #endif
-    return m_pcmap[cur];
+    return vgs;
   }
-  IVegas_Map::const_iterator vit(m_pimap.find(id));
-  if (vit!=m_pimap.end()) return vit->second;
 #ifdef USING__Threading
   pthread_mutex_lock(&m_vgs_mtx);
 #endif
-  m_pimap[id]=GetVegas("P_"+GetPSId(id));
+  Vegas *vgs(NULL);
+  IVegas_Map::const_iterator vit(m_pimap.find(id));
+  if (vit!=m_pimap.end()) vgs=vit->second;
+  else vgs=m_pimap[id]=GetVegas("P_"+GetPSId(id));
 #ifdef USING__Threading
   pthread_mutex_unlock(&m_vgs_mtx);
 #endif
-  return m_pimap[id];
+  return vgs;
 }
 
 PHASIC::Vegas *PS_Channel::GetCVegas(const size_t &id,const size_t &n)
 {
-  IVegas_Map::const_iterator vit(m_cimap.find(id));
-  if (vit!=m_cimap.end()) return vit->second;
 #ifdef USING__Threading
   pthread_mutex_lock(&m_vgs_mtx);
 #endif
-  m_cimap[id]=GetVegas("C_"+GetPSId(id)+"_"+ToString(n),n);
+  Vegas *vgs(NULL);
+  IVegas_Map::const_iterator vit(m_cimap.find(id));
+  if (vit!=m_cimap.end()) vgs=vit->second;
+  else vgs=m_cimap[id]=GetVegas("C_"+GetPSId(id)+"_"+ToString(n),n);
 #ifdef USING__Threading
   pthread_mutex_unlock(&m_vgs_mtx);
 #endif
-  return m_cimap[id];
+  return vgs;
 }
 
 PHASIC::Vegas *PS_Channel::GetSVegas
 (const size_t &id,const Current_Base *cur)
 {
+#ifdef USING__Threading
+  pthread_mutex_lock(&m_vgs_mtx);
+#endif
+  Vegas *vgs(NULL);
   ICVegas_Map::const_iterator vit(m_sicmap.find(id));
   if (vit!=m_sicmap.end()) {
     CVegas_Map::const_iterator it(vit->second.find(cur));
-    if (it!=vit->second.end()) return it->second;
+    if (it!=vit->second.end()) vgs=it->second;
   }
-#ifdef USING__Threading
-  pthread_mutex_lock(&m_vgs_mtx);
-#endif
-  m_sicmap[id][cur]=GetVegas("S_"+GetPSId(id)+"_"+cur->PSInfo());
+  if (vgs==NULL) vgs=m_sicmap[id][cur]=
+    GetVegas("S_"+GetPSId(id)+"_"+cur->PSInfo());
 #ifdef USING__Threading
   pthread_mutex_unlock(&m_vgs_mtx);
 #endif
-  return m_sicmap[id][cur];
+  return vgs;
 }
 
 PHASIC::Vegas *PS_Channel::GetTVegas
 (const size_t &id,const Current_Base *cur)
 {
+#ifdef USING__Threading
+  pthread_mutex_lock(&m_vgs_mtx);
+#endif
+  Vegas *vgs(NULL);
   ICVegas_Map::const_iterator vit(m_ticmap.find(id));
   if (vit!=m_ticmap.end()) {
     CVegas_Map::const_iterator it(vit->second.find(cur));
-    if (it!=vit->second.end()) return it->second;
+    if (it!=vit->second.end()) vgs=it->second;
   }
-#ifdef USING__Threading
-  pthread_mutex_lock(&m_vgs_mtx);
-#endif
-  m_ticmap[id][cur]=GetVegas("T_"+GetPSId(id)+"_"+cur->PSInfo());
+  if (vgs==NULL) vgs=m_ticmap[id][cur]=
+    GetVegas("T_"+GetPSId(id)+"_"+cur->PSInfo());
 #ifdef USING__Threading
   pthread_mutex_unlock(&m_vgs_mtx);
 #endif
-  return m_ticmap[id][cur];
+  return vgs;
 }
 
 bool PS_Channel::Zero(Vertex_Base *const vtx) const

PHASIC++/Channels/Vegas.C

@@ -167 +167 @@
   return p_x;
 }
 
-double Vegas::GenerateWeight(const double* xy)
+double Vegas::GenerateWeight(const double* xy) const
 {
   if (m_on==0) return 1.;
-  m_weight = m_nc;
+  double weight = m_nc;
   for (int i=0;i<m_dim;i++) {
     size_t l(0), r(m_nd-1), c((l+r)/2);
     double a(p_xi[i][c]);
@@ -184 +184 @@
     int k(r);
     p_ia[i] = k;
     if (k==0) {
-      m_weight *= p_xi[i][k];
+      weight *= p_xi[i][k];
     }
     else {
-      m_weight *= p_xi[i][k]-p_xi[i][k-1];
+      weight *= p_xi[i][k]-p_xi[i][k-1];
     }
   }
-  return m_weight;
+  return weight;
 }
 
-double Vegas::GenerateBinWeight(int* xy)
+double Vegas::GenerateBinWeight(int* xy) const
 {
   if (m_on==0) return 1.;
-  m_weight = m_nc;
+  double weight = m_nc;
   for (int i=0;i<m_dim;i++) {
     int k(xy[i]);
     p_ia[i] = k;
     if (k==0) {
-      m_weight *= p_xi[i][k];
+      weight *= p_xi[i][k];
     }
     else {
-      m_weight *= p_xi[i][k]-p_xi[i][k-1];
+      weight *= p_xi[i][k]-p_xi[i][k-1];
     }
   }
-  return m_weight;
+  return weight;
 }
 
 double *Vegas::GetBinsMean(int *xy) const

PHASIC++/Channels/Vegas.H

@@ -12 +12 @@
     int m_nd;
     unsigned long m_nevt,m_nopt,m_snevt,m_cevt;
     double m_alpha;
-    double m_weight,m_sum,m_sum2;
+    double m_sum,m_sum2;
     double m_nc;
     double **p_xi;
     double *p_x,*p_xin,*p_r,*p_cx,*p_bm;
@@ -28 +28 @@
     Vegas(int dim,int ndx,const std::string &,int=1);
     ~Vegas();
     double* GeneratePoint(const double * _ran);
-    double GenerateWeight(const double *);
-    double GenerateBinWeight(int *);
+    double GenerateWeight(const double *) const;
+    double GenerateBinWeight(int *) const;
     void AddPoint(double,double *);
     void AddBinPoint(double,int *);