From 73950e60cbae6336eeb354b8cc6f017e1cb8f9fd Mon Sep 17 00:00:00 2001 From: Kodai Okawa Date: Mon, 28 Feb 2022 23:08:22 +0900 Subject: [PATCH 1/7] [update] clean variable --- include/TCordferBranch.hh | 84 -------------------------------- include/TCordferBranchManager.hh | 5 +- include/TCordferCalibBranch.hh | 37 +------------- include/TCordferMapBranch.hh | 55 ++------------------- include/TCordferRawBranch.hh | 42 +--------------- main.cpp | 6 +-- src/CMakeLists.txt | 1 - src/TCordferBranch.cpp | 25 ---------- src/TCordferBranchManager.cpp | 7 +-- src/TCordferCalibBranch.cpp | 6 --- src/TCordferMapBranch.cpp | 10 ---- src/TCordferRawBranch.cpp | 19 ++++---- 12 files changed, 24 insertions(+), 273 deletions(-) delete mode 100644 include/TCordferBranch.hh delete mode 100644 src/TCordferBranch.cpp diff --git a/include/TCordferBranch.hh b/include/TCordferBranch.hh deleted file mode 100644 index a858ae9..0000000 --- a/include/TCordferBranch.hh +++ /dev/null @@ -1,84 +0,0 @@ -#ifndef TCORDFERBRANCH_HH_ -#define TCORDFERBRANCH_HH_ - -#include -#include - -#include -#include - -using namespace std; - -class TCordferBranch -{ - private: - TString name; - - public: - TCordferBranch(){} - TCordferBranch(TString bname){ - name = bname; - } - TCordferBranch(TString bname, Int_t bsize){ - name = bname; - size = bsize; - } - TCordferBranch(TString bname, Int_t bsize, Int_t bnhit){ - name = bname; - size = bsize; - nhit = bnhit; - } - ~TCordferBranch(){} - - bool adc; - Int_t size; - Int_t nhit; - Int_t geo; - Int_t ch; - Int_t calib_dim; - Int_t count_hit; - Int_t *bra_val; - Int_t **mhtdc_val; - Double_t cbra_val; - Double_t cbra_tval[12]; - vector segment_id; - vector channel; - vector calib_param; - - //for MUX - bool mux_status1; - bool mux_status2; - bool mux_pos1; - bool mux_pos2; - Int_t mux_ch1; //0-15 - Int_t mux_ch2; //0-15 - Int_t geo_tmp1; - Int_t geo_tmp2; - Int_t ch_tmp1; - Int_t ch_tmp2; - Int_t val_tmp1; - Int_t val_tmp2; - - TString GetBranchName(){ return name; } - - void Setgeo(Int_t id){ geo = id; } - - void MemorySet(){ bra_val = new Int_t[size]; } - void TwoDimMemorySet(){ - mhtdc_val = new Int_t*[size]; - for(Int_t i=0; i seg, vector ch); - void CopyCalibInfo(Int_t dim, vector param); -}; - -#endif diff --git a/include/TCordferBranchManager.hh b/include/TCordferBranchManager.hh index ff55e93..12da949 100644 --- a/include/TCordferBranchManager.hh +++ b/include/TCordferBranchManager.hh @@ -12,7 +12,6 @@ #include "ChannelMap.hh" #include "CalibrationManager.hh" -#include "TCordferBranch.hh" #include "TCordferRawBranch.hh" #include "TCordferMapBranch.hh" #include "TCordferCalibBranch.hh" @@ -55,10 +54,10 @@ class TCordferBranchManager void Readyaml(TString yamlfile); void CreateRootFile(){ rootfile = new TFile(root_name.Data(), "recreate"); } - void CreateTree(); + void CreateRawTree(); void CreateMapTree(); void CreateCalibTree(); - void CreateBranch(); + void CreateRawBranch(); void CreateMapBranch(); void CreateCalibBranch(); void ReadMUXposCalib(TString filename); diff --git a/include/TCordferCalibBranch.hh b/include/TCordferCalibBranch.hh index 71a9428..ff62146 100644 --- a/include/TCordferCalibBranch.hh +++ b/include/TCordferCalibBranch.hh @@ -5,7 +5,6 @@ #include #include -#include using namespace std; @@ -19,30 +18,15 @@ class TCordferCalibBranch TCordferCalibBranch(TString bname){ name = bname; } - TCordferCalibBranch(TString bname, Int_t bsize){ - name = bname; - size = bsize; - } - TCordferCalibBranch(TString bname, Int_t bsize, Int_t bnhit){ - name = bname; - size = bsize; - nhit = bnhit; - } ~TCordferCalibBranch(){} bool adc; - Int_t size; - Int_t nhit; Int_t geo; Int_t ch; Int_t calib_dim; Int_t count_hit; - Int_t *bra_val; - Int_t **mhtdc_val; Double_t cbra_val; Double_t cbra_tval[12]; - vector segment_id; - vector channel; vector calib_param; //for MUX @@ -50,8 +34,8 @@ class TCordferCalibBranch bool mux_status2; bool mux_pos1; bool mux_pos2; - Int_t mux_ch1; //0-15 - Int_t mux_ch2; //0-15 + Int_t mux_ch1; + Int_t mux_ch2; Int_t geo_tmp1; Int_t geo_tmp2; Int_t ch_tmp1; @@ -61,23 +45,6 @@ class TCordferCalibBranch TString GetBranchName(){ return name; } - void Setgeo(Int_t id){ geo = id; } - - void MemorySet(){ bra_val = new Int_t[size]; } - void TwoDimMemorySet(){ - mhtdc_val = new Int_t*[size]; - for(Int_t i=0; i seg, vector ch); void CopyCalibInfo(Int_t dim, vector param); }; diff --git a/include/TCordferMapBranch.hh b/include/TCordferMapBranch.hh index a2cf4dc..33475b9 100644 --- a/include/TCordferMapBranch.hh +++ b/include/TCordferMapBranch.hh @@ -5,7 +5,6 @@ #include #include -#include using namespace std; @@ -16,69 +15,23 @@ class TCordferMapBranch public: TCordferMapBranch(){} - TCordferMapBranch(TString bname){ - name = bname; - } TCordferMapBranch(TString bname, Int_t bsize){ name = bname; size = bsize; } - TCordferMapBranch(TString bname, Int_t bsize, Int_t bnhit){ - name = bname; - size = bsize; - nhit = bnhit; - } ~TCordferMapBranch(){} bool adc; - Int_t size; - Int_t nhit; - Int_t geo; - Int_t ch; - Int_t calib_dim; - Int_t count_hit; - Int_t *bra_val; - Int_t **mhtdc_val; - Double_t cbra_val; - Double_t cbra_tval[12]; - vector segment_id; - vector channel; - vector calib_param; - - //for MUX - bool mux_status1; - bool mux_status2; - bool mux_pos1; - bool mux_pos2; - Int_t mux_ch1; //0-15 - Int_t mux_ch2; //0-15 - Int_t geo_tmp1; - Int_t geo_tmp2; - Int_t ch_tmp1; - Int_t ch_tmp2; - Int_t val_tmp1; - Int_t val_tmp2; + Int_t size; //use + Int_t *bra_val; //use + vector segment_id; //use + vector channel; //use TString GetBranchName(){ return name; } - void Setgeo(Int_t id){ geo = id; } - void MemorySet(){ bra_val = new Int_t[size]; } - void TwoDimMemorySet(){ - mhtdc_val = new Int_t*[size]; - for(Int_t i=0; i seg, vector ch); - void CopyCalibInfo(Int_t dim, vector param); }; #endif diff --git a/include/TCordferRawBranch.hh b/include/TCordferRawBranch.hh index 0ca2449..d92b879 100644 --- a/include/TCordferRawBranch.hh +++ b/include/TCordferRawBranch.hh @@ -5,7 +5,6 @@ #include #include -#include using namespace std; @@ -16,9 +15,6 @@ class TCordferRawBranch public: TCordferRawBranch(){} - TCordferRawBranch(TString bname){ - name = bname; - } TCordferRawBranch(TString bname, Int_t bsize){ name = bname; size = bsize; @@ -34,51 +30,17 @@ class TCordferRawBranch Int_t size; Int_t nhit; Int_t geo; - Int_t ch; - Int_t calib_dim; - Int_t count_hit; Int_t *bra_val; Int_t **mhtdc_val; - Double_t cbra_val; - Double_t cbra_tval[12]; - vector segment_id; - vector channel; - vector calib_param; - - //for MUX - bool mux_status1; - bool mux_status2; - bool mux_pos1; - bool mux_pos2; - Int_t mux_ch1; //0-15 - Int_t mux_ch2; //0-15 - Int_t geo_tmp1; - Int_t geo_tmp2; - Int_t ch_tmp1; - Int_t ch_tmp2; - Int_t val_tmp1; - Int_t val_tmp2; TString GetBranchName(){ return name; } void Setgeo(Int_t id){ geo = id; } void MemorySet(){ bra_val = new Int_t[size]; } - void TwoDimMemorySet(){ - mhtdc_val = new Int_t*[size]; - for(Int_t i=0; i seg, vector ch); - void CopyCalibInfo(Int_t dim, vector param); + void FreeTwoDimMemory(); }; #endif diff --git a/main.cpp b/main.cpp index 7ea2d45..e3442f0 100644 --- a/main.cpp +++ b/main.cpp @@ -15,7 +15,7 @@ using namespace std; Int_t main(Int_t argc, Char_t **argv) { //map tree is require to make calibration tree - bool rawdata = false; + bool rawdata = true; bool mapdata = true; bool calibration = true; @@ -37,12 +37,12 @@ Int_t main(Int_t argc, Char_t **argv) TCordferBranchManager *branch_manager = new TCordferBranchManager(filename[0], filename[1]); branch_manager->Readyaml(yamlfile); branch_manager->CreateRootFile(); - if(rawdata){ branch_manager->CreateTree(); } + if(rawdata){ branch_manager->CreateRawTree(); } if(mapdata){ branch_manager->CreateMapTree(); } if(calibration){ branch_manager->CreateCalibTree(); } //prepare branch - if(rawdata){ branch_manager->CreateBranch(); } + if(rawdata){ branch_manager->CreateRawBranch(); } if(mapdata){ branch_manager->CreateMapBranch(); } if(calibration){ branch_manager->CreateCalibBranch(); } diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 89eaaa9..7001113 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,7 +2,6 @@ add_library(sources SHARED CommandlineReader.cpp ChannelMap.cpp CalibrationManager.cpp - TCordferBranch.cpp TCordferRawBranch.cpp TCordferMapBranch.cpp TCordferCalibBranch.cpp diff --git a/src/TCordferBranch.cpp b/src/TCordferBranch.cpp deleted file mode 100644 index bcc602c..0000000 --- a/src/TCordferBranch.cpp +++ /dev/null @@ -1,25 +0,0 @@ -#include -#include - -#include -#include - -#include - -using namespace std; - - -void TCordferBranch::CopyMapInfo(vector seg, vector ch){ - copy(seg.begin(), seg.end(), back_inserter(segment_id)); - copy(ch.begin(), ch.end(), back_inserter(channel)); -} - -void TCordferBranch::CopyCalibInfo(Int_t dim, vector param){ - calib_dim = dim; - copy(param.begin(), param.end(), back_inserter(calib_param)); - if(calib_dim != calib_param.size()-1){ - cerr << "ERROR: calibration dimention is wrong" << endl; - exit(0); - } -} - diff --git a/src/TCordferBranchManager.cpp b/src/TCordferBranchManager.cpp index a720a31..6ab1c6c 100644 --- a/src/TCordferBranchManager.cpp +++ b/src/TCordferBranchManager.cpp @@ -30,7 +30,7 @@ void TCordferBranchManager::Readyaml(TString yamlfile){ } -void TCordferBranchManager::CreateTree(){ +void TCordferBranchManager::CreateRawTree(){ TString rawname = recipe["raw_tree"]["name"].as(); TString rawdesc = recipe["raw_tree"]["description"].as(); @@ -54,7 +54,7 @@ void TCordferBranchManager::CreateCalibTree(){ } -void TCordferBranchManager::CreateBranch(){ +void TCordferBranchManager::CreateRawBranch(){ YAML::Node setup = recipe["setup"].as(); for(Int_t i=0; i(); @@ -152,9 +152,6 @@ void TCordferBranchManager::CreateCalibBranch(){ CalibrationManager *cfile = new CalibrationManager(det_name, cname[j]); for(Int_t k=0; kbranch_name.size(); k++){ TString bname = cfile->branch_name[k]; - //////////////// - //cout << bname << endl; - //////////////// TCordferCalibBranch *calib_branch = new TCordferCalibBranch(bname); calib_branch->CopyCalibInfo(cfile->dim, cfile->parameters[k]); diff --git a/src/TCordferCalibBranch.cpp b/src/TCordferCalibBranch.cpp index 383dcbf..649b641 100644 --- a/src/TCordferCalibBranch.cpp +++ b/src/TCordferCalibBranch.cpp @@ -2,18 +2,12 @@ #include #include -#include #include "TCordferCalibBranch.hh" using namespace std; -void TCordferCalibBranch::CopyMapInfo(vector seg, vector ch){ - copy(seg.begin(), seg.end(), back_inserter(segment_id)); - copy(ch.begin(), ch.end(), back_inserter(channel)); -} - void TCordferCalibBranch::CopyCalibInfo(Int_t dim, vector param){ calib_dim = dim; copy(param.begin(), param.end(), back_inserter(calib_param)); diff --git a/src/TCordferMapBranch.cpp b/src/TCordferMapBranch.cpp index a2b8af2..1e8772a 100644 --- a/src/TCordferMapBranch.cpp +++ b/src/TCordferMapBranch.cpp @@ -2,7 +2,6 @@ #include #include -#include #include "TCordferMapBranch.hh" @@ -14,12 +13,3 @@ void TCordferMapBranch::CopyMapInfo(vector seg, vector ch){ copy(ch.begin(), ch.end(), back_inserter(channel)); } -void TCordferMapBranch::CopyCalibInfo(Int_t dim, vector param){ - calib_dim = dim; - copy(param.begin(), param.end(), back_inserter(calib_param)); - if(calib_dim != calib_param.size()-1){ - cerr << "ERROR: calibration dimention is wrong" << endl; - exit(0); - } -} - diff --git a/src/TCordferRawBranch.cpp b/src/TCordferRawBranch.cpp index 412a77c..3547555 100644 --- a/src/TCordferRawBranch.cpp +++ b/src/TCordferRawBranch.cpp @@ -2,24 +2,23 @@ #include #include -#include #include "TCordferRawBranch.hh" using namespace std; -void TCordferRawBranch::CopyMapInfo(vector seg, vector ch){ - copy(seg.begin(), seg.end(), back_inserter(segment_id)); - copy(ch.begin(), ch.end(), back_inserter(channel)); +void TCordferRawBranch::TwoDimMemorySet(){ + mhtdc_val = new Int_t*[size]; + for(Int_t i=0; i param){ - calib_dim = dim; - copy(param.begin(), param.end(), back_inserter(calib_param)); - if(calib_dim != calib_param.size()-1){ - cerr << "ERROR: calibration dimention is wrong" << endl; - exit(0); +void TCordferRawBranch::FreeTwoDimMemory(){ + for(Int_t i=0; i Date: Tue, 1 Mar 2022 01:27:36 +0900 Subject: [PATCH 2/7] [update] mux calibration --- README.md | 2 + include/CalibrationManager.hh | 7 +-- include/TCordferBranchManager.hh | 1 - include/TCordferCalibBranch.hh | 4 ++ include/TCordferRawBranch.hh | 1 - src/CalibrationManager.cpp | 36 +++++++++++++ src/TCordferBranchManager.cpp | 86 ++++++++++++++++---------------- 7 files changed, 86 insertions(+), 51 deletions(-) diff --git a/README.md b/README.md index 1be2b91..8c2f027 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,8 @@ ANAROOT is automatically installed by "cmake" in the project directory in order * The format of +* Assume that calibration parameters of two energy output are the same + ## Usage ### Config file diff --git a/include/CalibrationManager.hh b/include/CalibrationManager.hh index ff31cbe..67bd35d 100644 --- a/include/CalibrationManager.hh +++ b/include/CalibrationManager.hh @@ -27,16 +27,13 @@ class CalibrationManager Int_t dim; vector< vector > parameters; //parameters[branches][dims] vector branch_name; + vector< vector > position_prms; //parameters[MUX_id][boundary=17] void SetDetectorId(); Double_t GetCalibrateValue(Int_t id, Int_t branch_id, Int_t ch); - Double_t GetdssdValue(); - Double_t GetssdValue(); - Double_t GetmssdValue(); - Double_t GetppacValue(); - Double_t GetcoinValue(); void ReadCalibration(); + void ReadMUXposCalib(TString pos_file_name); }; #endif diff --git a/include/TCordferBranchManager.hh b/include/TCordferBranchManager.hh index 12da949..57d5848 100644 --- a/include/TCordferBranchManager.hh +++ b/include/TCordferBranchManager.hh @@ -60,7 +60,6 @@ class TCordferBranchManager void CreateRawBranch(); void CreateMapBranch(); void CreateCalibBranch(); - void ReadMUXposCalib(TString filename); void CreateRawMapping(); void CreateMapping(); void CreateCalibMapping(); diff --git a/include/TCordferCalibBranch.hh b/include/TCordferCalibBranch.hh index ff62146..35b1ae5 100644 --- a/include/TCordferCalibBranch.hh +++ b/include/TCordferCalibBranch.hh @@ -34,6 +34,8 @@ class TCordferCalibBranch bool mux_status2; bool mux_pos1; bool mux_pos2; + bool mux1_junk; + bool mux2_junk; Int_t mux_ch1; Int_t mux_ch2; Int_t geo_tmp1; @@ -42,6 +44,8 @@ class TCordferCalibBranch Int_t ch_tmp2; Int_t val_tmp1; Int_t val_tmp2; + vector mpos1_prm; + vector mpos2_prm; TString GetBranchName(){ return name; } diff --git a/include/TCordferRawBranch.hh b/include/TCordferRawBranch.hh index d92b879..b8472b8 100644 --- a/include/TCordferRawBranch.hh +++ b/include/TCordferRawBranch.hh @@ -26,7 +26,6 @@ class TCordferRawBranch } ~TCordferRawBranch(){} - bool adc; Int_t size; Int_t nhit; Int_t geo; diff --git a/src/CalibrationManager.cpp b/src/CalibrationManager.cpp index 604870a..b586cb3 100644 --- a/src/CalibrationManager.cpp +++ b/src/CalibrationManager.cpp @@ -61,3 +61,39 @@ void CalibrationManager::ReadCalibration(){ fin.close(); } } + + +void CalibrationManager::ReadMUXposCalib(TString pos_file_name){ + ifstream fin(pos_file_name.Data()); + string buf; + + while(getline(fin, buf)){ + if(buf[0]=='#' || buf[0]=='c' || buf == ""){ continue; } + vector mpos_peak; + string pos_array = buf.substr(0, buf.find(';')); + stringstream ss{pos_array}; + string val; + while(getline(ss, val, ',')){ + if(val == "" || val == " "){ continue; } + while(val[0] == ' '){ val.erase(0, 1); } + while(val[val.length()-1] == ' '){ val.pop_back(); } + double d_val = stod(val); + mpos_peak.push_back(d_val); + } + if(mpos_peak.size() != 16){ + cerr << "ERROR: MUX position calibration file is not correct" << endl; + exit(0); + } + vector mpos_tmp; + mpos_tmp.push_back(mpos_peak[0] - (mpos_peak[1]-mpos_peak[0])/2.0); + for(Int_t i=0; i<15; i++){ mpos_tmp.push_back((mpos_peak[i]+mpos_peak[i+1])/2.0); } + mpos_tmp.push_back(mpos_peak[15] + (mpos_peak[15]-mpos_peak[14])/2.0); + + position_prms.push_back(mpos_tmp); + if(mpos_tmp.size() != 17){ + cerr << "ERROR: MUX position calibration file is not correct" << endl; + exit(0); + } + } + fin.close(); +} diff --git a/src/TCordferBranchManager.cpp b/src/TCordferBranchManager.cpp index 6ab1c6c..90081d1 100644 --- a/src/TCordferBranchManager.cpp +++ b/src/TCordferBranchManager.cpp @@ -176,45 +176,12 @@ void TCordferBranchManager::CreateCalibBranch(){ cerr << " mssd calibration requires " << pos_name.Data() << " !" << endl; exit(0); } - ReadMUXposCalib(pos_name); - } - } -} - -void TCordferBranchManager::ReadMUXposCalib(TString filename){ - ifstream fin(filename.Data()); - string buf; - - while(getline(fin, buf)){ - if(buf[0]=='#' || buf[0]=='c' || buf == ""){ continue; } - vector mpos_peak; - string pos_array = buf.substr(0, buf.find(';')); - stringstream ss{pos_array}; - string val; - while(getline(ss, val, ',')){ - if(val == "" || val == " "){ continue; } - while(val[0] == ' '){ val.erase(0, 1); } - while(val[val.length()-1] == ' '){ val.pop_back(); } - double d_val = stod(val); - mpos_peak.push_back(d_val); - } - if(mpos_peak.size() != 16){ - cerr << "ERROR: MUX position calibration file is not correct" << endl; - exit(0); - } - vector mpos_tmp; - mpos_tmp.push_back(mpos_peak[0] - (mpos_peak[1]-mpos_peak[0])/2.0); - for(Int_t i=0; i<15; i++){ mpos_tmp.push_back((mpos_peak[i]+mpos_peak[i+1])/2.0); } - mpos_tmp.push_back(mpos_peak[15] + (mpos_peak[15]-mpos_peak[14])/2.0); - - mpos.push_back(mpos_tmp); - if(mpos_tmp.size() != 17){ - cerr << "ERROR: MUX position calibration file is not correct" << endl; - exit(0); + CalibrationManager *cfile = new CalibrationManager(); + cfile->ReadMUXposCalib(pos_name); + mpos = cfile->position_prms; } } - fin.close(); } @@ -276,6 +243,10 @@ void TCordferBranchManager::CreateCalibMapping(){ else if(cbranch_name.find("mssd") != string::npos && cbranch_name.substr(0, 2) != "t_"){ mssd_tune++; if(mssd_tune%16 == 1){ + Int_t mux_id = mssd_tune/16; + cbranch[i]->mpos1_prm = mpos[2*mux_id]; + cbranch[i]->mpos2_prm = mpos[2*mux_id + 1]; + for(Int_t j=0; jGetBranchName().Data()); if(cbranch_name.find(mbranch_name) != string::npos){ @@ -371,8 +342,8 @@ void TCordferBranchManager::GiveCalibValue(Int_t geo, Int_t ch, Int_t val){ Int_t index = cmapping[seg]; string cbranch_name = string(cbranch[index]->GetBranchName().Data()); - //for mssd - if(cbranch_name.find("mssd") != string::npos){ + //for mssd energy calibration + if(cbranch_name.find("mssd") != string::npos && cbranch_name.substr(0, 2) != "t_"){ Int_t mux_index = muxmapping[seg]; Int_t mux_sig = mux_index % 1000; Int_t mux_id = (mux_index - mux_sig)/1000; @@ -381,23 +352,48 @@ void TCordferBranchManager::GiveCalibValue(Int_t geo, Int_t ch, Int_t val){ cbranch[index]->ch_tmp1 = ch; cbranch[index]->val_tmp1 = val; cbranch[index]->mux_status1=true; + }else if(mux_sig==1 && cbranch[index]->mux_pos1==true){ - // + if(cbranch[index]->mux1_junk == true){ return; } + Int_t add_ch = cbranch[index]->mux_ch1; + Double_t tmp = 0.0; + for(Int_t i=0; icalib_param.size(); i++){ + tmp += cbranch[index + add_ch]->calib_param[i]*pow(val, i); + } + cbranch[index + add_ch]->cbra_val = tmp; + }else if(mux_sig==2 && cbranch[index]->mux_pos2==false){ cbranch[index]->geo_tmp2 = geo; cbranch[index]->ch_tmp2 = ch; cbranch[index]->val_tmp2 = val; cbranch[index]->mux_status2=true; + }else if(mux_sig==2 && cbranch[index]->mux_pos2==true){ - // + if(cbranch[index]->mux2_junk == true){ return; } + Int_t add_ch = cbranch[index]->mux_ch2; + Double_t tmp = 0.0; + for(Int_t i=0; icalib_param.size(); i++){ + tmp += cbranch[index + add_ch]->calib_param[i]*pow(val, i); + } + cbranch[index + add_ch]->cbra_val = tmp; + }else if(mux_sig==3){ cbranch[index]->mux_pos1 = true; - //for(Int_t i=0; i<16; i++){ - // - //} + for(Int_t i=0; i<16; i++){ + if(cbranch[index]->mpos1_prm[i] < val && cbranch[index]->mpos1_prm[i+1] > val){ + cbranch[index]->mux_ch1 = i; + } + if(cbranch[index]->mux_ch1 < 0){ cbranch[index]->mux1_junk = true; } + } + }else if(mux_sig==4){ cbranch[index]->mux_pos2 = true; - // + for(Int_t i=0; i<16; i++){ + if(cbranch[index]->mpos2_prm[i] < val && cbranch[index]->mpos2_prm[i+1] > val){ + cbranch[index]->mux_ch2 = i; + } + if(cbranch[index]->mux_ch2 < 0){ cbranch[index]->mux2_junk = true; } + } } //for others @@ -462,6 +458,8 @@ void TCordferBranchManager::ClearCalibAll(){ cbranch[i]->mux_status2=false; cbranch[i]->mux_pos1=false; cbranch[i]->mux_pos2=false; + cbranch[i]->mux1_junk=false; + cbranch[i]->mux2_junk=false; cbranch[i]->mux_ch1=-99; cbranch[i]->mux_ch2=-99; cbranch[i]->geo_tmp1=-99; -- GitLab From f220b0fb795c0cc3f16151109c041033b68d87c5 Mon Sep 17 00:00:00 2001 From: kodaiokawa Date: Tue, 1 Mar 2022 12:46:07 +0900 Subject: [PATCH 3/7] test --- test.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 test.md diff --git a/test.md b/test.md new file mode 100644 index 0000000..9daeafb --- /dev/null +++ b/test.md @@ -0,0 +1 @@ +test -- GitLab From 784cb4de66f855ce251f95c79fc124b2ae6763e8 Mon Sep 17 00:00:00 2001 From: kodaiokawa Date: Tue, 1 Mar 2022 12:57:19 +0900 Subject: [PATCH 4/7] [mod] modify name --- .../{CalibrationManager.hh => CalibParamReader.hh} | 12 ++++++------ include/TCordferBranchManager.hh | 2 +- src/CMakeLists.txt | 2 +- src/{CalibrationManager.cpp => CalibParamReader.cpp} | 6 +++--- src/TCordferBranchManager.cpp | 4 ++-- test.md | 1 - 6 files changed, 13 insertions(+), 14 deletions(-) rename include/{CalibrationManager.hh => CalibParamReader.hh} (76%) rename src/{CalibrationManager.cpp => CalibParamReader.cpp} (94%) delete mode 100644 test.md diff --git a/include/CalibrationManager.hh b/include/CalibParamReader.hh similarity index 76% rename from include/CalibrationManager.hh rename to include/CalibParamReader.hh index 67bd35d..13bb2be 100644 --- a/include/CalibrationManager.hh +++ b/include/CalibParamReader.hh @@ -1,5 +1,5 @@ -#ifndef _CALIBRATIONMANAGER_HH_ -#define _CALIBRATIONMANAGER_HH_ +#ifndef _CALIBPARAMREADER_HH_ +#define _CALIBPARAMREADER_HH_ #include #include @@ -8,7 +8,7 @@ using namespace std; -class CalibrationManager +class CalibParamReader { private: TString file_name; @@ -16,13 +16,13 @@ class CalibrationManager Int_t detector_id; public: - CalibrationManager(){} - CalibrationManager(TString det_name, TString cname){ + CalibParamReader(){} + CalibParamReader(TString det_name, TString cname){ detector_name = det_name; file_name = cname; ReadCalibration(); } - ~CalibrationManager(){} + ~CalibParamReader(){} Int_t dim; vector< vector > parameters; //parameters[branches][dims] diff --git a/include/TCordferBranchManager.hh b/include/TCordferBranchManager.hh index 57d5848..350bd11 100644 --- a/include/TCordferBranchManager.hh +++ b/include/TCordferBranchManager.hh @@ -11,7 +11,7 @@ #include #include "ChannelMap.hh" -#include "CalibrationManager.hh" +#include "CalibParamReader.hh" #include "TCordferRawBranch.hh" #include "TCordferMapBranch.hh" #include "TCordferCalibBranch.hh" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7001113..faa452b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,7 @@ add_library(sources SHARED CommandlineReader.cpp ChannelMap.cpp - CalibrationManager.cpp + CalibParamReader.cpp TCordferRawBranch.cpp TCordferMapBranch.cpp TCordferCalibBranch.cpp diff --git a/src/CalibrationManager.cpp b/src/CalibParamReader.cpp similarity index 94% rename from src/CalibrationManager.cpp rename to src/CalibParamReader.cpp index b586cb3..6e074b9 100644 --- a/src/CalibrationManager.cpp +++ b/src/CalibParamReader.cpp @@ -6,12 +6,12 @@ #include -#include "CalibrationManager.hh" +#include "CalibParamReader.hh" using namespace std; -void CalibrationManager::ReadCalibration(){ +void CalibParamReader::ReadCalibration(){ if(detector_name == "ppac"){ cout << file_name << endl; }else{ @@ -63,7 +63,7 @@ void CalibrationManager::ReadCalibration(){ } -void CalibrationManager::ReadMUXposCalib(TString pos_file_name){ +void CalibParamReader::ReadMUXposCalib(TString pos_file_name){ ifstream fin(pos_file_name.Data()); string buf; diff --git a/src/TCordferBranchManager.cpp b/src/TCordferBranchManager.cpp index 90081d1..7894e33 100644 --- a/src/TCordferBranchManager.cpp +++ b/src/TCordferBranchManager.cpp @@ -149,7 +149,7 @@ void TCordferBranchManager::CreateCalibBranch(){ continue; } - CalibrationManager *cfile = new CalibrationManager(det_name, cname[j]); + CalibParamReader *cfile = new CalibParamReader(det_name, cname[j]); for(Int_t k=0; kbranch_name.size(); k++){ TString bname = cfile->branch_name[k]; TCordferCalibBranch *calib_branch = new TCordferCalibBranch(bname); @@ -177,7 +177,7 @@ void TCordferBranchManager::CreateCalibBranch(){ exit(0); } - CalibrationManager *cfile = new CalibrationManager(); + CalibParamReader *cfile = new CalibParamReader(); cfile->ReadMUXposCalib(pos_name); mpos = cfile->position_prms; } diff --git a/test.md b/test.md deleted file mode 100644 index 9daeafb..0000000 --- a/test.md +++ /dev/null @@ -1 +0,0 @@ -test -- GitLab From 8d78b7d5e9502583f8f7aa11a59d877af7a7305c Mon Sep 17 00:00:00 2001 From: kodaiokawa Date: Tue, 1 Mar 2022 18:32:22 +0900 Subject: [PATCH 5/7] [add] CalibrationManager --- include/CalibrationManager.hh | 15 ++++++++++++ src/CMakeLists.txt | 1 + src/CalibrationManager.cpp | 17 ++++++++++++++ src/TCordferBranchManager.cpp | 44 ++++++++++++++++++++--------------- 4 files changed, 58 insertions(+), 19 deletions(-) create mode 100644 include/CalibrationManager.hh create mode 100644 src/CalibrationManager.cpp diff --git a/include/CalibrationManager.hh b/include/CalibrationManager.hh new file mode 100644 index 0000000..4453822 --- /dev/null +++ b/include/CalibrationManager.hh @@ -0,0 +1,15 @@ +#ifndef _CALIBRATIONMANAGER_HH_ +#define _CALIBRATIONMANAGER_HH + +#include +#include + +#include + +using namespace std; + +//these functions are used to the TCordferCalibBranch +Double_t GetCalibValue(Int_t val, vector params); + + +#endif diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index faa452b..9281a02 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,6 +2,7 @@ add_library(sources SHARED CommandlineReader.cpp ChannelMap.cpp CalibParamReader.cpp + CalibrationManager.cpp TCordferRawBranch.cpp TCordferMapBranch.cpp TCordferCalibBranch.cpp diff --git a/src/CalibrationManager.cpp b/src/CalibrationManager.cpp new file mode 100644 index 0000000..f084379 --- /dev/null +++ b/src/CalibrationManager.cpp @@ -0,0 +1,17 @@ +#include +#include +#include + +#include "CalibrationManager.hh" + +using namespace std; + + +Double_t GetCalibValue(Int_t val, vector params){ + Double_t tmp = 0.0; + for(Int_t i=0; i #include "TCordferBranchManager.hh" +#include "CalibrationManager.hh" using namespace std; @@ -356,11 +357,12 @@ void TCordferBranchManager::GiveCalibValue(Int_t geo, Int_t ch, Int_t val){ }else if(mux_sig==1 && cbranch[index]->mux_pos1==true){ if(cbranch[index]->mux1_junk == true){ return; } Int_t add_ch = cbranch[index]->mux_ch1; - Double_t tmp = 0.0; - for(Int_t i=0; icalib_param.size(); i++){ - tmp += cbranch[index + add_ch]->calib_param[i]*pow(val, i); - } - cbranch[index + add_ch]->cbra_val = tmp; + //Double_t tmp = 0.0; + //for(Int_t i=0; icalib_param.size(); i++){ + // tmp += cbranch[index + add_ch]->calib_param[i]*pow(val, i); + //} + //cbranch[index + add_ch]->cbra_val = tmp; + cbranch[index + add_ch]->cbra_val = GetCalibValue(val, cbranch[index+add_ch]->calib_param); }else if(mux_sig==2 && cbranch[index]->mux_pos2==false){ cbranch[index]->geo_tmp2 = geo; @@ -371,11 +373,12 @@ void TCordferBranchManager::GiveCalibValue(Int_t geo, Int_t ch, Int_t val){ }else if(mux_sig==2 && cbranch[index]->mux_pos2==true){ if(cbranch[index]->mux2_junk == true){ return; } Int_t add_ch = cbranch[index]->mux_ch2; - Double_t tmp = 0.0; - for(Int_t i=0; icalib_param.size(); i++){ - tmp += cbranch[index + add_ch]->calib_param[i]*pow(val, i); - } - cbranch[index + add_ch]->cbra_val = tmp; + //Double_t tmp = 0.0; + //for(Int_t i=0; icalib_param.size(); i++){ + // tmp += cbranch[index + add_ch]->calib_param[i]*pow(val, i); + //} + //cbranch[index + add_ch]->cbra_val = tmp; + cbranch[index + add_ch]->cbra_val = GetCalibValue(val, cbranch[index+add_ch]->calib_param); }else if(mux_sig==3){ cbranch[index]->mux_pos1 = true; @@ -398,17 +401,20 @@ void TCordferBranchManager::GiveCalibValue(Int_t geo, Int_t ch, Int_t val){ //for others }else{ - Double_t tmp = 0.0; + //Double_t tmp = 0.0; if(cbranch[index]->adc){ - for(Int_t i=0; icalib_param.size(); i++){ - tmp += cbranch[index]->calib_param[i]*pow(val, i); - } - cbranch[index]->cbra_val = tmp; + cbranch[index]->cbra_val = GetCalibValue(val, cbranch[index]->calib_param); + // for(Int_t i=0; icalib_param.size(); i++){ + // tmp += cbranch[index]->calib_param[i]*pow(val, i); + // } + // cbranch[index]->cbra_val = tmp; }else{ - for(Int_t i=0; icalib_param.size(); i++){ - tmp += cbranch[index]->calib_param[i]*pow(val, i); - } - cbranch[index]->cbra_tval[cbranch[index]->count_hit] = tmp; + cbranch[index]->cbra_tval[cbranch[index]->count_hit] = GetCalibValue(val, cbranch[index]->calib_param); + cbranch[index]->count_hit++; + // for(Int_t i=0; icalib_param.size(); i++){ + // tmp += cbranch[index]->calib_param[i]*pow(val, i); + // } + // cbranch[index]->cbra_tval[cbranch[index]->count_hit] = tmp; } } } -- GitLab From d0de09d2a896dc2eee5de7bbadaca27397519f36 Mon Sep 17 00:00:00 2001 From: Kodai Okawa Date: Tue, 1 Mar 2022 09:34:36 +0000 Subject: [PATCH 6/7] Update CalibrationManager.hh --- include/CalibrationManager.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/CalibrationManager.hh b/include/CalibrationManager.hh index 4453822..ccb37fc 100644 --- a/include/CalibrationManager.hh +++ b/include/CalibrationManager.hh @@ -1,5 +1,5 @@ #ifndef _CALIBRATIONMANAGER_HH_ -#define _CALIBRATIONMANAGER_HH +#define _CALIBRATIONMANAGER_HH_ #include #include -- GitLab From 9cd2ade7e5c1eabca75280accb6aafb1d1efbfef Mon Sep 17 00:00:00 2001 From: Kodai Okawa Date: Tue, 1 Mar 2022 23:04:45 +0900 Subject: [PATCH 7/7] [debug] mux calibration --- .gitignore | 1 + calibration/si26a/mpos.prm | 3 +- include/TCordferBranchManager.hh | 5 ++ include/TCordferCalibBranch.hh | 11 +++ macro/compare.C | 2 + main.cpp | 3 +- src/TCordferBranchManager.cpp | 111 +++++++++++++++++-------------- 7 files changed, 83 insertions(+), 53 deletions(-) create mode 100644 macro/compare.C diff --git a/.gitignore b/.gitignore index 811f8dc..faaef28 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ anaroot/ build/ +rootfiles/ *.ridf *.root diff --git a/calibration/si26a/mpos.prm b/calibration/si26a/mpos.prm index c2a401b..a2f4d33 100644 --- a/calibration/si26a/mpos.prm +++ b/calibration/si26a/mpos.prm @@ -1,7 +1,8 @@ # MUX position calibration # channel of the 16 peaks +# for high0272 # 1ch, 2ch, ... , 16ch ; name -100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, ; MUX1-1-p0 +386.0, 401.0, 418.0, 435.0, 455.0, 471.0, 489.0, 506.0, 527.0, 543.0, 562.0, 578.0, 599.0, 615.0, 635.0, 653.0, ; MUX1-1-p0 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, ; MUX1-1-p1 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, ; MUX1-2-p0 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, ; MUX1-2-p1 diff --git a/include/TCordferBranchManager.hh b/include/TCordferBranchManager.hh index 350bd11..39af4da 100644 --- a/include/TCordferBranchManager.hh +++ b/include/TCordferBranchManager.hh @@ -41,6 +41,11 @@ class TCordferBranchManager vector< vector > mpos; //for mssd + //for temporary + bool rmapflag = false; + bool mapflag = false; + bool cmapflag = false; + public: TCordferBranchManager(){} TCordferBranchManager(TString input, TString output){ diff --git a/include/TCordferCalibBranch.hh b/include/TCordferCalibBranch.hh index 35b1ae5..23f3455 100644 --- a/include/TCordferCalibBranch.hh +++ b/include/TCordferCalibBranch.hh @@ -49,6 +49,17 @@ class TCordferCalibBranch TString GetBranchName(){ return name; } + void SetGeometrytmp1(Int_t geo, Int_t ch, Int_t val){ + geo_tmp1 = geo; + ch_tmp1 = ch; + val_tmp1 = val; + } + void SetGeometrytmp2(Int_t geo, Int_t ch, Int_t val){ + geo_tmp2 = geo; + ch_tmp2 = ch; + val_tmp2 = val; + } + void CopyCalibInfo(Int_t dim, vector param); }; diff --git a/macro/compare.C b/macro/compare.C new file mode 100644 index 0000000..2c63c08 --- /dev/null +++ b/macro/compare.C @@ -0,0 +1,2 @@ +{ +} diff --git a/main.cpp b/main.cpp index e3442f0..2d8f117 100644 --- a/main.cpp +++ b/main.cpp @@ -59,8 +59,6 @@ Int_t main(Int_t argc, Char_t **argv) Int_t evtn = 0; while(estore->GetNextEvent()){ - if(print_progress && evtn%10000 == 0) { cout << "reading..." << evtn << endl; } - if(rawdata){ branch_manager->ClearRawAll(); } if(mapdata){ branch_manager->ClearMapAll(); } if(calibration){ branch_manager->ClearCalibAll(); } @@ -89,6 +87,7 @@ Int_t main(Int_t argc, Char_t **argv) if(calibration){ branch_manager->CalibFill(); } estore->ClearData(); + if(print_progress && evtn%10000 == 0) { cout << "reading..." << evtn << endl; } evtn++; } diff --git a/src/TCordferBranchManager.cpp b/src/TCordferBranchManager.cpp index 21143a5..6a2d0c2 100644 --- a/src/TCordferBranchManager.cpp +++ b/src/TCordferBranchManager.cpp @@ -248,32 +248,34 @@ void TCordferBranchManager::CreateCalibMapping(){ cbranch[i]->mpos1_prm = mpos[2*mux_id]; cbranch[i]->mpos2_prm = mpos[2*mux_id + 1]; + Int_t seg0, seg1, seg2, seg3; + for(Int_t j=0; jGetBranchName().Data()); if(cbranch_name.find(mbranch_name) != string::npos){ - Int_t ene0_seg = mbranch[j]->segment_id[0]; - Int_t ene0_ch = mbranch[j]->channel[0]; - cmapping[ene0_seg*1000 + ene0_ch] = i; - muxmapping[ene0_seg*1000 + ene0_ch] = ((16 + mssd_tune)/16)*1000 + 1; - - Int_t ene1_seg = mbranch[j]->segment_id[1]; - Int_t ene1_ch = mbranch[j]->channel[1]; - cmapping[ene1_seg*1000 + ene1_ch] = i; - muxmapping[ene1_seg*1000 + ene1_ch] = ((16 + mssd_tune)/16)*1000 + 2; - - Int_t pos0_seg = mbranch[j]->segment_id[2]; - Int_t pos0_ch = mbranch[j]->channel[2]; - cmapping[pos0_seg*1000 + pos0_ch] = i; - muxmapping[pos0_seg*1000 + pos0_ch] = ((16 + mssd_tune)/16)*1000 + 3; - - Int_t pos1_seg = mbranch[j]->segment_id[3]; - Int_t pos1_ch = mbranch[j]->channel[3]; - cmapping[pos1_seg*1000 + pos1_ch] = i; - muxmapping[pos1_seg*1000 + pos1_ch] = ((16 + mssd_tune)/16)*1000 + 4; + seg0 = mbranch[j]->segment_id[0]*1000 + mbranch[j]->channel[0]; + cmapping[seg0] = i; + muxmapping[seg0] = 1; + + seg1 = mbranch[j]->segment_id[1]*1000 + mbranch[j]->channel[1]; + cmapping[seg1] = i; + muxmapping[seg1] = 2; + + seg2 = mbranch[j]->segment_id[2]*1000 + mbranch[j]->channel[2]; + cmapping[seg2] = i; + muxmapping[seg2] = 3; + + seg3 = mbranch[j]->segment_id[3]*1000 + mbranch[j]->channel[3]; + cmapping[seg2] = i; + muxmapping[seg2] = 4; } } + //cout << i << " " << cbranch_name << " " << seg0 << ", " << seg1 << ", " << seg2 << ", " << seg3 << endl; + continue; + }else{ + //cout << i << " " << cbranch_name << endl; continue; - }else{ continue; } + } }else if(cbranch_name.find("mssd") != string::npos && cbranch_name.substr(0, 2) == "t_"){ for(Int_t j=0; jGetBranchName().Data()); @@ -311,11 +313,23 @@ void TCordferBranchManager::CreateCalibMapping(){ Int_t seg = cbranch[i]->geo*1000 + cbranch[i]->ch; Int_t index = i; cmapping[seg] = index; + + //cout << i << " " << cbranch_name << " " << seg << endl; } } void TCordferBranchManager::GiveRawValue(Int_t geo, Int_t ch, Int_t val){ + //if not register segment + auto itr = mapping.find(geo); + if(itr == mapping.end()){ + if(rmapflag == false){ + cout << "WARNING: rmapping is not completed" << endl; + } + rmapflag=true; + return; + } + Int_t index = mapping[geo]; if(branch[index]->GetBranchName() == "mhtdc"){ @@ -330,6 +344,17 @@ void TCordferBranchManager::GiveRawValue(Int_t geo, Int_t ch, Int_t val){ void TCordferBranchManager::GiveMapValue(Int_t geo, Int_t ch, Int_t val){ Int_t seg = geo*1000 + ch; + + //if not register segment + auto itr = mmapping.find(seg); + if(itr == mmapping.end()){ + if(mapflag == false){ + cout << "WARNING: mapping is not completed" << endl; + } + mapflag=true; + return; + } + Int_t index = mmapping[seg]; Int_t j = index % 1000; Int_t i = (index - j)/1000; @@ -340,44 +365,39 @@ void TCordferBranchManager::GiveMapValue(Int_t geo, Int_t ch, Int_t val){ void TCordferBranchManager::GiveCalibValue(Int_t geo, Int_t ch, Int_t val){ Int_t seg = geo*1000 + ch; + + //if not register segment + auto itr = cmapping.find(seg); + if(itr == cmapping.end()){ + if(cmapflag == false){ + cout << "WARNING: cmapping is not completed" << endl; + } + cmapflag=true; + return; + } + Int_t index = cmapping[seg]; string cbranch_name = string(cbranch[index]->GetBranchName().Data()); //for mssd energy calibration if(cbranch_name.find("mssd") != string::npos && cbranch_name.substr(0, 2) != "t_"){ - Int_t mux_index = muxmapping[seg]; - Int_t mux_sig = mux_index % 1000; - Int_t mux_id = (mux_index - mux_sig)/1000; + Int_t mux_sig = muxmapping[seg]; if(mux_sig==1 && cbranch[index]->mux_pos1==false){ - cbranch[index]->geo_tmp1 = geo; - cbranch[index]->ch_tmp1 = ch; - cbranch[index]->val_tmp1 = val; + cbranch[index]->SetGeometrytmp1(geo, ch, val); cbranch[index]->mux_status1=true; }else if(mux_sig==1 && cbranch[index]->mux_pos1==true){ if(cbranch[index]->mux1_junk == true){ return; } Int_t add_ch = cbranch[index]->mux_ch1; - //Double_t tmp = 0.0; - //for(Int_t i=0; icalib_param.size(); i++){ - // tmp += cbranch[index + add_ch]->calib_param[i]*pow(val, i); - //} - //cbranch[index + add_ch]->cbra_val = tmp; cbranch[index + add_ch]->cbra_val = GetCalibValue(val, cbranch[index+add_ch]->calib_param); }else if(mux_sig==2 && cbranch[index]->mux_pos2==false){ - cbranch[index]->geo_tmp2 = geo; - cbranch[index]->ch_tmp2 = ch; - cbranch[index]->val_tmp2 = val; + cbranch[index]->SetGeometrytmp2(geo, ch, val); cbranch[index]->mux_status2=true; }else if(mux_sig==2 && cbranch[index]->mux_pos2==true){ if(cbranch[index]->mux2_junk == true){ return; } Int_t add_ch = cbranch[index]->mux_ch2; - //Double_t tmp = 0.0; - //for(Int_t i=0; icalib_param.size(); i++){ - // tmp += cbranch[index + add_ch]->calib_param[i]*pow(val, i); - //} - //cbranch[index + add_ch]->cbra_val = tmp; cbranch[index + add_ch]->cbra_val = GetCalibValue(val, cbranch[index+add_ch]->calib_param); }else if(mux_sig==3){ @@ -386,8 +406,8 @@ void TCordferBranchManager::GiveCalibValue(Int_t geo, Int_t ch, Int_t val){ if(cbranch[index]->mpos1_prm[i] < val && cbranch[index]->mpos1_prm[i+1] > val){ cbranch[index]->mux_ch1 = i; } - if(cbranch[index]->mux_ch1 < 0){ cbranch[index]->mux1_junk = true; } } + if(cbranch[index]->mux_ch1 < 0){ cbranch[index]->mux1_junk = true; } }else if(mux_sig==4){ cbranch[index]->mux_pos2 = true; @@ -395,26 +415,17 @@ void TCordferBranchManager::GiveCalibValue(Int_t geo, Int_t ch, Int_t val){ if(cbranch[index]->mpos2_prm[i] < val && cbranch[index]->mpos2_prm[i+1] > val){ cbranch[index]->mux_ch2 = i; } - if(cbranch[index]->mux_ch2 < 0){ cbranch[index]->mux2_junk = true; } } + if(cbranch[index]->mux_ch2 < 0){ cbranch[index]->mux2_junk = true; } } //for others }else{ - //Double_t tmp = 0.0; if(cbranch[index]->adc){ cbranch[index]->cbra_val = GetCalibValue(val, cbranch[index]->calib_param); - // for(Int_t i=0; icalib_param.size(); i++){ - // tmp += cbranch[index]->calib_param[i]*pow(val, i); - // } - // cbranch[index]->cbra_val = tmp; }else{ cbranch[index]->cbra_tval[cbranch[index]->count_hit] = GetCalibValue(val, cbranch[index]->calib_param); cbranch[index]->count_hit++; - // for(Int_t i=0; icalib_param.size(); i++){ - // tmp += cbranch[index]->calib_param[i]*pow(val, i); - // } - // cbranch[index]->cbra_tval[cbranch[index]->count_hit] = tmp; } } } -- GitLab