Removed the pixel mask. no_calib maps are now accurate, and things aren't hidden.
This commit is contained in:
@ -5,7 +5,6 @@
|
||||
|
||||
#include "../sls_detector_calibration/jungfrauFile.C"
|
||||
#include "../sls_detector_calibration/jungfrauPedestal.C"
|
||||
#include "../sls_detector_calibration/jungfrauPixelMask.C"
|
||||
|
||||
#include "TGraphErrors.h"
|
||||
#include "TF1.h"
|
||||
@ -35,44 +34,6 @@ int main(int argc, char* argv[]) {
|
||||
|
||||
jungfrauFile *thisfile = new jungfrauFile();
|
||||
|
||||
jungfrauPixelMask *pixelMaskObject = new jungfrauPixelMask();
|
||||
bool pixel_mask[NCH];
|
||||
pixelMaskObject->initialisePixelMask(pixel_mask);
|
||||
if (module_str == "006") {
|
||||
pixelMaskObject->maskChip(6, pixel_mask);
|
||||
pixelMaskObject->maskSupercolumn(4,1, pixel_mask);
|
||||
pixelMaskObject->maskSupercolumn(4,2, pixel_mask);
|
||||
} else if (module_str == "029") {
|
||||
pixelMaskObject->maskChip(2, pixel_mask);
|
||||
} else if (module_str == "035") {
|
||||
pixelMaskObject->maskSupercolumn(2, 2, pixel_mask);
|
||||
} else if (module_str == "039") {
|
||||
pixelMaskObject->maskChip(7, pixel_mask);
|
||||
} else if (module_str == "064") {
|
||||
pixelMaskObject->maskSupercolumn(3,4,pixel_mask);
|
||||
} else if (module_str == "065") {
|
||||
pixelMaskObject->maskChip(5,pixel_mask);
|
||||
} else if (module_str == "067") {
|
||||
pixelMaskObject->maskChip(1,pixel_mask);
|
||||
pixelMaskObject->maskChip(2,pixel_mask);
|
||||
pixelMaskObject->maskChip(3,pixel_mask);
|
||||
pixelMaskObject->maskChip(4,pixel_mask);
|
||||
} else if (module_str == "086") {
|
||||
pixelMaskObject->maskChip(8,pixel_mask);
|
||||
} else if (module_str == "094") {
|
||||
pixelMaskObject->maskChip(6,pixel_mask);
|
||||
} else if (module_str == "121") {
|
||||
pixelMaskObject->maskChip(1,pixel_mask);
|
||||
} else if (module_str == "124") {
|
||||
pixelMaskObject->maskChip(1,pixel_mask);
|
||||
} else if (module_str == "125") {
|
||||
pixelMaskObject->maskChip(7,pixel_mask);
|
||||
} else if (module_str == "223") {
|
||||
pixelMaskObject->maskChip(2,pixel_mask);
|
||||
} else if (module_str == "233") {
|
||||
pixelMaskObject->maskChip(7,pixel_mask);
|
||||
}
|
||||
|
||||
jungfrauPedestal *pedestalObjectG0 = new jungfrauPedestal();
|
||||
pedestalObjectG0->pedestalSetNFrames(100); // using 100 frames, rolling window
|
||||
jungfrauPedestal *pedestalObjectG1 = new jungfrauPedestal();
|
||||
@ -115,7 +76,6 @@ int main(int argc, char* argv[]) {
|
||||
g1_grader_hist = new TH1F("g1_grader_hist","",100,0,0.0001);
|
||||
}
|
||||
|
||||
TH2F* pixelmask_map = new TH2F("pixelmask_map","",NC,-0.5,NC-0.5,NR,-0.5,NR-0.5);
|
||||
TH2F* no_g0g1_calib_map = new TH2F("no_g0g1_calib_map","",NC,-0.5,NC-0.5,NR,-0.5,NR-0.5);
|
||||
|
||||
TH2F* g0_grad_map = new TH2F("g0_grad_map","",NC,-0.5,NC-0.5,NR,-0.5,NR-0.5);
|
||||
@ -216,7 +176,6 @@ int main(int argc, char* argv[]) {
|
||||
}
|
||||
|
||||
for (int i = 0; i < NCH; i++) {
|
||||
if (pixel_mask[i] == true) {
|
||||
|
||||
avg_adcG0_map[framecounter/100]->SetBinContent((i%NC)+1,(i/NC)+1,pedestalObjectG0->pedestalOfChannel(i));
|
||||
avg_adcG0er_map[framecounter/100]->SetBinContent((i%NC)+1,(i/NC)+1,pedestalObjectG0->semOfChannel(i));
|
||||
@ -225,7 +184,6 @@ int main(int argc, char* argv[]) {
|
||||
avg_adcG1er_map[framecounter/100]->SetBinContent((i%NC)+1,(i/NC)+1,pedestalObjectG1->semOfChannel(i));
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
pedestalObjectG0->pedestalClear();
|
||||
pedestalObjectG1->pedestalClear();
|
||||
@ -307,8 +265,6 @@ int main(int argc, char* argv[]) {
|
||||
|
||||
for (int i = 0; i < NCH; i++) {
|
||||
|
||||
if (pixel_mask[i] == true) {
|
||||
|
||||
vector<double> r0_adc;
|
||||
vector<double> r0_filter;
|
||||
vector<double> r0_adcerr;
|
||||
@ -692,7 +648,6 @@ int main(int argc, char* argv[]) {
|
||||
delete grap_g0;
|
||||
delete grap_g1;
|
||||
}
|
||||
}
|
||||
|
||||
mapcanvas->SetLeftMargin(0.1);
|
||||
mapcanvas->SetRightMargin(0.13);
|
||||
@ -940,18 +895,6 @@ int main(int argc, char* argv[]) {
|
||||
sprintf(savename,"plots/M%s/BackplanePulsing/g0overg1er_map_M%s.png", module_str.c_str(), module_str.c_str());
|
||||
mapcanvas->SaveAs((const char *)(savename));
|
||||
|
||||
for (int i = 0; i < NCH; i++) {
|
||||
if (pixel_mask[i] == false) {
|
||||
pixelmask_map->Fill(i%NC,i/NC,1);
|
||||
}
|
||||
}
|
||||
pixelmask_map->GetXaxis()->SetTitle("Column");
|
||||
pixelmask_map->GetYaxis()->SetTitle("Row");
|
||||
pixelmask_map->GetYaxis()->SetTitleOffset(0.7);
|
||||
pixelmask_map->Draw("colz");
|
||||
sprintf(savename,"plots/M%s/BackplanePulsing/pixelmask_map_M%s.png", module_str.c_str(), module_str.c_str());
|
||||
mapcanvas->SaveAs((const char *)(savename));
|
||||
|
||||
no_g0g1_calib_map->GetXaxis()->SetTitle("Column");
|
||||
no_g0g1_calib_map->GetYaxis()->SetTitle("Row");
|
||||
no_g0g1_calib_map->GetYaxis()->SetTitleOffset(0.7);
|
||||
|
Reference in New Issue
Block a user