detectors/JFCalibration
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pixel mask as bool, and some repointing.

Browse Source
This commit is contained in:
redford_s
2018-05-07 16:18:27 +02:00
parent b50bd83c4c
commit 500ef26b36
9 changed files with 90 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
CS_BaselineTest.cpp
View File

@ -1,10 +1,10 @@
// file to check the integration time alone doesn't alter the baseline
#include "/afs/psi.ch/project/mythen/sophie/sls_detector_calibration/jungfrauCommonHeader.h"
#include "/afs/psi.ch/project/mythen/sophie/sls_detector_calibration/jungfrauCommonFunctions.h"
#include "../sls_detector_calibration/jungfrauCommonHeader.h"
#include "../sls_detector_calibration/jungfrauCommonFunctions.h"
#include "/afs/psi.ch/project/mythen/sophie/sls_detector_calibration/jungfrauFile.C"
#include "/afs/psi.ch/project/mythen/sophie/sls_detector_calibration/jungfrauPixelMask.C"
#include "../sls_detector_calibration/jungfrauFile.C"
#include "../sls_detector_calibration/jungfrauPixelMask.C"
#include "TGraph.h"
#include "TGraphErrors.h"
@ -30,7 +30,6 @@ int main(int argc, char* argv[]) {
cout << "arg 3: specify CS data file" << endl;
cout << "arg 4: specify Baseline G1 data file" << endl;
cout << "arg 5: specify Baseline G2 data file" << endl;
cout << "eg: ./JFMC_CurrentSourceScan 006 ..." << endl;
cout << " " << endl;
exit(1);
}
@ -44,7 +43,7 @@ int main(int argc, char* argv[]) {
jungfrauFile *thisfile = new jungfrauFile();
jungfrauPixelMask *pixelMaskObject = new jungfrauPixelMask();
static int pixel_mask [NCH];
bool pixel_mask [NCH];
char savename[128];
@ -163,7 +162,7 @@ int main(int argc, char* argv[]) {
for (int i = 0; i < NCH; i++) {
if ((j-1) < 10 || (j > 8075 && j < 8085)) {
if (pixel_mask[i] == 1) {
if (pixel_mask[i] == true) {
uint16_t adc = imagedptr[i]&0x3fff;
uint16_t gain = (imagedptr[i]&0xc000) >> 14;
adcmap_all->Fill(i%NC,i/NC,adc);
@ -174,7 +173,7 @@ int main(int argc, char* argv[]) {
if (((i/NC <= 255) && (i%64 == (j-1)%64)) ||
((i/NC >= 256) &&((-1*(i-524287))%64 == (j-1)%64))) {
if (pixel_mask[i] == 1) {
if (pixel_mask[i] == true) {
uint16_t adc = imagedptr[i]&0x3fff;
uint16_t gain = (imagedptr[i]&0xc000) >> 14;
@ -234,7 +233,7 @@ int main(int argc, char* argv[]) {
if (j%640 == 0) {
for (int i = 0; i < NCH; i++) {
if (pixel_mask[i] == 1) {
if (pixel_mask[i] == true) {
gainmap_avg->Fill(i%NC,i/NC,gain_histos[i]->GetMean());
adcmap_avg_g1[typeOfScan][j/640-1]->Fill(i%NC,i/NC,adc_histos_g1[i]->GetMean());
@ -420,7 +419,7 @@ int main(int argc, char* argv[]) {
}
for (int i = 0; i < NCH; i++) {
if (pixel_mask[i] == 1) {
if (pixel_mask[i] == true) {
// original CS
vector<double> r1_adc;