cctbx-cvs Mailing List for Computational Crystallography Toolbox (Page 978)

Update of /cvsroot/cctbx/iotbx/iotbx/xplor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1381/iotbx/xplor

Modified Files:
	tst_xplormap.py 
Log Message:
print "Skipping ...: input file not available"

Index: tst_xplormap.py
===================================================================
RCS file: /cvsroot/cctbx/iotbx/iotbx/xplor/tst_xplormap.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** tst_xplormap.py	6 Sep 2004 07:41:57 -0000	1.13
--- tst_xplormap.py	22 Jan 2005 14:18:26 -0000	1.14
***************
*** 169,173 ****
    recycle()
    test_file_name = get_test_file_name()
!   if (os.path.isfile(test_file_name)):
      map1 = read_xplor(test_file_name)
      write_xplor(map1, "tmp.map")
--- 169,175 ----
    recycle()
    test_file_name = get_test_file_name()
!   if (not os.path.isfile(test_file_name)):
!     print "Skipping original CNS map test: input file not available"
!   else:
      map1 = read_xplor(test_file_name)
      write_xplor(map1, "tmp.map")

Update of /cvsroot/cctbx/iotbx/iotbx/pdb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1381/iotbx/pdb

Modified Files:
	tst_pdb.py 
Log Message:
print "Skipping ...: input file not available"

Index: tst_pdb.py
===================================================================
RCS file: /cvsroot/cctbx/iotbx/iotbx/pdb/tst_pdb.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** tst_pdb.py	9 Dec 2004 00:10:50 -0000	1.26
--- tst_pdb.py	22 Jan 2005 14:18:26 -0000	1.27
***************
*** 146,150 ****
    pdb_dir = os.path.join(os.environ["LIBTBX_DIST_ROOT"],
      "regression", "pdb")
