-!#ifdef MPI
-! do ib=1,nT_h(iparm)
-! potEmin=potEmin_all(ib,iparm)
-! expfac=dexp(-beta_h(ib,iparm)*(etot-potEmin)+entfac(t))
-! hfin_p(ind,ib)=hfin_p(ind,ib)+
-! & dexp(-beta_h(ib,iparm)*(etot-potEmin)+entfac(t))
-! if (rmsrgymap) then
-! indrgy=dint((q(nQ+2,t)-rgymin)/deltrgy)
-! indrms=dint((q(nQ+1,t)-rmsmin)/deltrms)
-! hrmsrgy_p(indrgy,indrms,ib)=
-! & hrmsrgy_p(indrgy,indrms,ib)+expfac
-! endif
-! enddo
-!#else
-! do ib=1,nT_h(iparm)
-! potEmin=potEmin_all(ib,iparm)
-! expfac=dexp(-beta_h(ib,iparm)*(etot-potEmin)+entfac(t))
-! hfin(ind,ib)=hfin(ind,ib)+
-! & dexp(-beta_h(ib,iparm)*(etot-potEmin)+entfac(t))
-! if (rmsrgymap) then
-! indrgy=dint((q(nQ+2,t)-rgymin)/deltrgy)
-! indrms=dint((q(nQ+1,t)-rmsmin)/deltrms)
-! hrmsrgy(indrgy,indrms,ib)=
-! & hrmsrgy(indrgy,indrms,ib)+expfac
-! endif
-! enddo
-!#endif
+#ifdef MPI
+ do ib=1,nT_h(iparm)
+ potEmin=potEmin_all(ib,iparm)
+ expfac=dexp(-beta_h(ib,iparm)*(etot-potEmin)+entfac(t))
+ hfin_p(ind,ib)=hfin_p(ind,ib)+
+ & dexp(-beta_h(ib,iparm)*(etot-potEmin)+entfac(t))
+ if (rmsrgymap) then
+ indrgy=dint((q(nQ+2,t)-rgymin)/deltrgy)
+ indrms=dint((q(nQ+1,t)-rmsmin)/deltrms)
+ hrmsrgy_p(indrgy,indrms,ib)=
+ & hrmsrgy_p(indrgy,indrms,ib)+expfac
+ endif
+ enddo
+#else
+ do ib=1,nT_h(iparm)
+ potEmin=potEmin_all(ib,iparm)
+ expfac=dexp(-beta_h(ib,iparm)*(etot-potEmin)+entfac(t))
+ hfin(ind,ib)=hfin(ind,ib)+
+ & dexp(-beta_h(ib,iparm)*(etot-potEmin)+entfac(t))
+ if (rmsrgymap) then
+ indrgy=dint((q(nQ+2,t)-rgymin)/deltrgy)
+ indrms=dint((q(nQ+1,t)-rmsmin)/deltrms)
+ hrmsrgy(indrgy,indrms,ib)=
+ & hrmsrgy(indrgy,indrms,ib)+expfac
+ endif
+ enddo
+#endif