Changeset ec4fb42 for fedd/fedd/experiment_control.py

Timestamp:

Nov 30, 2008 9:19:33 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-1.30, version-2.00, version-3.01, version-3.02

Children:

7454054

Parents:

f0dc2ca

Message:

Clean up some names that start with fedd_ that are ugly with the new package
structure. A couple other bugs cleaned up, too.

File:

• fedd/fedd/experiment_control.py (moved) (moved from fedd/fedd/fedd_experiment_control.py) (3 diffs)

fedd/fedd/experiment_control.py

@@ -21 +21 @@
 from fedd_services import *
 from fedd_internal_services import *
-from fedd_util import *
+from util import *
 from fedid import fedid, generate_fedid
 from remote_service import xmlrpc_handler, soap_handler, service_caller
@@ -34 +34 @@
 fl.addHandler(nullHandler())
 
-class fedd_experiment_control_local:
+class experiment_control_local:
     """
     Control of experiments that this system can directly access.
@@ -157 +157 @@
         Intialize the various attributes, most from the config object
         """
-        self.thread_with_rv = fedd_experiment_control_local.pooled_thread
-        self.thread_pool = fedd_experiment_control_local.thread_pool
+        self.thread_with_rv = experiment_control_local.pooled_thread
+        self.thread_pool = experiment_control_local.thread_pool
 
         self.cert_file = None