in progress commit for JF11 calibration. FW and SW updated to 5.1.0.rc

This commit is contained in:
mozzanica
2021-03-03 10:34:06 +01:00
parent 11a16975e9
commit d4fff9739a
34 changed files with 627 additions and 60 deletions

View File

@ -235,7 +235,18 @@ int main(int argc, char* argv[]) {
scan_v6.push_back("360");
scan_v6.push_back("373");
scan_v6.push_back("380");
scan_v6.push_back("304");
scan_v6.push_back("321");
scan_v6.push_back("346");
scan_v6.push_back("375");
scan_v6.push_back("381");
scan_v6.push_back("383");
scan_v6.push_back("310");
scan_v6.push_back("313");
scan_v6.push_back("314");
scan_v6.push_back("334");
scan_v6.push_back("337");
scan_v6.push_back("347");
jungfrauFile *thisfile = new jungfrauFile();
@ -526,9 +537,13 @@ int main(int argc, char* argv[]) {
adcmap_all->Fill(i%NC,i/NC,adc);
gainmap_all->Fill(i%NC,i/NC,gain);
}
#ifdef JF11
if (((i/NC <= 255) && (((i%64)) == 63-(j)%64)) ||
((i/NC >= 256) &&( ((-1*(i-524287))%64) == 63-(j)%64))) { //scanning on "+-i")
#else
if (((i/NC <= 255) && (i%64 == (j-1)%64)) ||
((i/NC >= 256) &&((-1*(i-524287))%64 == (j-1)%64))) {
#endif
uint16_t adc = imagedptr[i]&0x3fff;
uint16_t gain = (imagedptr[i]&0xc000) >> 14;
@ -1799,7 +1814,13 @@ int main(int argc, char* argv[]) {
g1overg2map->GetXaxis()->SetTitle("Column");
g1overg2map->GetYaxis()->SetTitle("Row");
g1overg2map->GetYaxis()->SetTitleOffset(0.7);
g1overg2map->GetZaxis()->SetRangeUser(12,13.2);
#ifdef JF11
g1overg2map->GetZaxis()->SetRangeUser(11,12.5);
#else
g1overg2map->GetZaxis()->SetRangeUser(12,13.2);
#endif
g1overg2map->Draw("colz");
pave->Clear();
pave->AddText("G1/G2");