cleanup of conf files

cleanup of conf files, removal of unused options

etc/scdaq/scdaq.conf

@@ -6,7 +6,6 @@
 
 # Input settings, allowed values are:
 #   "wzdma"     for DMA driver from Wojciech M. Zabolotny
-#   "dma"       for XILINX DMA driver
 #   "filedma"   for reading from file and simulating DMA
 #   "micronDMA" for PICO driver
 #   "tcpip"     for TCP/IP input receving
@@ -30,9 +29,6 @@ packets_per_report:200000
 # number of orbits per packet, in decimal
 nOrbitsPerPacket:20
 
-# prescale factor, used for *calo* data only
-prescale_factor:1
-
 ## Extra settings for "filedma" input
 
 #input_file:/dev/shm/testdata.bin
@@ -41,7 +37,6 @@ input_file:testdata.bin
 ## Extra settings for "tcpip" input
 tcpDestPort:10000
 
-
 ################################################################################
 ##
 ## Stream processor settings
@@ -77,21 +72,6 @@ max_file_size:8589934592
 # Always write data to a file regardless of the run status, useful for debugging
 output_force_write:no
 
-
-################################################################################
-##
-## Elastics processor settings (obsolete)
-##
-################################################################################
-
-enable_elastic_processor:no
-
-port:8000
-elastic_url:http://something.somewhere
-pt_cut:7
-quality_cut:12
-
-
 ################################################################################
 ##
 ## SCDAQ Generic Settings
@@ -117,9 +97,6 @@ log_min_severity:TRACE
 # Pipeline settings
 threads:8
 
-# verbosity level, currently supports 0 and 1
-verbosity:0
-
 # N orbits to store to each file
 # Configured to store fixed number of orbits per file when nOrbitsPerFile > 1
 # Set to 0 to use fixed file size instead