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

Make a library for writing and reading tiff, added tests (#347)

Browse Source 
* removed Makefile for moench and integrated the build in CMake
* broke out tiff reading and writing to its own library
* moved tiff includes to include/sls
* moved tiffio source to src
* removed incorrectly used bps
* cleanup and tests for tiffio
* removed using namespace std from header
* some fixing for moench04
* Program for offline processing renamed

Co-authored-by: Anna Bergamaschi <anna.bergamaschi@psi.ch>
This commit is contained in:
Erik Fröjdh
2022-01-27 10:24:02 +01:00
committed by GitHub
parent 379d08dd03
commit f6e76145c1
32 changed files with 4948 additions and 2143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp
View File

@ -1,9 +1,9 @@
// SPDX-License-Identifier: LGPL-3.0-or-other
// Copyright (C) 2021 Contributors to the SLS Detector Package
//#define WRITE_QUAD
#define DEVELOPER
//#define DEVELOPER
#undef CORR
#undef MOENCH04
//#undef MOENCH04
#define C_GHOST 0.0004
@ -11,21 +11,21 @@
#include "sls/ZmqSocket.h"
#include "sls/sls_detector_defs.h"
#ifndef RECT
#ifndef MOENCH04
//#ifndef RECT
#include "moench03T1ZmqDataNew.h"
//#endif
//#ifdef RECT
//#include "moench03T1ZmqDataNewRect.h"
//#endif
#endif
#ifdef MOENCH04
#include "moench04CtbZmq10GbData.h"
#endif
#endif
#ifdef RECT
#include "moench03T1ZmqDataNewRect.h"
#endif
#include "moench03CommonMode.h"
#include "moench03GhostSummation.h"
#include "tiffIO.h"
#include "sls/tiffIO.h"
#include <fstream>
#include <iomanip>
#include <sstream>
@ -156,7 +156,7 @@ int main(int argc, char *argv[]) {
int send_something = 0;
int maxSize = npx * npy * 2; // 32*2*8192;//5000;//atoi(argv[3]);
int size = maxSize; // 32*2*5000;
int size = maxSize+sizeof(int); // 32*2*5000;
// int multisize=size;
// int dataSize=size;
@ -305,10 +305,10 @@ int main(int argc, char *argv[]) {
// header variables
uint64_t acqIndex = -1;
uint64_t frameIndex = -1;
#ifdef MOENCH_BRANCH
uint32_t subFrameIndex = -1;
int *flippedData = 0;
#endif
// #ifdef MOENCH_BRANCH
// uint32_t subFrameIndex = -1;
// int *flippedData = 0;
// #endif
uint64_t subframes = 0;
// uint64_t isubframe=0;