mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-13 13:27:14 +02:00
Dhanya Thattil
@ -42,15 +42,18 @@ namespace strixelSingleChip {
|
||||
constexpr int g2_ncols{(nc_rawimg - (2 * gr) - 3) / 5}; // 47
|
||||
constexpr int g2_nrows{(nr_chip / 4) * 5}; // 320
|
||||
|
||||
//Group 3: 18.75um pitch, groups of 4, 2 columns of square pixels (double the size of the other groups)
|
||||
// Group 3: 18.75um pitch, groups of 4, 2 columns of square pixels (double the
|
||||
// size of the other groups)
|
||||
constexpr int g3_ncols{(nc_rawimg - (2 * gr) - 2) / 4}; // 59
|
||||
constexpr int g3_nrows{(((nr_chip / 4) * 2) - gr) * 4}; // 476
|
||||
|
||||
constexpr int nc_strixel = 2*gr + 1 + g1_ncols; //group 1 is the "longest" group in x and has one extra square pixel
|
||||
constexpr int nc_strixel =
|
||||
2 * gr + 1 + g1_ncols; // group 1 is the "longest" group in x and has one
|
||||
// extra square pixel
|
||||
constexpr int nr_strixel = 2 * gr + g1_nrows + g2_nrows + g3_nrows;
|
||||
|
||||
//chip and group boundaries in ASIC coordinates (pixels at both bounds are included in the group)
|
||||
//y does NOT take into account the shifts for M408!
|
||||
// chip and group boundaries in ASIC coordinates (pixels at both bounds are
|
||||
// included in the group) y does NOT take into account the shifts for M408!
|
||||
constexpr int c1g1_xstart = 256 + gr + 1; // 266
|
||||
constexpr int c1g2_xstart = 256 + gr + 3; // 268
|
||||
constexpr int c1g3_xstart = 256 + gr + 2; // 267
|
||||
@ -76,7 +79,7 @@ namespace strixelSingleChip {
|
||||
// y shift due to faulty bonding (relevant for M408)
|
||||
constexpr int bond_shift_y = 1; // CHANGE IF YOU CHANGE MODULE!
|
||||
|
||||
}
|
||||
} // namespace strixelSingleChip
|
||||
|
||||
typedef struct {
|
||||
uint64_t bunchNumber; /**< is the frame number */
|
||||
@ -84,7 +87,6 @@ typedef struct {
|
||||
|
||||
} jf_header; // Aldo's header
|
||||
|
||||
|
||||
using namespace strixelSingleChip;
|
||||
|
||||
class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
|
||||
@ -118,7 +120,8 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
|
||||
if (mchip == 1) {
|
||||
|
||||
chip_x0 = 256;
|
||||
chip_y0=bond_shift_y; //because of bump bonding issues(+1 row) on M408
|
||||
chip_y0 =
|
||||
bond_shift_y; // because of bump bonding issues(+1 row) on M408
|
||||
|
||||
switch (group) {
|
||||
default:
|
||||
@ -149,7 +152,9 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
|
||||
if (mchip == 6) {
|
||||
|
||||
chip_x0 = 512;
|
||||
chip_y0=256-bond_shift_y; //should be 256 but is 255 because of bump bonding issues (+1 row) on M408
|
||||
chip_y0 =
|
||||
256 - bond_shift_y; // should be 256 but is 255 because of bump
|
||||
// bonding issues (+1 row) on M408
|
||||
|
||||
switch (group) {
|
||||
default:
|
||||
@ -170,8 +175,8 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
|
||||
y0 = 128 + chip_y0;
|
||||
y1 = 191 + chip_y0;
|
||||
|
||||
|
||||
shifty = g1_nrows+g2_nrows+2*g3_nrows;;
|
||||
shifty = g1_nrows + g2_nrows + 2 * g3_nrows;
|
||||
;
|
||||
break;
|
||||
case 3:
|
||||
|
||||
@ -184,7 +189,6 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void remapGroup(const int group) {
|
||||
@ -200,7 +204,8 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
|
||||
|
||||
ix = int((ipx - x0) / multiplicator);
|
||||
for (int m = 0; m < multiplicator; m++) {
|
||||
if ( (ipx-x0)%multiplicator==m ) iy=(ipy-y0)*multiplicator +m + shifty;
|
||||
if ((ipx - x0) % multiplicator == m)
|
||||
iy = (ipy - y0) * multiplicator + m + shifty;
|
||||
}
|
||||
|
||||
// if (iy< 40) cout << iy << " " << ix <<endl;
|
||||
@ -208,32 +213,51 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
|
||||
groupmap[iy][ix] = group - 1;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void remapROI(uint16_t xmin, uint16_t xmax, uint16_t ymin, uint16_t ymax) {
|
||||
// determine group and chip selected by ROI
|
||||
int group;
|
||||
if ( ymax <= c1g1_yend+bond_shift_y ) { group = 1; mchip = 1; }
|
||||
else if ( ymax <= c1g2_yend+bond_shift_y ) { group = 2; mchip = 1; }
|
||||
else if ( ymax <= c1g3_yend+bond_shift_y ) { group = 3; mchip = 1; }
|
||||
else if ( ymax <= c6g3_yend-bond_shift_y ) { group = 3; mchip = 6; }
|
||||
else if ( ymax <= c6g2_yend-bond_shift_y ) { group = 2; mchip = 6; }
|
||||
else if ( ymax <= c6g1_yend-bond_shift_y ) { group = 1; mchip = 6; }
|
||||
if (ymax <= c1g1_yend + bond_shift_y) {
|
||||
group = 1;
|
||||
mchip = 1;
|
||||
} else if (ymax <= c1g2_yend + bond_shift_y) {
|
||||
group = 2;
|
||||
mchip = 1;
|
||||
} else if (ymax <= c1g3_yend + bond_shift_y) {
|
||||
group = 3;
|
||||
mchip = 1;
|
||||
} else if (ymax <= c6g3_yend - bond_shift_y) {
|
||||
group = 3;
|
||||
mchip = 6;
|
||||
} else if (ymax <= c6g2_yend - bond_shift_y) {
|
||||
group = 2;
|
||||
mchip = 6;
|
||||
} else if (ymax <= c6g1_yend - bond_shift_y) {
|
||||
group = 1;
|
||||
mchip = 6;
|
||||
}
|
||||
int multiplicator = getMultiplicator(group);
|
||||
setMappingShifts(group);
|
||||
|
||||
std::cout << "group: " << group << ", m: " << multiplicator << ", x0: " << x0 << ", x1: " << x1 << ", y0: " << y0 << ", y1: " << y1 << std::endl;
|
||||
std::cout << "group: " << group << ", m: " << multiplicator
|
||||
<< ", x0: " << x0 << ", x1: " << x1 << ", y0: " << y0
|
||||
<< ", y1: " << y1 << std::endl;
|
||||
|
||||
// get ROI raw image number of columns
|
||||
int nc_roi = xmax - xmin + 1;
|
||||
std::cout << "nc_roi = " << nc_roi << std::endl;
|
||||
|
||||
// make sure loop bounds are correct
|
||||
if (y0<ymin) std::cout << "Error ymin" << std::endl;
|
||||
if (y1>ymax) std::cout << "Error ymax - normal for G3 since ROI only 64 row" << std::endl;
|
||||
if (x0<xmin) std::cout << "Error xmin" << std::endl;
|
||||
if (x1>xmax) std::cout << "Error xmax" << std::endl;
|
||||
if (y0 < ymin)
|
||||
std::cout << "Error ymin" << std::endl;
|
||||
if (y1 > ymax)
|
||||
std::cout << "Error ymax - normal for G3 since ROI only 64 row"
|
||||
<< std::endl;
|
||||
if (x0 < xmin)
|
||||
std::cout << "Error xmin" << std::endl;
|
||||
if (x1 > xmax)
|
||||
std::cout << "Error xmax" << std::endl;
|
||||
|
||||
// remapping loop
|
||||
int ix, iy = 0;
|
||||
@ -242,45 +266,49 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
|
||||
|
||||
ix = int((ipx - x0 /*-xmin*/) / multiplicator);
|
||||
for (int m = 0; m < multiplicator; m++) {
|
||||
if ( (ipx-x0/*-xmin*/)%multiplicator==m ) iy=(ipy-y0/*-ymin*/)*multiplicator +m + shifty;
|
||||
if ((ipx - x0 /*-xmin*/) % multiplicator == m)
|
||||
iy = (ipy - y0 /*-ymin*/) * multiplicator + m + shifty;
|
||||
}
|
||||
|
||||
// if (iy< 40) cout << iy << " " << ix <<endl;
|
||||
dataMap[iy][ix] = sizeof(header) + (nc_roi * (ipy-ymin) + (ipx-xmin)) * 2;
|
||||
dataMap[iy][ix] =
|
||||
sizeof(header) + (nc_roi * (ipy - ymin) + (ipx - xmin)) * 2;
|
||||
groupmap[iy][ix] = group - 1;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public:
|
||||
|
||||
int groupmap[512 * 5][1024 / 3];
|
||||
|
||||
using header = sls::defs::sls_receiver_header;
|
||||
|
||||
|
||||
jungfrauLGADStrixelsData( uint16_t xmin=0, uint16_t xmax=0, uint16_t ymin=0, uint16_t ymax=0 )
|
||||
: slsDetectorData<uint16_t>( /*nc_strixel*/g1_ncols, /*nr_strixel*/ 2*g1_nrows+2*g2_nrows+2*g3_nrows,
|
||||
g1_ncols* (2*g1_nrows+2*g2_nrows+2*g3_nrows) * 2 + sizeof(header) ) {
|
||||
std::cout << "Jungfrau strixels 2X single chip with full module data " << std::endl;
|
||||
|
||||
|
||||
jungfrauLGADStrixelsData(uint16_t xmin = 0, uint16_t xmax = 0,
|
||||
uint16_t ymin = 0, uint16_t ymax = 0)
|
||||
: slsDetectorData<uint16_t>(
|
||||
/*nc_strixel*/ g1_ncols,
|
||||
/*nr_strixel*/ 2 * g1_nrows + 2 * g2_nrows + 2 * g3_nrows,
|
||||
g1_ncols * (2 * g1_nrows + 2 * g2_nrows + 2 * g3_nrows) * 2 +
|
||||
sizeof(header)) {
|
||||
std::cout << "Jungfrau strixels 2X single chip with full module data "
|
||||
<< std::endl;
|
||||
|
||||
// Fill all strixels with dummy values
|
||||
for (int ix = 0; ix != g1_ncols; ++ix) {
|
||||
for (int iy = 0; iy != 2*g1_nrows+2*g2_nrows+2*g3_nrows; ++iy) {
|
||||
for (int iy = 0; iy != 2 * g1_nrows + 2 * g2_nrows + 2 * g3_nrows;
|
||||
++iy) {
|
||||
dataMap[iy][ix] = sizeof(header);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
std::cout << "sizeofheader = " << sizeof(header) << std::endl;
|
||||
std::cout << "Jungfrau strixels 2X single chip with full module data " << std::endl;
|
||||
std::cout << "Jungfrau strixels 2X single chip with full module data "
|
||||
<< std::endl;
|
||||
|
||||
if (xmin < xmax && ymin < ymax) {
|
||||
|
||||
dataSize=(xmax-xmin+1)*(ymax-ymin+1)*2 + sizeof(header);
|
||||
dataSize =
|
||||
(xmax - xmin + 1) * (ymax - ymin + 1) * 2 + sizeof(header);
|
||||
std::cout << "datasize " << dataSize << std::endl;
|
||||
remapROI(xmin, xmax, ymin, ymax);
|
||||
|
||||
@ -323,7 +351,6 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
|
||||
|
||||
*/
|
||||
|
||||
|
||||
int getFrameNumber(char *buff) {
|
||||
#ifdef ALDO // VH
|
||||
return ((header *)buff)->bunchNumber; // VH
|
||||
@ -344,15 +371,14 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
|
||||
int getPacketNumber(char *buff) {
|
||||
#ifdef ALDO // VH
|
||||
// uint32_t fakePacketNumber = 1000;
|
||||
//return fakePacketNumber; //VH //TODO: Keep in mind in case of bugs! //This is definitely bad!
|
||||
// return fakePacketNumber; //VH //TODO: Keep in mind in case of bugs!
|
||||
// //This is definitely bad!
|
||||
return 1000;
|
||||
#else // VH
|
||||
return ((header *)buff)->detHeader.packetNumber;
|
||||
#endif // VH
|
||||
};
|
||||
|
||||
|
||||
|
||||
char *readNextFrame(std::ifstream &filebin) {
|
||||
int ff = -1, np = -1;
|
||||
return readNextFrame(filebin, ff, np);
|
||||
@ -396,12 +422,18 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
|
||||
};
|
||||
|
||||
/* Loops over a memory slot until a complete frame is found (i.e. all */
|
||||
/* packets 0 to nPackets, same frame number). purely virtual func \param */
|
||||
/* data pointer to the memory to be analyzed \param ndata reference to the */
|
||||
/* amount of data found for the frame, in case the frame is incomplete at */
|
||||
/* the end of the memory slot \param dsize size of the memory slot to be */
|
||||
/* analyzed \returns pointer to the beginning of the last good frame (might */
|
||||
/* be incomplete if ndata smaller than dataSize), or NULL if no frame is */
|
||||
/* packets 0 to nPackets, same frame number). purely virtual func \param
|
||||
*/
|
||||
/* data pointer to the memory to be analyzed \param ndata reference to
|
||||
* the */
|
||||
/* amount of data found for the frame, in case the frame is incomplete at
|
||||
*/
|
||||
/* the end of the memory slot \param dsize size of the memory slot to be
|
||||
*/
|
||||
/* analyzed \returns pointer to the beginning of the last good frame
|
||||
* (might */
|
||||
/* be incomplete if ndata smaller than dataSize), or NULL if no frame is
|
||||
*/
|
||||
/* found */
|
||||
|
||||
/* *\/ */
|
||||
|
||||
@ -10,7 +10,8 @@
|
||||
|
||||
#define RAWDATA
|
||||
|
||||
#if !defined JFSTRX && !defined JFSTRXOLD && !defined JFSTRXCHIP1 && !defined JFSTRXCHIP6
|
||||
#if !defined JFSTRX && !defined JFSTRXOLD && !defined JFSTRXCHIP1 && \
|
||||
!defined JFSTRXCHIP6
|
||||
#ifndef MODULE
|
||||
#include "jungfrauHighZSingleChipData.h"
|
||||
#endif
|
||||
@ -43,14 +44,18 @@
|
||||
int main(int argc, char *argv[]) {
|
||||
|
||||
if (argc < 5) {
|
||||
std::cout << "Usage is " << argv[0]
|
||||
<< "indir outdir fname(with formatting, no extension) fextension [runmin] [runmax] [pedfile (raw or tiff)] [threshold] "
|
||||
std::cout
|
||||
<< "Usage is " << argv[0]
|
||||
<< "indir outdir fname(with formatting, no extension) fextension "
|
||||
"[runmin] [runmax] [pedfile (raw or tiff)] [threshold] "
|
||||
"[nframes] [xmin xmax ymin ymax] [gainmap]"
|
||||
<< std::endl;
|
||||
std::cout << "threshold <0 means analog; threshold=0 means cluster finder; "
|
||||
std::cout
|
||||
<< "threshold <0 means analog; threshold=0 means cluster finder; "
|
||||
"threshold>0 means photon counting"
|
||||
<< std::endl;
|
||||
std::cout << "nframes <0 means sum everything; nframes=0 means one file per "
|
||||
std::cout
|
||||
<< "nframes <0 means sum everything; nframes=0 means one file per "
|
||||
"run; nframes>0 means one file every nframes"
|
||||
<< std::endl;
|
||||
return 1;
|
||||
@ -110,9 +115,9 @@ int main(int argc, char *argv[]) {
|
||||
char imgfname[10000];
|
||||
char cfname[10000];
|
||||
|
||||
|
||||
// Define decoders...
|
||||
#if !defined JFSTRX && !defined JFSTRXOLD && !defined JFSTRXCHIP1 && !defined JFSTRXCHIP6
|
||||
#if !defined JFSTRX && !defined JFSTRXOLD && !defined JFSTRXCHIP1 && \
|
||||
!defined JFSTRXCHIP6
|
||||
#ifndef MODULE
|
||||
jungfrauHighZSingleChipData *decoder = new jungfrauHighZSingleChipData();
|
||||
int nx = 256, ny = 256;
|
||||
@ -143,14 +148,16 @@ int main(int argc, char *argv[]) {
|
||||
receiverRoi_compact croi;
|
||||
sprintf(ffname, "%s/%s.%s", indir, fformat, fext);
|
||||
sprintf(fname, (const char *)ffname, runmin);
|
||||
std::cout << "Reading header of file " << fname << " to check for ROI " << std::endl;
|
||||
std::cout << "Reading header of file " << fname << " to check for ROI "
|
||||
<< std::endl;
|
||||
filebin.open((const char *)(fname), ios::in | ios::binary);
|
||||
if (filebin.is_open()) {
|
||||
header hbuffer;
|
||||
std::cout << "sizeof(header) = " << sizeof(header) << std::endl;
|
||||
if (filebin.read((char *)&hbuffer, sizeof(header))) {
|
||||
memcpy(&croi, &hbuffer.detHeader.detSpec1, 8);
|
||||
std::cout << "Read ROI [" << croi.xmin << ", " << croi.xmax << ", " << croi.ymin << ", " << croi.ymax << "]" << std::endl;
|
||||
std::cout << "Read ROI [" << croi.xmin << ", " << croi.xmax << ", "
|
||||
<< croi.ymin << ", " << croi.ymax << "]" << std::endl;
|
||||
xxmin = croi.xmin;
|
||||
xxmax = croi.xmax;
|
||||
yymin = croi.ymin;
|
||||
@ -162,30 +169,32 @@ int main(int argc, char *argv[]) {
|
||||
std::cout << "Could not open " << fname << " for reading " << std::endl;
|
||||
#endif
|
||||
|
||||
jungfrauLGADStrixelsData *decoder = new jungfrauLGADStrixelsData( xxmin, xxmax, yymin, yymax );
|
||||
jungfrauLGADStrixelsData *decoder =
|
||||
new jungfrauLGADStrixelsData(xxmin, xxmax, yymin, yymax);
|
||||
int nx = 1024 / 3, ny = 512 * 5;
|
||||
#endif
|
||||
#ifdef JFSTRXCHIP1
|
||||
std::cout << "Jungfrau strixel LGAD single chip 1" << std::endl;
|
||||
jungfrauLGADStrixelsDataSingleChip *decoder = new jungfrauLGADStrixelsDataSingleChip(1);
|
||||
jungfrauLGADStrixelsDataSingleChip *decoder =
|
||||
new jungfrauLGADStrixelsDataSingleChip(1);
|
||||
int nx = 256 / 3, ny = 256 * 5;
|
||||
#endif
|
||||
#ifdef JFSTRXCHIP6
|
||||
std::cout << "Jungfrau strixel LGAD single chip 6" << std::endl;
|
||||
jungfrauLGADStrixelsDataSingleChip *decoder = new jungfrauLGADStrixelsDataSingleChip(6);
|
||||
jungfrauLGADStrixelsDataSingleChip *decoder =
|
||||
new jungfrauLGADStrixelsDataSingleChip(6);
|
||||
int nx = 256 / 3, ny = 256 * 5;
|
||||
#endif
|
||||
#ifdef JFSTRXOLD
|
||||
std::cout << "Jungfrau strixels old design" << std::endl;
|
||||
jungfrauStrixelsHalfModuleOldDesign *decoder = new jungfrauStrixelsHalfModuleOldDesign();
|
||||
jungfrauStrixelsHalfModuleOldDesign *decoder =
|
||||
new jungfrauStrixelsHalfModuleOldDesign();
|
||||
int nx = 1024 * 3, ny = 512 / 3;
|
||||
#endif
|
||||
|
||||
|
||||
decoder->getDetectorSize(nx, ny);
|
||||
std::cout << "Detector size is " << nx << " " << ny << std::endl;
|
||||
|
||||
|
||||
int xmin = 0, xmax = nx, ymin = 0, ymax = ny;
|
||||
if (argc >= 14) {
|
||||
xmin = atoi(argv[10]);
|
||||
@ -193,7 +202,8 @@ int main(int argc, char *argv[]) {
|
||||
ymin = atoi(argv[12]);
|
||||
ymax = atoi(argv[13]);
|
||||
}
|
||||
std::cout << xmin << " " << xmax << " " << ymin << " " << ymax << " " << std::endl;
|
||||
std::cout << xmin << " " << xmax << " " << ymin << " " << ymax << " "
|
||||
<< std::endl;
|
||||
|
||||
char *gainfname = NULL;
|
||||
if (argc > 14) {
|
||||
@ -218,8 +228,6 @@ int main(int argc, char *argv[]) {
|
||||
// std::cout << "HHHEEEEEEEEEEEEEEEEEEEEEEERE!!!!!" << std::endl;
|
||||
uint32_t nnx, nny;
|
||||
|
||||
|
||||
|
||||
singlePhotonDetector *filter = new singlePhotonDetector(
|
||||
decoder, 3, nsigma, 1, NULL, nped, 200, -1, -1, gainmap, NULL);
|
||||
|
||||
@ -311,14 +319,17 @@ int main(int argc, char *argv[]) {
|
||||
while (decoder->readNextFrame(filebin, ff, np, buff)) {
|
||||
// if (np == 40) {
|
||||
if ((ifr + 1) % 100 == 0) {
|
||||
std::cout << " ****" << decoder->getValue(buff,20,20);// << endl;
|
||||
std::cout
|
||||
<< " ****"
|
||||
<< decoder->getValue(buff, 20, 20); // << endl;
|
||||
}
|
||||
mt->pushData(buff);
|
||||
mt->nextThread();
|
||||
mt->popFree(buff);
|
||||
ifr++;
|
||||
if (ifr % 100 == 0) {
|
||||
std::cout << " ****" << ifr << " " << ff << " " << np << std::endl;
|
||||
std::cout << " ****" << ifr << " " << ff << " " << np
|
||||
<< std::endl;
|
||||
} // else
|
||||
// cout << ifr << " " << ff << " " << np << endl;
|
||||
if (ifr >= 1000)
|
||||
@ -346,7 +357,8 @@ int main(int argc, char *argv[]) {
|
||||
}
|
||||
delete[] pp;
|
||||
mt->setPedestal(ped);
|
||||
std::cout << "Pedestal set from tiff file " << pedfile << std::endl;
|
||||
std::cout << "Pedestal set from tiff file " << pedfile
|
||||
<< std::endl;
|
||||
} else {
|
||||
std::cout << "Could not open pedestal tiff file " << pedfile
|
||||
<< " for reading " << std::endl;
|
||||
@ -386,8 +398,8 @@ int main(int argc, char *argv[]) {
|
||||
mt->setFilePointer(of);
|
||||
std::cout << "file pointer set " << std::endl;
|
||||
} else {
|
||||
std::cout << "Could not open " << cfname << " for writing "
|
||||
<< std::endl;
|
||||
std::cout << "Could not open " << cfname
|
||||
<< " for writing " << std::endl;
|
||||
mt->setFilePointer(NULL);
|
||||
return 1;
|
||||
}
|
||||
@ -401,7 +413,8 @@ int main(int argc, char *argv[]) {
|
||||
// //push
|
||||
|
||||
if ((ifr + 1) % 100 == 0) {
|
||||
std::cout << " ****" << decoder->getValue(buff,20,20);// << endl;
|
||||
std::cout << " ****"
|
||||
<< decoder->getValue(buff, 20, 20); // << endl;
|
||||
}
|
||||
mt->pushData(buff);
|
||||
// // //pop
|
||||
@ -438,7 +451,8 @@ int main(int argc, char *argv[]) {
|
||||
sprintf(ffname, "%s/%s.tiff", outdir, fformat);
|
||||
sprintf(imgfname, (const char *)ffname, irun);
|
||||
}
|
||||
std::cout << "Writing tiff to " << imgfname << " " << thr1 << std::endl;
|
||||
std::cout << "Writing tiff to " << imgfname << " " << thr1
|
||||
<< std::endl;
|
||||
mt->writeImage(imgfname, thr1);
|
||||
mt->clearImage();
|
||||
if (of) {
|
||||
@ -450,7 +464,8 @@ int main(int argc, char *argv[]) {
|
||||
std::time(&end_time);
|
||||
std::cout << std::ctime(&end_time) << std::endl;
|
||||
} else
|
||||
std::cout << "Could not open " << fname << " for reading " << std::endl;
|
||||
std::cout << "Could not open " << fname << " for reading "
|
||||
<< std::endl;
|
||||
}
|
||||
if (nframes < 0) {
|
||||
sprintf(ffname, "%s/%s.tiff", outdir, fformat);
|
||||
|
||||
@ -622,11 +622,9 @@
|
||||
#define PATTERN_WAIT_TIMER_5_LSB_REG (0x91 << MEM_MAP_SHIFT)
|
||||
#define PATTERN_WAIT_TIMER_5_MSB_REG (0x92 << MEM_MAP_SHIFT)
|
||||
|
||||
|
||||
/* Slow ADC SPI Value RO register */
|
||||
#define ADC_SLOW_DATA_REG (0x93 << MEM_MAP_SHIFT)
|
||||
|
||||
|
||||
/* Slow ADC SPI Value Config register */
|
||||
#define ADC_SLOW_CFG_REG (0x94 << MEM_MAP_SHIFT)
|
||||
/** Read back CFG Register */
|
||||
@ -675,7 +673,8 @@
|
||||
#define ADC_SLOW_CFG_BW_MSK (0x00000001 << ADC_SLOW_CFG_REF_OFST)
|
||||
#define ADC_SLOW_CFG_BW_ONE_FOURTH_VAL \
|
||||
((0x0 << ADC_SLOW_CFG_BW_OFST) & ADC_SLOW_CFG_BW_MSK)
|
||||
#define ADC_SLOW_CFG_BW_FULL_VAL ((0x1 << ADC_SLOW_CFG_BW_OFST) & ADC_SLOW_CFG_BW_MSK)
|
||||
#define ADC_SLOW_CFG_BW_FULL_VAL \
|
||||
((0x1 << ADC_SLOW_CFG_BW_OFST) & ADC_SLOW_CFG_BW_MSK)
|
||||
|
||||
/** input channel selection IN0 - IN7 */
|
||||
#define ADC_SLOW_CFG_IN_OFST (9)
|
||||
@ -705,7 +704,6 @@
|
||||
#define ADC_SLOW_CFG_CFG_OVRWRTE_VAL \
|
||||
((0x1 << ADC_SLOW_CFG_CFG_OFST) & ADC_SLOW_CFG_CFG_MSK)
|
||||
|
||||
|
||||
/* Slow ADC SPI Value Control register */
|
||||
#define ADC_SLOW_CTRL_REG (0x95 << MEM_MAP_SHIFT)
|
||||
|
||||
|
||||
@ -1491,8 +1491,8 @@ int getSlowADC(int ichan) {
|
||||
ADC_SLOW_CFG_RB_MSK |
|
||||
// disable sequencer (different from config)
|
||||
ADC_SLOW_CFG_SEQ_DSBLE_VAL |
|
||||
// Internal reference. REF = 2.5V buffered output. Temperature sensor
|
||||
// enabled.
|
||||
// Internal reference. REF = 2.5V buffered output. Temperature
|
||||
// sensor enabled.
|
||||
ADC_SLOW_CFG_REF_INT_2500MV_VAL |
|
||||
// full bandwidth of low pass filter
|
||||
ADC_SLOW_CFG_BW_FULL_VAL |
|
||||
@ -1503,15 +1503,17 @@ int getSlowADC(int ichan) {
|
||||
// overwrite configuration
|
||||
ADC_SLOW_CFG_CFG_OVRWRTE_VAL);
|
||||
|
||||
|
||||
// start converting
|
||||
bus_w(ADC_SLOW_CTRL_REG, bus_r(ADC_SLOW_CTRL_REG) | ADC_SLOW_CTRL_STRT_MSK);
|
||||
bus_w(ADC_SLOW_CTRL_REG, bus_r(ADC_SLOW_CTRL_REG) & ~ADC_SLOW_CTRL_STRT_MSK);
|
||||
bus_w(ADC_SLOW_CTRL_REG,
|
||||
bus_r(ADC_SLOW_CTRL_REG) & ~ADC_SLOW_CTRL_STRT_MSK);
|
||||
|
||||
// wait for it to be done
|
||||
volatile int done = ((bus_r(ADC_SLOW_CTRL_REG) & ADC_SLOW_CTRL_DONE_MSK) >> ADC_SLOW_CTRL_DONE_OFST);
|
||||
volatile int done = ((bus_r(ADC_SLOW_CTRL_REG) & ADC_SLOW_CTRL_DONE_MSK) >>
|
||||
ADC_SLOW_CTRL_DONE_OFST);
|
||||
while (!done) {
|
||||
done = ((bus_r(ADC_SLOW_CTRL_REG) & ADC_SLOW_CTRL_DONE_MSK) >> ADC_SLOW_CTRL_DONE_OFST);
|
||||
done = ((bus_r(ADC_SLOW_CTRL_REG) & ADC_SLOW_CTRL_DONE_MSK) >>
|
||||
ADC_SLOW_CTRL_DONE_OFST);
|
||||
}
|
||||
|
||||
// readout
|
||||
@ -1522,8 +1524,11 @@ int getSlowADC(int ichan) {
|
||||
int regMinuv = 0;
|
||||
int maxSteps = 0xFFFF + 1;
|
||||
int retval = 0;
|
||||
if (ConvertToDifferentRange(0, maxSteps, regMinuv, refMaxuv, regval, &retval) == FAIL) {
|
||||
LOG(logERROR, ("Could not convert slow adc channel (regval:0x%x) to uv\n", regval));
|
||||
if (ConvertToDifferentRange(0, maxSteps, regMinuv, refMaxuv, regval,
|
||||
&retval) == FAIL) {
|
||||
LOG(logERROR,
|
||||
("Could not convert slow adc channel (regval:0x%x) to uv\n",
|
||||
regval));
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -1531,7 +1536,6 @@ int getSlowADC(int ichan) {
|
||||
("\tRead slow adc [%d]: %d uV (reg: 0x%x)\n", ichan, retval, regval));
|
||||
|
||||
return retval;
|
||||
|
||||
}
|
||||
|
||||
int getSlowADCTemperature() {
|
||||
@ -1543,8 +1547,8 @@ int getSlowADCTemperature() {
|
||||
ADC_SLOW_CFG_RB_MSK |
|
||||
// disable sequencer (different from config)
|
||||
ADC_SLOW_CFG_SEQ_DSBLE_VAL |
|
||||
// Internal reference. REF = 2.5V buffered output. Temperature sensor
|
||||
// enabled.
|
||||
// Internal reference. REF = 2.5V buffered output. Temperature
|
||||
// sensor enabled.
|
||||
ADC_SLOW_CFG_REF_INT_2500MV_VAL |
|
||||
// full bandwidth of low pass filter
|
||||
ADC_SLOW_CFG_BW_FULL_VAL |
|
||||
@ -1557,12 +1561,15 @@ int getSlowADCTemperature() {
|
||||
|
||||
// start converting
|
||||
bus_w(ADC_SLOW_CTRL_REG, bus_r(ADC_SLOW_CTRL_REG) | ADC_SLOW_CTRL_STRT_MSK);
|
||||
bus_w(ADC_SLOW_CTRL_REG, bus_r(ADC_SLOW_CTRL_REG) & ~ADC_SLOW_CTRL_STRT_MSK);
|
||||
bus_w(ADC_SLOW_CTRL_REG,
|
||||
bus_r(ADC_SLOW_CTRL_REG) & ~ADC_SLOW_CTRL_STRT_MSK);
|
||||
|
||||
// wait for it to be done
|
||||
volatile int done = ((bus_r(ADC_SLOW_CTRL_REG) & ADC_SLOW_CTRL_DONE_MSK) >> ADC_SLOW_CTRL_DONE_OFST);
|
||||
volatile int done = ((bus_r(ADC_SLOW_CTRL_REG) & ADC_SLOW_CTRL_DONE_MSK) >>
|
||||
ADC_SLOW_CTRL_DONE_OFST);
|
||||
while (!done) {
|
||||
done = ((bus_r(ADC_SLOW_CTRL_REG) & ADC_SLOW_CTRL_DONE_MSK) >> ADC_SLOW_CTRL_DONE_OFST);
|
||||
done = ((bus_r(ADC_SLOW_CTRL_REG) & ADC_SLOW_CTRL_DONE_MSK) >>
|
||||
ADC_SLOW_CTRL_DONE_OFST);
|
||||
}
|
||||
|
||||
// readout
|
||||
@ -1574,9 +1581,10 @@ int getSlowADCTemperature() {
|
||||
int maxSteps = 0xFFFF + 1;
|
||||
int minmv = 0;
|
||||
int maxmv = 2500;
|
||||
if (ConvertToDifferentRange(0, maxSteps, minmv,
|
||||
maxmv, regval, &retval) == FAIL) {
|
||||
LOG(logERROR, ("Could not convert slow adc temp (regval:0x%x) to uv\n", regval));
|
||||
if (ConvertToDifferentRange(0, maxSteps, minmv, maxmv, regval, &retval) ==
|
||||
FAIL) {
|
||||
LOG(logERROR,
|
||||
("Could not convert slow adc temp (regval:0x%x) to uv\n", regval));
|
||||
return -1;
|
||||
}
|
||||
LOG(logDEBUG1, ("voltage read for temp: %d mV\n", retval));
|
||||
|
||||
Reference in New Issue
Block a user