From 6abd580f95439baab5ca554adbbf22afec3376f3 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Fri, 13 Jan 2012 09:45:43 +0000 Subject: [PATCH] commented out stuff to make sure they are not included git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@98 951219d9-93cf-4727-9268-0efd64621fa3 --- .../gotthardDetector/gotthardDetector.cpp | 7 ++++--- .../gotthardDetector/gotthardDetector.h | 10 +++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/slsDetectorSoftware/gotthardDetector/gotthardDetector.cpp b/slsDetectorSoftware/gotthardDetector/gotthardDetector.cpp index 08cb2b0a2..6b6a98a62 100644 --- a/slsDetectorSoftware/gotthardDetector/gotthardDetector.cpp +++ b/slsDetectorSoftware/gotthardDetector/gotthardDetector.cpp @@ -16,7 +16,7 @@ eventually secondary portnumber (e.g. mythen stop function) number of modules installed if different from the detector size (x,y) */ - +/* int gotthardDetector::readConfigurationFile(string const fname){ string ans; @@ -123,6 +123,7 @@ int gotthardDetector::writeConfigurationFile(string const fname){ #endif return iv; }; +*/ /* It should be possible to dump all the settings of the detector (including trimbits, threshold energy, gating/triggering, acquisition time etc. in a file and retrieve it for repeating the measurement with identicals ettings, if necessary @@ -345,7 +346,7 @@ int gotthardDetector::retrieveDetectorSetup(string fname1, int level){ /* I/O */ - +/* sls_detector_module* gotthardDetector::readSettingsFile(string fname, sls_detector_module *myMod){ int nflag=0; @@ -459,7 +460,7 @@ int gotthardDetector::writeSettingsFile(string fname, int imod){ return writeSettingsFile(fname,detectorModules[imod]); }; - +*/ int gotthardDetector::writeDataFile(string fname, float *data, float *err, float *ang, char dataformat, int nch){ diff --git a/slsDetectorSoftware/gotthardDetector/gotthardDetector.h b/slsDetectorSoftware/gotthardDetector/gotthardDetector.h index 09ebe4454..b3dd01a0f 100644 --- a/slsDetectorSoftware/gotthardDetector/gotthardDetector.h +++ b/slsDetectorSoftware/gotthardDetector/gotthardDetector.h @@ -42,12 +42,12 @@ class gotthardDetector : public slsDetector{ reads configuration file fname calling executeLine \param fname file to be read */ - int readConfigurationFile(string const fname); + // int readConfigurationFile(string const fname); /** writes configuration file calling executeLine \param fname file to write to */ - int writeConfigurationFile(string const fname); + // int writeConfigurationFile(string const fname); /** dumps all the possible detector parameters calling executeLine \param fname file to write to @@ -67,7 +67,7 @@ class gotthardDetector : public slsDetector{ \returns the pointer to myMod or NULL if reading the file failed */ - sls_detector_module* readSettingsFile(string fname, sls_detector_module* myMod=NULL); + // sls_detector_module* readSettingsFile(string fname, sls_detector_module* myMod=NULL); /** writes a trim/settings file @@ -77,7 +77,7 @@ class gotthardDetector : public slsDetector{ \sa ::sls_detector_module */ - int writeSettingsFile(string fname, sls_detector_module mod); + //int writeSettingsFile(string fname, sls_detector_module mod); /** writes a trim/settings file for module number imod - the values will be read from the current detector structure @@ -86,7 +86,7 @@ class gotthardDetector : public slsDetector{ \returns OK or FAIL if the file could not be written \sa ::sls_detector_module sharedSlsDetector */ - int writeSettingsFile(string fname, int imod); + //int writeSettingsFile(string fname, int imod); /** writes a data file