detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 23:10:02 +02:00
Code Issues Actions Packages Releases Activity

edited writesettings for gotthard to not include hv, ipaddress etc and edited loadsettings to allow .settings

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@258 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2012-09-18 15:12:08 +00:00
parent 658589d15e
commit 8ed87df48f
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -5103,10 +5103,13 @@ int slsDetector::loadSettingsFile(string fname, int imod) {
for (int im=mmin; im<mmax; im++) {
ostringstream ostfn;
ostfn << fname;
if (fname.find(".sn")==string::npos && fname.find(".trim")==string::npos) {
if (fname.find(".sn")==string::npos && fname.find(".trim")==string::npos && fname.find(".settings")==string::npos) {
ostfn << ".sn" << setfill('0') << setw(3) << hex << getId(MODULE_SERIAL_NUMBER, im);
fn=ostfn.str();
}
//settings is saved in myMod.reg for gotthard
if(thisDetector->myDetectorType==GOTTHARD)
myMod->reg=thisDetector->currentSettings;
myMod=readSettingsFile(fn, thisDetector->myDetectorType);
if (myMod) {
myMod->module=im;

BIN
slsDetectorSoftware/slsDetectorAnalysis/angularConversionStatic.o
View File

Binary file not shown.

4
slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp
View File

@ -271,10 +271,6 @@ int energyConversion::writeSettingsFile(string fname, detectorType myDetectorTyp
names[id++]="Vin";
names[id++]="Vref_comp";
names[id++]="Vib_test";
names[id++]="config";
names[id++]="HV";
names[id++]="macaddress";
names[id++]="ipaddress";
break;
default:
cout << "Unknown detector type - unknown format for settings file" << endl;