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

adc invert for highz (#59)

Browse Source
This commit is contained in:
Dhanya Thattil 2019-08-29 10:12:10 +02:00 committed by GitHub
parent 1980a7d80c
commit 4f0634fe62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 84 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
slsDetectorGui/forms/form_tab_plot.ui
View File

@ -164,7 +164,7 @@
<item row="0" column="2">
<widget class="QStackedWidget" name="stackedWidget2D">
<property name="currentIndex">
<number>0</number>
<number>5</number>
</property>
<widget class="QWidget" name="pageInterpolate">
<layout class="QHBoxLayout" name="horizontalLayout_7">
@ -643,6 +643,27 @@ Displays minimum, maximum and sum of values for each plot.
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="chkADCInvert">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>&lt;nobr&gt;
Displays minimum, maximum and sum of values for each plot.
&lt;nobr&gt;</string>
</property>
<property name="text">
<string>ADC Invert</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_17">
<property name="orientation">

2
slsDetectorGui/include/qDrawPlot.h
View File

@ -55,6 +55,7 @@ class qDrawPlot : public QWidget, private Ui::PlotObject {
void ResetAccumulate();
void DisplayStatistics(bool enable);
void EnableGainPlot(bool enable);
void EnableADCInvert(bool enable);
void ClonePlot();
void SavePlot();
@ -147,6 +148,7 @@ class qDrawPlot : public QWidget, private Ui::PlotObject {
QString fileSaveName{"Image"};
bool hasGainData{false};
bool isGainDataExtracted{false};
bool isADCInvert{false};
bool disableZoom{false};
int progress{0};

66
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -416,6 +416,11 @@ void qDrawPlot::EnableGainPlot(bool enable) {
hasGainData = enable;
}
void qDrawPlot::EnableADCInvert(bool enable) {
FILE_LOG(logINFO) << (enable ? "Enabling" : "Disabling") << " ADC Invert";
isADCInvert = enable;
}
void qDrawPlot::SetSaveFileName(QString val) {
FILE_LOG(logDEBUG) << "Setting Clone/Save File Name to " << val.toAscii().constData();
fileSaveName = val;
@ -895,25 +900,62 @@ void qDrawPlot::toDoublePixelData(double *dest, char *source, int size, int data
// show gain plot
if (gaindest != NULL) {
for (ichan = 0; ichan < size; ++ichan) {
if ((*((u_int16_t *)source)) == 0xFFFF) {
gaindest[ichan] = 0xFFFF;
dest[ichan] = 0xFFFF;
} else {
gaindest[ichan] =
(((*((u_int16_t *)source)) & 0xC000) >> 14);
dest[ichan] = ((*((u_int16_t *)source)) & 0x3FFF);
// adcinvert
if (isADCInvert) {
for (ichan = 0; ichan < size; ++ichan) {
uint16_t temp = (*((u_int16_t *)source));
if (temp == 0xFFFF) {
gaindest[ichan] = 0xFFFF;
dest[ichan] = 0xFFFF;
} else {
gaindest[ichan] = ((temp & 0xC000) >> 14);
dest[ichan] = 0x4000 - (temp & 0x3FFF);
}
source += 2;
}
}
// normal
else {
for (ichan = 0; ichan < size; ++ichan) {
uint16_t temp = (*((u_int16_t *)source));
if (temp == 0xFFFF) {
gaindest[ichan] = 0xFFFF;
dest[ichan] = 0xFFFF;
} else {
gaindest[ichan] = ((temp & 0xC000) >> 14);
dest[ichan] = (temp & 0x3FFF);
}
source += 2;
}
source += 2;
}
}
// only data plot
else {
for (ichan = 0; ichan < size; ++ichan) {
dest[ichan] = ((*((u_int16_t *)source)) & 0x3FFF);
source += 2;
// adcinvert
if (isADCInvert) {
for (ichan = 0; ichan < size; ++ichan) {
uint16_t temp = (*((u_int16_t *)source));
if (temp == 0xFFFF) {
dest[ichan] = 0xFFFF;
} else {
dest[ichan] = 0x4000 - (temp & 0x3FFF);
}
source += 2;
}
}
// normal
else {
for (ichan = 0; ichan < size; ++ichan) {
uint16_t temp = (*((u_int16_t *)source));
if (temp == 0xFFFF) {
dest[ichan] = 0xFFFF;
} else {
dest[ichan] = (temp & 0x3FFF);
}
source += 2;
}
}
}
break;
}

6
slsDetectorGui/src/qTabPlot.cpp
View File

@ -67,6 +67,7 @@ void qTabPlot::SetupWidgetWindow() {
case slsDetectorDefs::JUNGFRAU:
case slsDetectorDefs::MOENCH:
chkGainPlot->setEnabled(true);
chkADCInvert->setEnabled(true);
break;
default:
break;
@ -129,6 +130,9 @@ void qTabPlot::Initialization() {
// gap pixels
if (chkGapPixels->isEnabled())
connect(chkGapPixels, SIGNAL(toggled(bool)), this, SLOT(SetGapPixels(bool)));
// adc invert
if (chkADCInvert->isEnabled())
connect(chkADCInvert, SIGNAL(toggled(bool)), plot, SLOT(EnableADCInvert(bool)));
// Save, clone
connect(btnSave, SIGNAL(clicked()), plot, SLOT(SavePlot()));
@ -576,6 +580,7 @@ void qTabPlot::Refresh() {
case slsDetectorDefs::JUNGFRAU:
case slsDetectorDefs::MOENCH:
chkGainPlot->setEnabled(true);
chkADCInvert->setEnabled(true);
break;
default:
break;
@ -585,6 +590,7 @@ void qTabPlot::Refresh() {
boxFrequency->setEnabled(false);
chkGainPlot->setEnabled(false);
chkGapPixels->setEnabled(false);
chkADCInvert->setEnabled(false);
}
FILE_LOG(logDEBUG) << "**Updated Plot Tab";