Merge pull request #2 from RADIO-PROJECT-EU/develop

Use the 10m laser scanner by default
roboskel · Mar 9, 2017 · 5ef1ef8 · 5ef1ef8
2 parents fd3f4ee + 6f73137
commit 5ef1ef8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/human_pattern_recognition/launch/hpr.launch b/human_pattern_recognition/launch/hpr.launch
@@ -3,20 +3,20 @@
 
 
 	<node pkg="laser_wall_extraction" type="wall_extraction.py" respawn="false" name="laser_wall_extraction" output="screen">
-		<rosparam file="$(find laser_wall_extraction)/config/parameters_URG-04LX-UG01.yaml" command="load" />
+		<rosparam file="$(find laser_wall_extraction)/config/parameters.yaml" command="load" />
 	</node>	
 
 
 	<node pkg="laser_overlap_trace" type="overlap_trace.py" respawn="false" name="laser_overlap_trace" output="screen">
-		<rosparam file="$(find laser_overlap_trace)/config/parameters_URG-04LX-UG01.yaml" command="load" />
+		<rosparam file="$(find laser_overlap_trace)/config/parameters.yaml" command="load" />
 	</node>
 
 	<node pkg="laser_clustering" type="clustering.py" respawn="false" name="laser_clustering" output="screen">
 		<rosparam file="$(find laser_clustering)/config/parameters.yaml" command="load" />
 	</node>
 
 	<node pkg="laser_analysis" type="analysis.py" respawn="false" name="laser_analysis" output="screen">
-		<rosparam file="$(find laser_analysis)/config/parameters_URG-04LX-UG01.yaml" command="load" />
+		<rosparam file="$(find laser_analysis)/config/parameters.yaml" command="load" />
 	</node>
 
 </launch>
diff --git a/laser_analysis/config/parameters_URG-04LX-UG01.yaml b/laser_analysis/config/parameters_URG-04LX-UG01.yaml
@@ -1,5 +1,5 @@
-#input_clusters_topic: "laser_clustering/clusters" #"laser_clustering/clusters" #"laser_overlap_trace/clusters"
-input_clusters_topic: "laser_overlap_trace/clusters"
+input_clusters_topic: "laser_clustering/clusters" #"laser_clustering/clusters" #"laser_overlap_trace/clusters"
+#input_clusters_topic: "laser_overlap_trace/clusters"
 results4meters_topic: "~results4meters"
 frame_id: "laser_link"
 #classifier_file: "SVM_classifier.p" #place the file inside the classification_files folder.
@@ -12,6 +12,6 @@ human_speed: 5
 distance: 4
 min_distance: 1
 timewindow: 20
-write_to_file: True
+write_to_file: False
 file: '/home/rosturtle/Desktop/URG04stats.csv'
 pca_file: "PCA_object.p"  #place the file inside the classification_files folder.