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

changed deprecated uint32 declaration to uint32_t

Browse Source
This commit is contained in:
Erik Frojdh 2022-01-24 09:01:44 +01:00
parent f95a15c841
commit 02174f79d1
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorCalibration/analogDetector.h
View File

@ -249,7 +249,7 @@ template <class dataType> class analogDetector {
\returns pointer to current gain map is file reading succeeded, NULL is file reading didn't work.
*/
double *readGainMap(const char * imgname) {
uint32 nnx, nny;
uint32_t nnx, nny;
float *gm=ReadFromTiff( imgname, nny, nnx);
if (gm) {
if (gmap) delete [] gmap;
@ -688,7 +688,7 @@ template <class dataType> class analogDetector {
\returns 0 if file reading didn't succed, otherwise 1
*/
int readPedestals(const char * imgname) {
uint32 nnx, nny;
uint32_t nnx, nny;
float *gm=ReadFromTiff( imgname, nny, nnx);
if (nnx>nx) nnx=nx;
if (nny>ny) nny=ny;
@ -713,7 +713,7 @@ template <class dataType> class analogDetector {
\returns 0 if file reading didn't succed, otherwise 1
*/
int readImage(const char * imgname) {
uint32 nnx, nny;
uint32_t nnx, nny;
float *gm=ReadFromTiff( imgname, nny, nnx);
if (nnx>nx) nnx=nx;
if (nny>ny) nny=ny;
@ -764,7 +764,7 @@ template <class dataType> class analogDetector {
*/
int readPedestalRMS(const char * imgname) {
uint32 nnx, nny;
uint32_t nnx, nny;
float *gm=ReadFromTiff( imgname, nny, nnx);
if (nnx>nx) nnx=nx;
if (nny>ny) nny=ny;

4
slsDetectorCalibration/interpolations/etaInterpolationBase.h
View File

@ -145,8 +145,8 @@ class etaInterpolationBase : public slsInterpolation {
etastepX=(etamax-etamin)/nbetaX;
etastepY=(etamax-etamin)/nbetaY;
uint32 nnx;
uint32 nny;
uint32_t nnx;
uint32_t nny;
float *gm=ReadFromTiff(imgname, nnx, nny);
/* if (nnx!=nny) { */
/* cout << "different number of bins in x " << nnx << " and y " << nny<< " !"<< endl; */

2
slsDetectorCalibration/jungfrauExecutables/jungfrauPhotonCounter.cpp
View File

@ -190,7 +190,7 @@ int main(int argc, char *argv[]) {
cout << "threshold is " << thr << endl;
cout << "Nframes is " << nframes << endl;
uint32 nnx, nny;
uint32_t nnx, nny;
double *gmap;
// if (gainfname) {

2
slsDetectorCalibration/moenchExecutables/moenchPhotonCounter.cpp
View File

@ -190,7 +190,7 @@ int main(int argc, char *argv[]) {
cout << "threshold is " << thr << endl;
cout << "Nframes is " << nframes << endl;
uint32 nnx, nny;
uint32_t nnx, nny;
double *gmap;
// if (gainfname) {

4
slsDetectorCalibration/multiThreadedAnalogDetector.h
View File

@ -587,8 +587,8 @@ public:
int nx, ny;
dets[0]->getDetectorSize(nx,ny);
uint32 nnx;
uint32 nny;
uint32_t nnx;
uint32_t nny;
float *gm=ReadFromTiff(imgname, nnx, nny);
if (ped) delete [] ped;
if (nnx>(uint)nx) nx=nnx;

10
slsDetectorCalibration/tiffIO.cpp
View File

@ -45,16 +45,16 @@ void *WriteToTiff(float * imgData, const char * imgname, int nrow, int ncol){
return NULL;
};
float *ReadFromTiff( const char * imgname, uint32 &nrow, uint32 &ncol){
float *ReadFromTiff( const char * imgname, uint32_t &nrow, uint32_t &ncol){
// unsigned char * buff=NULL;
TIFF * tif = TIFFOpen(imgname,"r");
if (tif){
uint32 bps;
uint32 sampleperpixel=1;
uint32_t bps;
uint32_t sampleperpixel=1;
//tsize_t linebytes;
uint32 imagelength;
uint32_t imagelength;
TIFFGetField(tif,TIFFTAG_IMAGEWIDTH,&ncol);
TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &nrow);
@ -65,7 +65,7 @@ float *ReadFromTiff( const char * imgname, uint32 &nrow, uint32 &ncol){
float * imgData=new float[ncol*nrow];
//linebytes = sampleperpixel*ncol;
// TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, TIFFDefaultStripSize(tif, ncol*sampleperpixel));
for(uint32 irow=0; irow<nrow; irow++){
for(uint32_t irow=0; irow<nrow; irow++){
//tiffreadscanline(tif, buf, row);
TIFFReadScanline(tif,&imgData[irow*ncol],irow);
}

2
slsDetectorCalibration/tiffIO.h
View File

@ -33,6 +33,6 @@
void *WriteToTiff(float * imgData, const char * imgname, int nrow, int ncol);
float *ReadFromTiff( const char * imgname, uint32 &nrow, uint32 &ncol);
float *ReadFromTiff( const char * imgname, uint32_t &nrow, uint32_t &ncol);
#endif