added maxNOR values to scanner XMLs according to scanner datasheets

3dgeo-heidelberg · Mar 26, 2021 · e6abaa6 · e6abaa6
1 parent 2b13598
commit e6abaa6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 29 deletions.
diff --git a/data/scanners_als.xml b/data/scanners_als.xml
@@ -22,6 +22,7 @@
 
 
 	<!-- ##### BEGIN Leica ALS50-II ##### -->
+	<!-- capable of detecting up to 4 targets for each pulse, vertical discrimination distance is approx. 3.5 m--> 
 	<scanner 	id 							= "leica_als50-ii"
 				accuracy_m					= "0.05"
 			 	beamDivergence_rad 			= "0.00022"
@@ -34,6 +35,7 @@
 				scanAngleMax_deg   			= "37.5"
 				scanFreqMin_Hz				= "0"
 				scanFreqMax_Hz				= "90"
+				maxNOR						= "4"
 	/>
 	<!-- ##### END Leica ALS50-II ##### -->
 
@@ -76,6 +78,7 @@
 				scanFreqMin_Hz				= "0"
 				scanFreqMax_Hz				= "70"
 				scanProduct					= "1000"
+				maxNOR						= "4"
 	/>
 	<!-- ##### END Optech ALTM 3100 ##### -->
 
@@ -92,8 +95,9 @@
 				scanAngleMax_deg   			= "30"
 				scanFreqMin_Hz				= "0"
 				scanFreqMax_Hz				= "120"
-				scanProduct					= "1400"
+				scanProduct					= "2000"
 				wavelength_nm				= "1064"
+				maxNOR						= "8"
 	/>
 	<!-- ##### END Optech Galaxy ##### -->
 
@@ -133,6 +137,9 @@
 
 
 	<!-- ##### BEGIN RIEGL VQ 780i ##### -->
+	<!-- Maximum number of returns per pulse dependent on pulse frequency;
+	150-250 kHz: 15; 350 kHz: 14, 500 kHz: 10, 700 kHz: 7, 1000 kHz: 5;
+	for simulations with high pulse frequencies, we recommend to create a copy of this scanner entry with the respective maxNOR value -->
 	<scanner    id                          = "riegl_vq_780i"
 	            accuracy_m					= "0.02"
 			 	beamDivergence_rad 			= "0.00025"
@@ -151,6 +158,9 @@
 
 
 	<!-- ##### BEGIN RIEGL VUX-1UAV ##### -->
+	<!-- Maximum number of returns per pulse dependent on pulse frequency;
+	50-100 kHz: 15; 200 kHz: 13, 300 kHz: 9, 380 kHz: 7, 550 kHz: 4;
+	for simulations with high pulse frequencies, we recommend to create a copy of this scanner entry with the respective maxNOR value -->
 	<scanner 	id 							= "riegl_vux-1uav"
 				accuracy_m					= "0.01"
 			 	beamDivergence_rad 			= "0.0005"
@@ -205,6 +215,7 @@
 	</scanner>
 	<!-- ##### END RIEGL LMS VQ-880-G II ##### -->
 
+
 	<!-- ##### LIVOX Mid-70 -->
 	<!-- beam divergence horizontal: 0.000523598, vertical: 0.004887 -->	
 	<scanner 	id 							= "livox_mid-70"

diff --git a/data/scanners_tls.xml b/data/scanners_tls.xml
@@ -31,34 +31,6 @@
 	</scanner>
 	<!-- ##### END RIEGL VZ-400 ##### -->
 
-	<!-- ##### BEGIN RIEGL VZ-400 with max NOR ##### -->	
-	<scanner 	id 							= "riegl_vz400maxNOR"
-				name              			= "RIEGL VZ-400 maxNOR"
-				accuracy_m					= "0.005"
-			 	beamDivergence_rad 			= "0.0003"
-				headRotatePerSecMax_deg		= "60"
-				maxNOR						= "3"
-
-				optics            			= "rotating"
-				pulseFreqs_Hz				= "100000,300000"
-				pulseLength_ns     			= "5"
-				rangeMin_m					= "1.5"
-				scanAngleMax_deg   			= "50"
-				scanAngleEffectiveMax_deg   = "50"
-				scanFreqMin_Hz				= "3"
-				scanFreqMax_Hz				= "120">
-
-		<FWFSettings beamSampleQuality="3"/>	
-		<beamOrigin x="0" y="0" z="0.2">
-			<rot axis="y" angle_deg="0" />
-			<rot axis="z" angle_deg="0" />
-			<rot axis="x" angle_deg="0" />
-		</beamOrigin>
-		<headRotateAxis x="0" y="0" z="1"/>
-
-	</scanner>
-	<!-- ##### END RIEGL VZ-400 with max NOR ##### -->
-
 
 	<!-- ##### BEGIN RIEGL VZ-1000 ##### -->
 	<scanner 	id 							= "riegl_vz1000"