read/write of config/parameter file rewritten so that parameter file can take in slsdetector level commands

slsDetectorSoftware/slsDetector/slsDetector.h

@@ -852,20 +852,11 @@ public:
 	int updateDetector();
 
 	/**
-	 * Load configuration from a configuration File
-	 * calls readConfigurationFile and gives it the stream
-	 * @param fname configuration file name
-	 * @return OK or FAIL
+	 * should not be called at this level
+	 * @return FAIL
 	 */
 	int readConfigurationFile(std::string const fname);
 
-	/**
-	 * Load configuration from a stream
-	 * @param infile stream
-	 * @return OK or FAIL
-	 */
-	int readConfigurationFile(std::ifstream &infile);
-
 	/**
 	 * Write current configuration to a file
 	 * calls writeConfigurationFile giving it a stream to write to
@@ -882,6 +873,26 @@ public:
 	 */
 	int writeConfigurationFile(std::ofstream &outfile, int id=-1);
 
+  	/**
+	 * Loads the detector setup from file
+	 * @param fname file to read from
+	 * @param level if 2 reads also reads trimbits, angular 
+	 * conversion coefficients etc. from files with default 
+	 * extensions as generated by dumpDetectorSetup
+	 * @returns OK or FAIL
+	 */
+  	int retrieveDetectorSetup(std::string const fname, int level=0);
+
+	/** 
+	 * Saves the detector setup to file
+	 * @param fname file to write to
+	 * @param level if 2 reads also trimbits, flat field, angular
+	 * correction etc. and writes them to files with automatically
+	 * added extension
+	 * @returns OK or FAIL
+	 */
+  	int dumpDetectorSetup(std::string const fname, int level=0);  
+	  
 	/**
 	 * Returns the trimfile or settings file name (Useless??)
 	 * @returns the trimfile or settings file name