diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index 9d2277c0d..013413cff 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -1506,6 +1506,7 @@ int multiSlsDetector::setSpeed(speedVariable index, int value){ // Flags int multiSlsDetector::setDynamicRange(int n, int pos){ + // cout << "multi " << endl; int imi, ima, i; int ret, ret1=-100; @@ -1518,6 +1519,8 @@ int multiSlsDetector::setDynamicRange(int n, int pos){ } for (i=imi; idataBytes-=detectors[i]->getDataBytes(); ret=detectors[i]->setDynamicRange(n); @@ -3088,12 +3091,6 @@ int multiSlsDetector::readConfigurationFile(string const fname){ } thisMultiDetector->numberOfDetectors=0; - - - - - - multiSlsDetectorClient *cmd; char ext[100]; diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index 55cf06071..6a6c8edc8 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -3707,6 +3707,7 @@ int64_t slsDetector::getTimeLeft(timerIndex index){ // Flags int slsDetector::setDynamicRange(int n){ + // cout << "single " << endl; int fnum=F_SET_DYNAMIC_RANGE; int retval=-1; char mess[100]; diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp index 04ddb8b1e..743a808ad 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp @@ -522,11 +522,12 @@ int slsDetectorUtils::retrieveDetectorSetup(string const fname1, int level){ ifstream infile; int iargval; int interrupt=0; - char *args[2]; + char *args[10]; - char myargs[2][1000]; - args[0]=myargs[0]; - args[1]=myargs[1]; + char myargs[10][1000]; + + //args[0]=myargs[0]; + //args[1]=myargs[1]; string sargname, sargval; int iline=0; @@ -565,6 +566,7 @@ int slsDetectorUtils::retrieveDetectorSetup(string const fname1, int level){ ssstr >> sargname; // if (ssstr.good()) { strcpy(myargs[iargval],sargname.c_str()); + args[iargval]=myargs[iargval]; #ifdef VERBOSE std::cout<< args[iargval] << std::endl; #endif @@ -604,7 +606,7 @@ int slsDetectorUtils::retrieveDetectorSetup(string const fname1, int level){ int slsDetectorUtils::dumpDetectorSetup(string const fname, int level){ - slsDetectorCommand *cmd=new slsDetectorCommand(this); + slsDetectorCommand *cmd; string names[]={ "fname",\ @@ -659,6 +661,11 @@ int slsDetectorUtils::dumpDetectorSetup(string const fname, int level){ for (int ia=0; ia<2; ia++) { args[ia]=new char[1000]; } + + + + + int nargs; if (level==2) nargs=2; @@ -677,6 +684,7 @@ int slsDetectorUtils::dumpDetectorSetup(string const fname, int level){ outfile.open(fname1.c_str(),ios_base::out); if (outfile.is_open()) { + cmd=new slsDetectorCommand(this); for (iv=0; ivexecuteLine(1,args,GET_ACTION) << std::endl; @@ -701,8 +709,8 @@ int slsDetectorUtils::dumpDetectorSetup(string const fname, int level){ - strcpy(args[0],names[iv].c_str()); if (level==2) { + strcpy(args[0],names[iv].c_str()); size_t c=fname.rfind('/'); if (cexecuteLine(nargs,args,GET_ACTION) << std::endl; iv++; + } + delete cmd; outfile.close(); } @@ -732,7 +741,6 @@ int slsDetectorUtils::dumpDetectorSetup(string const fname, int level){ std::cout<< "wrote " <