!   if (not os.path.isdir(pdb_dir)): return
    for file_name in os.listdir(pdb_dir):
      if (    not file_name.endswith(".pdb")
--- 146,152 ----
    pdb_dir = os.path.join(os.environ["LIBTBX_DIST_ROOT"],
      "regression", "pdb")
!   if (not os.path.isdir(pdb_dir)):
!     print "Skipping exercise_interpretation(): input file not available"
!     return
    for file_name in os.listdir(pdb_dir):
      if (    not file_name.endswith(".pdb")

Update of /cvsroot/cctbx/iotbx/iotbx/kriber
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1381/iotbx/kriber

Modified Files:
	tst_strudat.py 
Log Message:
print "Skipping ...: input file not available"

Index: tst_strudat.py
===================================================================
RCS file: /cvsroot/cctbx/iotbx/iotbx/kriber/tst_strudat.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tst_strudat.py	6 Sep 2004 07:41:56 -0000	1.5
--- tst_strudat.py	22 Jan 2005 14:18:25 -0000	1.6
***************
*** 132,136 ****
    atlas_file = os.path.join(os.environ["LIBTBX_DIST_ROOT"],
      "regression", "misc", "strudat_zeolite_atlas")
!   if (not os.path.isfile(atlas_file)): return
    all_entries = strudat.read_all_entries(open(atlas_file))
    for i,entry in enumerate(all_entries.entries):
--- 132,138 ----
    atlas_file = os.path.join(os.environ["LIBTBX_DIST_ROOT"],
      "regression", "misc", "strudat_zeolite_atlas")
!   if (not os.path.isfile(atlas_file)):
!     print "Skipping exercise_zeolite_atlas(): input file not available"
!     return
    all_entries = strudat.read_all_entries(open(atlas_file))
    for i,entry in enumerate(all_entries.entries):

Update of /cvsroot/cctbx/iotbx/include/iotbx/mtz
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1381/include/iotbx/mtz

Modified Files:
	tst_ext.py 
Log Message:
print "Skipping ...: input file not available"

Index: tst_ext.py
===================================================================
RCS file: /cvsroot/cctbx/iotbx/include/iotbx/mtz/tst_ext.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tst_ext.py	19 Nov 2004 21:19:31 -0000	1.4
--- tst_ext.py	22 Jan 2005 14:18:25 -0000	1.5
***************
*** 43,47 ****
    file_name = os.path.expandvars(
      "$LIBTBX_DIST_ROOT/regression/reflection_files/dano.mtz")
!   if (os.path.isfile(file_name)):
      mtz_object = mtz.object(file_name=file_name)
      assert mtz_object.title() == "......"
--- 43,49 ----
    file_name = os.path.expandvars(
      "$LIBTBX_DIST_ROOT/regression/reflection_files/dano.mtz")
!   if (not os.path.isfile(file_name)):
!     print "Skipping dano.mtz test: input file not available"
!   else:
      mtz_object = mtz.object(file_name=file_name)
      assert mtz_object.title() == "......"

Update of /cvsroot/cctbx/cctbx/include/cctbx/adp_restraints
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24714

Modified Files:
	tst_ext.py 
Log Message:
Skipping exercise_rigid_bond_test(): input file not available

Index: tst_ext.py
===================================================================
RCS file: /cvsroot/cctbx/cctbx/include/cctbx/adp_restraints/tst_ext.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tst_ext.py	5 Oct 2004 16:51:47 -0000	1.3
--- tst_ext.py	22 Jan 2005 13:35:01 -0000	1.4
***************
*** 70,73 ****
--- 70,76 ----
    """
    ins_file = os.path.expandvars('$LIBTBX_DIST_ROOT/regression/pdb/enk_11i.res')
+   if (not os.path.isfile(ins_file)):
+     print "Skipping exercise_rigid_bond_test(): input file not available"
+     return
    ins_xray_structure = from_ins.from_ins(file_name = ins_file)
    sites_frac = ins_xray_structure.sites_frac()

Update of /cvsroot/cctbx/libtbx/libtbx/bundle
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21977

Modified Files:
	install_csh.py 
Log Message:
work around a SCons bug

Index: install_csh.py
===================================================================
RCS file: /cvsroot/cctbx/libtbx/libtbx/bundle/install_csh.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** install_csh.py	25 Aug 2004 01:17:17 -0000	1.10
--- install_csh.py	22 Jan 2005 13:24:49 -0000	1.11
***************
*** 205,208 ****
--- 205,213 ----
    echo ""
    echo "Installing $bundle modules. This may take a while."
+   if (1) then # work around a SCons bug
+     libtbx.scons include/scitbx/array_family/versa_algebra.h
+     libtbx.scons cctbx/eltbx/henke.cpp
+     libtbx.scons cctbx/eltbx/sasaki.cpp
+   endif
    libtbx.scons -j "$n_cpu_s" .
  endif

Update of /cvsroot/cctbx/libtbx/libtbx/command_line
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18635

Modified Files:
	py_compile_all.py 
Log Message:
use os.getcwd() instead of "." to avoid scons crash

Index: py_compile_all.py
===================================================================
RCS file: /cvsroot/cctbx/libtbx/libtbx/command_line/py_compile_all.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** py_compile_all.py	22 Nov 2003 03:15:31 -0000	1.1
--- py_compile_all.py	22 Jan 2005 13:10:59 -0000	1.2
***************
*** 1,10 ****
  import compileall
  import cStringIO
! import sys
  
  def run():
    dirs = sys.argv[1:]
    if (len(dirs) == 0):
!     dirs = ["."]
    sys.stdout = cStringIO.StringIO()
    sys.stderr = cStringIO.StringIO()
--- 1,10 ----
  import compileall
  import cStringIO
! import sys, os
  
  def run():
    dirs = sys.argv[1:]
    if (len(dirs) == 0):
!     dirs = [os.getcwd()]
    sys.stdout = cStringIO.StringIO()
    sys.stderr = cStringIO.StringIO()

Update of /cvsroot/cctbx/cctbx/cctbx/geometry_restraints
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23783

Modified Files:
	__init__.py 
Log Message:
assertion replaced by more informative RuntimeError

Index: __init__.py
===================================================================
RCS file: /cvsroot/cctbx/cctbx/cctbx/geometry_restraints/__init__.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** __init__.py	7 Jan 2005 01:38:06 -0000	1.20
--- __init__.py	22 Jan 2005 01:26:52 -0000	1.21
***************
*** 482,486 ****
        assert len(shell_asu_tables) > 0
        unit_cell = shell_asu_tables[0].asu_mappings().unit_cell()
!       assert nonbonded_distance_cutoff_plus_buffer**2 <= unit_cell.shortest_vector_sq()
        self.nonbonded_proxies = nonbonded_sorted_asu_proxies(
          model_indices=model_indices,
--- 482,492 ----
        assert len(shell_asu_tables) > 0
        unit_cell = shell_asu_tables[0].asu_mappings().unit_cell()
!       if (  nonbonded_distance_cutoff_plus_buffer**2
!           > unit_cell.shortest_vector_sq()):
!         raise RuntimeError(
!           "Nonbonded distance cutoff + buffer"
!           " > shortest lattice translation vector: %.6g > %.6g" % (
!             nonbonded_distance_cutoff_plus_buffer,
!             unit_cell.shortest_vector_sq()**0.5))
        self.nonbonded_proxies = nonbonded_sorted_asu_proxies(
          model_indices=model_indices,

Update of /cvsroot/cctbx/cctbx/include/cctbx/geometry_restraints
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22047/include/cctbx/geometry_restraints

Modified Files:
	tst_ext.py 
Log Message:
make use of new flex.vec3_double.mean_weighted()

Index: tst_ext.py
===================================================================
RCS file: /cvsroot/cctbx/cctbx/include/cctbx/geometry_restraints/tst_ext.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** tst_ext.py	11 Dec 2004 01:07:00 -0000	1.17
--- tst_ext.py	21 Jan 2005 22:57:09 -0000	1.18
***************
*** 811,814 ****
--- 811,815 ----
      assert eps_eq(l.center_of_mass(),
        (-5.7061446613913009, 0.11105869285849694, -0.42071347654387559))
+     assert eps_eq(l.center_of_mass(), l.sites.mean_weighted(weights=l.weights))
      assert eps_eq(l.residual_tensor(),
        (10.250312599815825, 8.7000194514224525, 10.265208176541265,

Update of /cvsroot/cctbx/cctbx/cctbx/xray
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22047/cctbx/xray

Modified Files:
	structure.py 
Log Message:
make use of new flex.vec3_double.mean_weighted()

Index: structure.py
===================================================================
RCS file: /cvsroot/cctbx/cctbx/cctbx/xray/structure.py,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** structure.py	21 Jan 2005 08:59:08 -0000	1.44
--- structure.py	21 Jan 2005 22:57:08 -0000	1.45
***************
*** 365,377 ****
      if (atomic_weights is None):
        atomic_weights = self.atomic_weights()
!     sites_cart = self.sites_cart()
!     sum_w = 0
!     sum_wc = matrix.col((0,0,0))
!     for i,site_cart in enumerate(sites_cart):
!       w = atomic_weights[i]
!       sum_w += w
!       sum_wc += matrix.col(site_cart) * w
!     if (sum_w == 0): return sum_wc
!     return sum_wc / sum_w
  
    def n_parameters(self, gradient_flags):
--- 365,369 ----
      if (atomic_weights is None):
        atomic_weights = self.atomic_weights()
!     return self.sites_cart().mean_weighted(weights=atomic_weights)
  
    def n_parameters(self, gradient_flags):

Update of /cvsroot/cctbx/cctbx/cctbx/regression
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22047/cctbx/regression

Modified Files:
	tst_xray.py 
Log Message:
make use of new flex.vec3_double.mean_weighted()

Index: tst_xray.py
===================================================================
RCS file: /cvsroot/cctbx/cctbx/cctbx/regression/tst_xray.py,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** tst_xray.py	21 Jan 2005 08:59:07 -0000	1.49
--- tst_xray.py	21 Jan 2005 22:57:08 -0000	1.50
***************
*** 88,101 ****
    assert approx_equal(aw, (28.086, 15.999))
    center_of_mass = xs.center_of_mass(atomic_weights=aw)
!   assert approx_equal(center_of_mass.elems, (1.335228, 1.071897, 2.815899))
    center_of_mass = xs.center_of_mass()
!   assert approx_equal(center_of_mass.elems, (1.335228, 1.071897, 2.815899))
    ys = xs.apply_shift(
!     shift=xs.unit_cell().fractionalize((-center_of_mass).elems),
      recompute_site_symmetries=True)
!   assert approx_equal(ys.center_of_mass().elems, (0,0,0))
    ys = xray.structure(xs)
    assert ys.atomic_weights().size() == 0
!   assert ys.center_of_mass().elems == (0,0,0)
    ys = xray.structure(sp, scatterers)
    ys.scatterers()[1].occupancy = 0.5
--- 88,101 ----
    assert approx_equal(aw, (28.086, 15.999))
    center_of_mass = xs.center_of_mass(atomic_weights=aw)
!   assert approx_equal(center_of_mass, (1.335228, 1.071897, 2.815899))
    center_of_mass = xs.center_of_mass()
!   assert approx_equal(center_of_mass, (1.335228, 1.071897, 2.815899))
    ys = xs.apply_shift(
!     shift=xs.unit_cell().fractionalize([-e for e in center_of_mass]),
      recompute_site_symmetries=True)
!   assert approx_equal(ys.center_of_mass(), (0,0,0))
    ys = xray.structure(xs)
    assert ys.atomic_weights().size() == 0
!   assert ys.center_of_mass() == (0,0,0)
    ys = xray.structure(sp, scatterers)
    ys.scatterers()[1].occupancy = 0.5

Update of /cvsroot/cctbx/scitbx/include/scitbx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19696/include/scitbx

Modified Files:
	vec3.h 
Log Message:
flex.vec3_double: new mean(), mean_weighted()

Index: vec3.h
===================================================================
RCS file: /cvsroot/cctbx/scitbx/include/scitbx/vec3.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** vec3.h	22 Apr 2004 03:32:34 -0000	1.8
--- vec3.h	21 Jan 2005 22:46:49 -0000	1.9
***************
*** 24,27 ****
--- 24,31 ----
        //! Default constructor. Elements are not initialized.
        vec3() {}
+       //! All elements are initialized with e.
+       vec3(NumType const& e)
+         : base_type(e, e, e)
+       {}
        //! Constructor.
        vec3(NumType const& e0, NumType const& e1, NumType const& e2)
***************
*** 414,417 ****
--- 418,436 ----
    vec3<NumType>
    operator/(
+     vec3<NumType> const& lhs,
+     std::size_t const& rhs)
+   {
+     vec3<NumType> result;
+     for(std::size_t i=0;i<3;i++) {
+       result[i] = lhs[i] / rhs   ;
+     }
+     return result;
+   }
+ 
+   //! Element-wise division.
+   template <typename NumType>
+   inline
+   vec3<NumType>
+   operator/(
      NumType const& lhs,
      vec3<NumType> const& rhs)

Update of /cvsroot/cctbx/scitbx/array_family/boost_python
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19696/array_family/boost_python

Modified Files:
	flex_vec3_double.cpp tst_flex.py 
Log Message:
flex.vec3_double: new mean(), mean_weighted()

Index: flex_vec3_double.cpp
===================================================================
RCS file: /cvsroot/cctbx/scitbx/array_family/boost_python/flex_vec3_double.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** flex_vec3_double.cpp	13 Jul 2004 02:17:29 -0000	1.9
--- flex_vec3_double.cpp	21 Jan 2005 22:46:48 -0000	1.10
***************
*** 7,10 ****
--- 7,11 ----
  #include <scitbx/error.h>
  #include <boost/python/make_constructor.hpp>
+ #include <boost/python/args.hpp>
  
  namespace scitbx { namespace boost_python { namespace pickle_single_buffered {
***************
*** 117,132 ****
  
    vec3<double>
!   vec3_sum(flex<vec3<double> >::type const& a)
    {
!     SCITBX_ASSERT(!a.accessor().is_padded());
!     vec3<double> result(0,0,0);
!     af::const_ref<vec3<double>, af::flex_grid<> > a_ref = a.const_ref();
!     if (a_ref.size() > 0) {
!       result = a_ref[0];
!       for(std::size_t i=1;i<a_ref.size();i++) {
!         result += a_ref[i];
!       }
!     }
!     return result;
    }
  
--- 118,126 ----
  
    vec3<double>
!   mean_weighted_a_a(
!     af::const_ref<vec3<double> > const& self,
!     af::const_ref<double> const& weights)
    {
!     return af::mean_weighted(self, weights);
    }
  
***************
*** 238,256 ****
    void wrap_flex_vec3_double()
    {
!     flex_wrapper<vec3<double> >::plain("vec3_double")
        .def_pickle(flex_pickle_single_buffered<vec3<double>,
          3*pickle_size_per_element<double>::value>())
!       .def("__init__", boost::python::make_constructor(join))
!       .def("__init__", boost::python::make_constructor(from_double))
        .def("as_double", as_double)
        .def("min", vec3_min)
        .def("max", vec3_max)
!       .def("sum", vec3_sum)
!       .def("__add__", flex_wrapper<vec3<double> >::add_a_s)
!       .def("__add__", flex_wrapper<vec3<double> >::add_a_a)
!       .def("__iadd__", flex_wrapper<vec3<double> >::iadd_a_s)
!       .def("__sub__", flex_wrapper<vec3<double> >::sub_a_s)
!       .def("__sub__", flex_wrapper<vec3<double> >::sub_a_a)
!       .def("__isub__", flex_wrapper<vec3<double> >::isub_a_s)
        .def("__mul__", mul_a_scalar)
        .def("__rmul__", mul_a_scalar)
--- 232,254 ----
    void wrap_flex_vec3_double()
    {
!     using namespace boost::python;
!     typedef flex_wrapper<vec3<double> > f_w;
!     f_w::plain("vec3_double")
        .def_pickle(flex_pickle_single_buffered<vec3<double>,
          3*pickle_size_per_element<double>::value>())
!       .def("__init__", make_constructor(join))
!       .def("__init__", make_constructor(from_double))
        .def("as_double", as_double)
        .def("min", vec3_min)
        .def("max", vec3_max)
!       .def("sum", f_w::sum_a)
!       .def("mean", f_w::mean_a)
!       .def("mean_weighted", mean_weighted_a_a, (arg_("self"), arg_("weights")))
!       .def("__add__", f_w::add_a_s)
!       .def("__add__", f_w::add_a_a)
!       .def("__iadd__", f_w::iadd_a_s)
!       .def("__sub__", f_w::sub_a_s)
!       .def("__sub__", f_w::sub_a_a)
!       .def("__isub__", f_w::isub_a_s)
        .def("__mul__", mul_a_scalar)
        .def("__rmul__", mul_a_scalar)

Index: tst_flex.py
===================================================================
RCS file: /cvsroot/cctbx/scitbx/array_family/boost_python/tst_flex.py,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** tst_flex.py	18 Jan 2005 10:47:38 -0000	1.82
--- tst_flex.py	21 Jan 2005 22:46:48 -0000	1.83
***************
*** 712,715 ****
--- 712,720 ----
    assert approx_equal(a.max(), (3.0,4.0,5.0))
    assert approx_equal(a.sum(), (2.0,9.0,12.0))
+   assert approx_equal(a.mean(), (2.0/3,9.0/3,12.0/3))
+   weights = flex.double([1,1,1])
+   assert approx_equal(a.mean_weighted(weights=weights), (2.0/3,9.0/3,12.0/3))
+   weights = flex.double([2,3,5])
+   assert approx_equal(a.mean_weighted(weights=weights), (1.1,3.3,3.7))
    a += (10,20,30)
    assert approx_equal(tuple(a), ((11,22,35), (8,23,34), (13,24,33)))

Update of /cvsroot/cctbx/scitbx/array_family
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19696/array_family

Modified Files:
	tst_vec3.cpp 
Log Message:
flex.vec3_double: new mean(), mean_weighted()

Index: tst_vec3.cpp
===================================================================
RCS file: /cvsroot/cctbx/scitbx/array_family/tst_vec3.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tst_vec3.cpp	22 Apr 2004 03:32:07 -0000	1.7
--- tst_vec3.cpp	21 Jan 2005 22:46:48 -0000	1.8
***************
*** 15,18 ****
--- 15,19 ----
    {
      vec3<int> a;
+     vec3<double> i = 0;
      vec3<int> b(0,0,0);
      vec3<int> c(af::tiny_plain<int,3>(0,0,0));
***************
*** 52,55 ****
--- 53,57 ----
      check_true(__LINE__, 2 * a == d);
      check_true(__LINE__, d / 2 == a);
+     check_true(__LINE__, d / static_cast<std::size_t>(2) == a);
      check_true(__LINE__, 12 / d == vec3<int>(6,3,2));
      check_true(__LINE__, a % 2 == vec3<int>(1,0,1));

Update of /cvsroot/cctbx/libtbx/libtbx/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2714

Modified Files:
	FileClient.py FileSocket.py 
Log Message:
whrandom -> random

Index: FileSocket.py
===================================================================
RCS file: /cvsroot/cctbx/libtbx/libtbx/server/FileSocket.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FileSocket.py	15 Jan 2004 00:59:11 -0000	1.1
--- FileSocket.py	21 Jan 2005 19:38:56 -0000	1.2
***************
*** 1,4 ****
  import socket
! import whrandom
  import os, sys
  from string import *
--- 1,4 ----
  import socket
! import random
  import os, sys
  from string import *
***************
*** 12,16 ****
    i = 0
    while unbind:
!     portnumber = int(whrandom.random()*(upper_limit-lower_limit)+lower_limit)
      try:
        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
--- 12,16 ----
    i = 0
    while unbind:
!     portnumber = int(random.random()*(upper_limit-lower_limit)+lower_limit)
      try:
        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)

Index: FileClient.py
===================================================================
RCS file: /cvsroot/cctbx/libtbx/libtbx/server/FileClient.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FileClient.py	16 Jan 2004 23:20:21 -0000	1.4
--- FileClient.py	21 Jan 2005 19:38:55 -0000	1.5
***************
*** 177,181 ****
    import time
  
!   cmd = 'StartServer.py'
    python_path = sys.executable
  
--- 177,181 ----
    import time
  
!   cmd = os.path.expandvars('$LIBTBX_DIST/libtbx/server/StartServer.py')
    python_path = sys.executable