replace all references to CorlDev and SPARTAN with LabelFusion

todo: the documentation in docs/pipeline.rst has not been updated yet

Author: patmarion

automation/leaderCreateJobs.py

@@ -11,9 +11,10 @@
 # Run this script from anywhere
 
 # ------------------------------
-path_to_spartan  = os.environ['SPARTAN_SOURCE_DIR']
-path_to_automation = path_to_spartan + "/src/CorlDev/automation" 
-path_to_data     = path_to_spartan + "/src/CorlDev/data"
+path_to_labelfusion  = os.environ['LABELFUSION_SOURCE_DIR']
+path_to_data     = os.path.join(path_to_labelfusion, 'data')
+path_to_automation = os.path.join(path_to_labelfusion, 'automation')
+
 
 config_file = path_to_automation + "/configuration.yaml"
 
@@ -96,4 +97,4 @@
 # os.system("touch " + progress_file_fullpath)              # mark as wip
 # os.system("cd " + path_to_job_folder + " && run_create_data")
 # os.system("cd " + path_to_job_folder + " && run_resize")
-# os.system("rm " + progress_file_fullpath)                 # delete wip
+# os.system("rm " + progress_file_fullpath)                 # delete wip

automation/scp_out.py

@@ -5,8 +5,9 @@
 source = sys.argv[1]
 destination_user = sys.argv[2]
 
-path_to_spartan = os.environ['SPARTAN_SOURCE_DIR']
-scp_config_file = path_to_spartan + "/src/CorlDev/automation/scp_config.yaml"
+path_to_labelfusion  = os.environ['LABELFUSION_SOURCE_DIR']
+scp_config_file = os.path.join(path_to_labelfusion, 'automation/scp_config.yaml')
+
 with open(scp_config_file, 'r') as stream:
     try:
         config = yaml.load(stream)
@@ -23,4 +24,4 @@
 
 print "sending to ", destination_user
 os.system("sshpass -p '" + pw + "' scp -r -P " + port + " " + source + " " + address+":"+destination)
-print "sent", source
+print "sent", source

automation/scripts/autoAlignmentTool.py

@@ -8,8 +8,8 @@
 # Run this script from anywhere
 
 # ------------------------------
-path_to_spartan  = os.environ['SPARTAN_SOURCE_DIR']
-path_to_data     = path_to_spartan + "/src/CorlDev/data"
+path_to_labelfusion  = os.environ['LABELFUSION_SOURCE_DIR']
+path_to_data     = os.path.join(path_to_labelfusion, 'data')
 
 # folders in /data to track
 folders = ["logs_test"]

automation/scripts/autoCreateDataAndResize.py

@@ -8,8 +8,8 @@
 # Run this script from anywhere
 
 # ------------------------------
-path_to_spartan  = os.environ['SPARTAN_SOURCE_DIR']
-path_to_data     = path_to_spartan + "/src/CorlDev/data"
+path_to_labelfusion  = os.environ['LABELFUSION_SOURCE_DIR']
+path_to_data     = os.path.join(path_to_labelfusion, 'data')
 
 # folders in /data to track
 folders = ["logs_test"]
@@ -58,4 +58,4 @@
         os.system("cd " + path_to_job_folder + " && run_create_data")
         os.system("cd " + path_to_job_folder + " && run_resize")
     except KeyboardInterrupt:
-        quit()
+        quit()

automation/scripts/autoNoTrimPrep.py

@@ -8,8 +8,8 @@
 # Run this script from anywhere
 
 # ------------------------------
-path_to_spartan  = os.environ['SPARTAN_SOURCE_DIR']
-path_to_data     = path_to_spartan + "/src/CorlDev/data"
+path_to_labelfusion  = os.environ['LABELFUSION_SOURCE_DIR']
+path_to_data     = os.path.join(path_to_labelfusion, 'data')
 
 # folders in /data to track
 folders = ["logs_test"]

automation/scripts/bin/auto_alignment_tool

@@ -2,6 +2,6 @@
 
 echo "Auto find what to run_alignment_tool on..."
 
-python $SPARTAN_SOURCE_DIR/src/CorlDev/automation/scripts/autoAlignmentTool.py
+python $LABELFUSION_SOURCE_DIR/automation/scripts/autoAlignmentTool.py
 
 echo "Done."

automation/scripts/bin/auto_create_data_and_resize

@@ -2,6 +2,6 @@
 
 echo "Auto run_create_data and run_resize..."
 
-python $SPARTAN_SOURCE_DIR/src/CorlDev/automation/scripts/autoCreateDataAndResize.py
+python $LABELFUSION_SOURCE_DIR/automation/scripts/autoCreateDataAndResize.py
 
-echo "Done."
+echo "Done."

automation/scripts/bin/auto_no_trim_prep

@@ -2,6 +2,6 @@
 
 echo "Auto run_no_trim and run_prep..."
 
-python $SPARTAN_SOURCE_DIR/src/CorlDev/automation/scripts/autoNoTrimPrep.py
+python $LABELFUSION_SOURCE_DIR/automation/scripts/autoNoTrimPrep.py
 
-echo "Done."
+echo "Done."

automation/scripts/bin/auto_start_data_collect

@@ -2,6 +2,6 @@
 
 echo "Auto start data collect..."
 
-python $SPARTAN_SOURCE_DIR/src/CorlDev/automation/scripts/autoStartDataCollect.py
+python $LABELFUSION_SOURCE_DIR/automation/scripts/autoStartDataCollect.py
 
-echo "Done."
+echo "Done."

docs/pipeline.rst

@@ -1,3 +1,13 @@
+==================
+Under Construction
+==================
+
+The documentation in this file has not been updated to reflect the new code layout.
+The LabelFusion source code was previously a subdirectory in the Spartan git repository,
+and the documentation in this file assumes the old layout.  Please do not attempt to
+use this documentation until it has been updated.
+
+
 ========
 Pipeline
 ========
@@ -46,7 +56,7 @@ Same as above but we will use the kuka arm to move the xtion around. Set :code:`
 In one terminal, open a viewer for the data::
 
 	cds && cd apps/iiwa
-	directorPython -m director.imageviewapp -c iiwaManip.cfg --channel OPENNI_FRAME --rgbd --pointcloud
+	directorPython -m director.imageviewapp --bot-config $LABELFUSION_SOURCE_DIR/config/bot_frames.cfg --channel OPENNI_FRAME --rgbd --pointcloud
 
 In another terminal, play the log with a GUI. (Replace :code:`mylog.lcmlog` with name of log)::
 
@@ -199,10 +209,10 @@ The :code:`--logFolder` option specifies which logFolder to use relative to Corl
 Visualizing RGBD Data
 ---------------------
 
-You can launch director with imageviewapp. You need to pass the :code:`-c` flag to director along with the config file::
+You can launch director with imageviewapp. You need to pass the :code:`--bot-config` flag to director along with the config file::
 	
 	cds && cd apps/iiwa
-	directorPython -m director.imageviewapp -c iiwaManip.cfg --channel OPENNI_FRAME --rgbd --pointcloud
+	directorPython -m director.imageviewapp --bot-config $LABELFUSION_SOURCE_DIR/config/bot_frames.cfg --channel OPENNI_FRAME --rgbd --pointcloud