modified: .vscode/settings.json

modified:   Analyzer.C
	modified:   Analyzer.h
	modified:   ProcessRun.sh
This commit is contained in:
Vignesh Sitaraman 2025-01-27 10:55:22 -05:00
parent 26e943adc8
commit a5dfa2ecd3
4 changed files with 33 additions and 23 deletions

View File

@ -101,7 +101,8 @@
"PosCal_2.C": "cpp", "PosCal_2.C": "cpp",
"AutoFit.C": "cpp", "AutoFit.C": "cpp",
"Fitting.C": "cpp", "Fitting.C": "cpp",
"PCGainMatch.C": "cpp" "PCGainMatch.C": "cpp",
"Analyzer1.C": "cpp"
}, },
"github-enterprise.uri": "https://fsunuc.physics.fsu.edu" "github-enterprise.uri": "https://fsunuc.physics.fsu.edu"
} }

View File

@ -337,25 +337,30 @@ Bool_t Analyzer::Process(Long64_t entry)
denom = a2 * c2 - ac * ac; denom = a2 * c2 - ac * ac;
alpha = (ac * cdiff - c2 * adiff) / denom; alpha = (ac * cdiff - c2 * adiff) / denom;
beta = (a2 * cdiff - ac * adiff) / denom; beta = (a2 * cdiff - ac * adiff) / denom;
Crossover[i][j][1].x = pwinstance.An[i].first.X() + alpha * a.X(); Crossover[i][j][0].x = pwinstance.An[i].first.X() + alpha * a.X();
Crossover[i][j][1].y = pwinstance.An[i].first.Y() + alpha * a.Y(); Crossover[i][j][0].y = pwinstance.An[i].first.Y() + alpha * a.Y();
Crossover[i][j][1].z = pwinstance.An[i].first.Z() + alpha * a.Z(); Crossover[i][j][0].z = pwinstance.An[i].first.Z() + alpha * a.Z();
//placeholder variable Crossover[i][j][2].x has nothing to do with the geometry of the crossover and is being used to store the alpha value,
//so that it can be used to sort "good" hits later // placeholder variable Crossover[i][j][2].x has nothing to do with the geometry of the crossover and is being used to store the alpha value-
Crossover[i][j][2].x = alpha; //-so that it can be used to sort "good" hits later
// if (i == 23) Crossover[i][j][1].x = alpha;
// {
// if (abs(i - j) < 7 || abs(i - j) > 17) if (i == 16)
// { {
// if (alpha < 0 && alpha > -1) for(int k=0;k<5;k++){
// { if ((i+24+k)%24==j)
// printf("Anode and cathode indices and coord : %d %d %f %f %f %f\n", i, j, pwinstance.Ca[j].first.X(), pwinstance.Ca[j].first.Y(), pwinstance.Ca[j].first.Z(), alpha); {
// printf("Crossover wires, points and alpha are : %f %f %f %f \n", Crossover[i][j].x, Crossover[i][j].y, Crossover[i][j].z, alpha); // if (alpha < 0 && alpha >= -1)
// } // {
// } printf("Anode and cathode indices and coord : %d %d %f %f %f %f\n", i, j, pwinstance.Ca[j].first.X(), pwinstance.Ca[j].first.Y(), pwinstance.Ca[j].first.Z(), alpha);
// } printf("Crossover wires, points and alpha are : %f %f %f %f \n", Crossover[i][j][1].x, Crossover[i][j][1].y, Crossover[i][j][1].z, Crossover[i][j][2].x /*this is alpha*/);
// }
}
}
}
} }
} }
std::vector<std::pair<int, double>> anodeHits = {}; std::vector<std::pair<int, double>> anodeHits = {};
std::vector<std::pair<int, double>> cathodeHits = {}; std::vector<std::pair<int, double>> cathodeHits = {};
@ -387,7 +392,7 @@ Bool_t Analyzer::Process(Long64_t entry)
int aIDnextMax = 0; int aIDnextMax = 0;
int cIDnextMax = 0; int cIDnextMax = 0;
//creating a vector of pairs of anode and cathode hits that is sorted in order of decreasing energy // creating a vector of pairs of anode and cathode hits that is sorted in order of decreasing energy
if (pc.index[i] < 24) if (pc.index[i] < 24)
{ {
anodeHits.push_back(std::pair<int, double>(pc.index[i], pc.e[i])); anodeHits.push_back(std::pair<int, double>(pc.index[i], pc.e[i]));
@ -397,7 +402,7 @@ Bool_t Analyzer::Process(Long64_t entry)
else if (pc.index[i] >= 24) else if (pc.index[i] >= 24)
{ {
cathodeHits.push_back(std::pair<int, double>(pc.index[i], pc.e[i])); cathodeHits.push_back(std::pair<int, double>(pc.index[i], pc.e[i]));
std::sort(cathodeHits.begin(), cathodeHits.end(),[](const std::pair<int, double> &a, const std::pair<int, double> &b) std::sort(cathodeHits.begin(), cathodeHits.end(), [](const std::pair<int, double> &a, const std::pair<int, double> &b)
{ return a.second > b.second; }); { return a.second > b.second; });
} }
@ -419,6 +424,8 @@ Bool_t Analyzer::Process(Long64_t entry)
aESum += aE; aESum += aE;
if (aE > aEMax) if (aE > aEMax)
{ {
aIDnextMax = aIDMax;
aEnextMax = aEMax;
aEMax = aE; aEMax = aE;
aIDMax = aID; aIDMax = aID;
} }
@ -437,6 +444,8 @@ Bool_t Analyzer::Process(Long64_t entry)
cE = cathode.second; cE = cathode.second;
if (cE > cEMax) if (cE > cEMax)
{ {
cIDnextMax = cIDMax;
cEnextMax = cEMax;
cEMax = cE; cEMax = cE;
cIDMax = cID; cIDMax = cID;
} }
@ -481,7 +490,7 @@ Bool_t Analyzer::Process(Long64_t entry)
// float aE = anode.second; // float aE = anode.second;
// aESum += aE; // aESum += aE;
// if(inPCCut){ // if(inPCCut){
hanVScatsum->Fill(aESum, cESum); hanVScatsum->Fill(aEMax, cESum);
// } // }
if (aID < 24 && aE > 50) if (aID < 24 && aE > 50)
{ {

View File

@ -105,7 +105,7 @@ void Analyzer::Init(TTree *tree){
fChain->SetBranchAddress("miscCh", &misc.ch, &b_miscCh); fChain->SetBranchAddress("miscCh", &misc.ch, &b_miscCh);
fChain->SetBranchAddress("miscE", &misc.e, &b_miscE); fChain->SetBranchAddress("miscE", &misc.e, &b_miscE);
fChain->SetBranchAddress("miscT", &misc.t, &b_miscT); fChain->SetBranchAddress("miscT", &misc.t, &b_miscT);
fChain->SetBranchAddress("miscF", &misc.tf, &b_miscTf); // fChain->SetBranchAddress("miscF", &misc.tf, &b_miscTf);
} }

View File

@ -13,7 +13,7 @@ timeWindow=$2
option=$3 option=$3
rawFolder=/home/tandem/data1/2024_09_17Fap/data rawFolder=/home/tandem/data1/2024_09_17Fap/data
rootFolder=/home/tandem/data1/2024_09_17Fap/data/root_data rootFolder=../root_data
if [ $option -eq 0 ]; then if [ $option -eq 0 ]; then