Skip to content

Replace exit(x) with return x in ROOT macros #47391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Replace exit(x) with return x in ROOT macros #47391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb22c1e
Replace exit(x) with return x in ROOT macros
iarspider Feb 18, 2025
99ce3f0
Code-format
iarspider Feb 18, 2025
89c0e07
Replace exit with return in a few more scripts
iarspider Feb 19, 2025
a157fa1
Update Alignment/MillePedeAlignmentAlgorithm/test/ZMuMuMassConstraint…
iarspider Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...ent/MillePedeAlignmentAlgorithm/test/ZMuMuMassConstraintParameterFinder/printParameters.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ bool isValidFile(const TString& fileName) {
return true;
}

void printParameters(const TString& fileName) {
int printParameters(const TString& fileName) {
if (!isValidFile(fileName)) {
exit(EXIT_FAILURE);
return EXIT_FAILURE;
}

TFile* file = TFile::Open(fileName, "read");
Expand All @@ -30,5 +30,5 @@ void printParameters(const TString& fileName) {
std::cout << " PrimaryWidth = " << htemp->GetRMS() << "\n";
std::cout << "========================================\n";

exit(EXIT_SUCCESS);
return EXIT_SUCCESS;
}
239 changes: 120 additions & 119 deletions CalibMuon/CSCCalibration/test/CSCValidation.cpp
View file
Open in desktop

Large diffs are not rendered by default.

66 changes: 33 additions & 33 deletions CalibMuon/CSCCalibration/test/compareGains.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
#include <iostream>
#include <string>

int main(){

int main() {
const int MAX_SIZE = 252288;

int old_index;
Expand All @@ -16,44 +15,44 @@ int main(){
std::vector<float> old_chi;

int new_index;
float new_slope,new_int, new_chi2;
float new_slope, new_int, new_chi2;
std::vector<int> new_index_id;
std::vector<float> new_gains;
std::vector<float> new_intercept;
std::vector<float> new_chi;

std::vector<float> diff;
std::vector<float> myoldgains;

int counter,counter1;
int old_nrlines=0;
int new_nrlines=0;
int counter, counter1;
int old_nrlines = 0;
int new_nrlines = 0;

std::ifstream olddata;
olddata.open("goodGains2008_09_02.dat",std::ios::in);
if(!olddata) {
std::cerr <<"Error: goodGains2008_09_02.dat -> no such file!"<< std::endl;
exit(1);
std::ifstream olddata;
olddata.open("goodGains2008_09_02.dat", std::ios::in);
if (!olddata) {
std::cerr << "Error: goodGains2008_09_02.dat -> no such file!" << std::endl;
return 1;
}
while (!olddata.eof() ) {
olddata >> old_index >> old_slope ;

while (!olddata.eof()) {
olddata >> old_index >> old_slope;
old_index_id.push_back(old_index);
old_gains.push_back(old_slope);
old_nrlines++;
}
olddata.close();

std::ifstream newdata;
std::ofstream myGainsFile("diffGainsOct_Aug109889.dat",std::ios::out);
newdata.open("goodGains2009_08_07_run109889.dat",std::ios::in);
if(!newdata) {
std::cerr <<"Error: goodGains2009_08_07_run109889.dat -> no such file!"<< std::endl;
exit(1);
std::ofstream myGainsFile("diffGainsOct_Aug109889.dat", std::ios::out);
newdata.open("goodGains2009_08_07_run109889.dat", std::ios::in);
if (!newdata) {
std::cerr << "Error: goodGains2009_08_07_run109889.dat -> no such file!" << std::endl;
return 1;
}
while (!newdata.eof() ) {
newdata >> new_index >> new_slope >> new_int >> new_chi2 ;

while (!newdata.eof()) {
newdata >> new_index >> new_slope >> new_int >> new_chi2;
new_index_id.push_back(new_index);
new_gains.push_back(new_slope);
new_intercept.push_back(new_int);
Expand All @@ -63,18 +62,19 @@ int main(){
newdata.close();
diff.resize(MAX_SIZE);
myoldgains.resize(MAX_SIZE);

for(int i=0; i<MAX_SIZE;++i){
counter=old_index_id[i];
myoldgains[i]=old_gains[i];

for (int k=0;k<new_index_id.size()-1;k++){
counter1=new_index_id[k];
if(counter == counter1){
diff[k]=old_gains[i] - new_gains[k];
//std::cout<<old_gains[i]<<" new_gains[k]"<<new_gains[k]<<std::endl;
myGainsFile<<counter<<" "<<diff[k]<<std::endl;
for (int i = 0; i < MAX_SIZE; ++i) {
counter = old_index_id[i];
myoldgains[i] = old_gains[i];

for (int k = 0; k < new_index_id.size() - 1; k++) {
counter1 = new_index_id[k];
if (counter == counter1) {
diff[k] = old_gains[i] - new_gains[k];
//std::cout<<old_gains[i]<<" new_gains[k]"<<new_gains[k]<<std::endl;
myGainsFile << counter << " " << diff[k] << std::endl;
}
}
}
return 0;
}
119 changes: 62 additions & 57 deletions CalibMuon/CSCCalibration/test/compareMatrix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@
#include <iostream>
#include <string>

int main(){

int main() {
const int MAX_SIZE = 252288;

int old_index;
float old_elem33, old_elem34,old_elem35,old_elem44,old_elem45,old_elem46,old_elem55,old_elem56;
float old_elem57,old_elem66,old_elem67,old_elem77;
float old_elem33, old_elem34, old_elem35, old_elem44, old_elem45, old_elem46, old_elem55, old_elem56;
float old_elem57, old_elem66, old_elem67, old_elem77;
std::vector<int> old_index_id;
std::vector<float> old_el33;
std::vector<float> old_el34;
Expand All @@ -26,8 +25,8 @@ int main(){
std::vector<float> old_el77;

int new_index;
float new_elem33,new_elem34,new_elem35,new_elem44,new_elem45,new_elem46,new_elem55,new_elem56;
float new_elem57,new_elem66,new_elem67,new_elem77;
float new_elem33, new_elem34, new_elem35, new_elem44, new_elem45, new_elem46, new_elem55, new_elem56;
float new_elem57, new_elem66, new_elem67, new_elem77;
std::vector<int> new_index_id;
std::vector<float> new_el33;
std::vector<float> new_el34;
Expand Down Expand Up @@ -70,19 +69,20 @@ int main(){
std::vector<float> myoldel67;
std::vector<float> myoldel77;

int counter,counter1;
int old_nrlines=0;
int new_nrlines=0;
int counter, counter1;
int old_nrlines = 0;
int new_nrlines = 0;

std::ifstream olddata;
olddata.open("goodMatrix2008_09_02.dat",std::ios::in);
if(!olddata) {
std::cerr <<"Error: goodMatrix2008_09_02.dat -> no such file!"<< std::endl;
exit(1);
std::ifstream olddata;
olddata.open("goodMatrix2008_09_02.dat", std::ios::in);
if (!olddata) {
std::cerr << "Error: goodMatrix2008_09_02.dat -> no such file!" << std::endl;
return 1;
}

while (!olddata.eof() ) {
olddata >> old_index >> old_elem33 >> old_elem34 >> old_elem44 >> old_elem35 >> old_elem45 >> old_elem55 >> old_elem46 >> old_elem56 >>old_elem66 >> old_elem57 >> old_elem67 >> old_elem77 ;

while (!olddata.eof()) {
olddata >> old_index >> old_elem33 >> old_elem34 >> old_elem44 >> old_elem35 >> old_elem45 >> old_elem55 >>
old_elem46 >> old_elem56 >> old_elem66 >> old_elem57 >> old_elem67 >> old_elem77;
old_index_id.push_back(old_index);
old_el33.push_back(old_elem33);
old_el34.push_back(old_elem34);
Expand All @@ -101,15 +101,16 @@ int main(){
olddata.close();

std::ifstream newdata;
std::ofstream myXtalkFile("diffMatrixOct_Aug109891.dat",std::ios::out);
newdata.open("goodMatrix2009_08_07_run109891.dat",std::ios::in);
if(!newdata) {
std::cerr <<"Error: goodMatrix2009_08_07_run109891.dat -> no such file!"<< std::endl;
exit(1);
std::ofstream myXtalkFile("diffMatrixOct_Aug109891.dat", std::ios::out);
newdata.open("goodMatrix2009_08_07_run109891.dat", std::ios::in);
if (!newdata) {
std::cerr << "Error: goodMatrix2009_08_07_run109891.dat -> no such file!" << std::endl;
return 1;
}

while (!newdata.eof() ) {
newdata >> new_index >> new_elem33 >> new_elem34 >> new_elem44 >> new_elem35 >> new_elem45 >> new_elem55 >> new_elem46 >> new_elem56 >>new_elem66 >> new_elem57 >> new_elem67 >> new_elem77;

while (!newdata.eof()) {
newdata >> new_index >> new_elem33 >> new_elem34 >> new_elem44 >> new_elem35 >> new_elem45 >> new_elem55 >>
new_elem46 >> new_elem56 >> new_elem66 >> new_elem57 >> new_elem67 >> new_elem77;
new_index_id.push_back(new_index);
new_el33.push_back(new_elem33);
new_el34.push_back(new_elem34);
Expand Down Expand Up @@ -154,39 +155,43 @@ int main(){
myoldel67.resize(MAX_SIZE);
myoldel77.resize(MAX_SIZE);

for(int i=0; i<MAX_SIZE;++i){
counter=old_index_id[i];
myoldel33[i]=old_el33[i];
myoldel34[i]=old_el34[i];
myoldel35[i]=old_el35[i];
myoldel44[i]=old_el44[i];
myoldel45[i]=old_el45[i];
myoldel46[i]=old_el46[i];
myoldel55[i]=old_el55[i];
myoldel56[i]=old_el56[i];
myoldel57[i]=old_el57[i];
myoldel66[i]=old_el66[i];
myoldel67[i]=old_el67[i];
myoldel77[i]=old_el77[i];

for (int k=0;k<new_index_id.size()-1;k++){
counter1=new_index_id[k];
if(counter == counter1){
diff_el33[k]=old_el33[i] - new_el33[k];
diff_el34[k]=old_el34[i] - new_el34[k];
diff_el35[k]=old_el35[i] - new_el35[k];
diff_el44[k]=old_el44[i] - new_el44[k];
diff_el45[k]=old_el45[i] - new_el45[k];
diff_el46[k]=old_el46[i] - new_el46[k];
diff_el55[k]=old_el55[i] - new_el55[k];
diff_el56[k]=old_el56[i] - new_el56[k];
diff_el57[k]=old_el57[i] - new_el57[k];
diff_el66[k]=old_el66[i] - new_el66[k];
diff_el67[k]=old_el67[i] - new_el67[k];
diff_el77[k]=old_el77[i] - new_el77[k];
//std::cout<<old_el33[i]<<" new_el33[k]"<<new_el33[k]<<std::endl;
myXtalkFile<<counter<<" "<<diff_el33[k]<<" "<< diff_el34[k]<<" "<<diff_el35[k]<<" "<<diff_el44[k]<<" "<<diff_el45[k]<<" "<<diff_el46[k]<<" "<<diff_el55[k]<<" "<<diff_el56[k]<<" "<<diff_el57[k]<<" "<<diff_el66[k]<<" "<<diff_el67[k]<<" "<<diff_el77[k]<<" "<<std::endl;
for (int i = 0; i < MAX_SIZE; ++i) {
counter = old_index_id[i];
myoldel33[i] = old_el33[i];
myoldel34[i] = old_el34[i];
myoldel35[i] = old_el35[i];
myoldel44[i] = old_el44[i];
myoldel45[i] = old_el45[i];
myoldel46[i] = old_el46[i];
myoldel55[i] = old_el55[i];
myoldel56[i] = old_el56[i];
myoldel57[i] = old_el57[i];
myoldel66[i] = old_el66[i];
myoldel67[i] = old_el67[i];
myoldel77[i] = old_el77[i];

for (int k = 0; k < new_index_id.size() - 1; k++) {
counter1 = new_index_id[k];
if (counter == counter1) {
diff_el33[k] = old_el33[i] - new_el33[k];
diff_el34[k] = old_el34[i] - new_el34[k];
diff_el35[k] = old_el35[i] - new_el35[k];
diff_el44[k] = old_el44[i] - new_el44[k];
diff_el45[k] = old_el45[i] - new_el45[k];
diff_el46[k] = old_el46[i] - new_el46[k];
diff_el55[k] = old_el55[i] - new_el55[k];
diff_el56[k] = old_el56[i] - new_el56[k];
diff_el57[k] = old_el57[i] - new_el57[k];
diff_el66[k] = old_el66[i] - new_el66[k];
diff_el67[k] = old_el67[i] - new_el67[k];
diff_el77[k] = old_el77[i] - new_el77[k];
//std::cout<<old_el33[i]<<" new_el33[k]"<<new_el33[k]<<std::endl;
myXtalkFile << counter << " " << diff_el33[k] << " " << diff_el34[k] << " " << diff_el35[k] << " "
<< diff_el44[k] << " " << diff_el45[k] << " " << diff_el46[k] << " " << diff_el55[k] << " "
<< diff_el56[k] << " " << diff_el57[k] << " " << diff_el66[k] << " " << diff_el67[k] << " "
<< diff_el77[k] << " " << std::endl;
}
}
}
return 0;
}
64 changes: 32 additions & 32 deletions CalibMuon/CSCCalibration/test/comparePeds.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
#include <iostream>
#include <string>

int main(){

int main() {
const int MAX_SIZE = 252288;

int old_index;
Expand All @@ -14,26 +13,26 @@ int main(){
std::vector<float> old_peds;
std::vector<float> old_pedrms;
int new_index;
float new_ped,new_rms;
float new_ped, new_rms;
std::vector<int> new_index_id;
std::vector<float> new_peds;
std::vector<float> new_pedrms;
std::vector<float> diff;
std::vector<float> myoldpeds;

int counter,counter1;
int old_nrlines=0;
int new_nrlines=0;
int counter, counter1;
int old_nrlines = 0;
int new_nrlines = 0;

std::ifstream olddata;
olddata.open("goodPeds2008_09_02.dat",std::ios::in);
if(!olddata) {
std::cerr <<"Error: goodPeds2008_09_02.dat -> no such file!"<< std::endl;
exit(1);
std::ifstream olddata;
olddata.open("goodPeds2008_09_02.dat", std::ios::in);
if (!olddata) {
std::cerr << "Error: goodPeds2008_09_02.dat -> no such file!" << std::endl;
return 1;
}
while (!olddata.eof() ) {
olddata >> old_index >> old_ped >> old_rms ;

while (!olddata.eof()) {
olddata >> old_index >> old_ped >> old_rms;
old_index_id.push_back(old_index);
old_peds.push_back(old_ped);
old_pedrms.push_back(old_rms);
Expand All @@ -42,15 +41,15 @@ int main(){
olddata.close();

std::ifstream newdata;
std::ofstream myPedsFile("diffPedsOct_Feb.dat",std::ios::out);
newdata.open("goodPeds2009_02_16.dat",std::ios::in);
if(!newdata) {
std::cerr <<"Error: goodPeds2009_02_16.dat -> no such file!"<< std::endl;
exit(1);
std::ofstream myPedsFile("diffPedsOct_Feb.dat", std::ios::out);
newdata.open("goodPeds2009_02_16.dat", std::ios::in);
if (!newdata) {
std::cerr << "Error: goodPeds2009_02_16.dat -> no such file!" << std::endl;
return 1;
}
while (!newdata.eof() ) {
newdata >> new_index >> new_ped >> new_rms ;

while (!newdata.eof()) {
newdata >> new_index >> new_ped >> new_rms;
new_index_id.push_back(new_index);
new_peds.push_back(new_ped);
new_pedrms.push_back(new_rms);
Expand All @@ -59,18 +58,19 @@ int main(){
newdata.close();
diff.resize(MAX_SIZE);
myoldpeds.resize(MAX_SIZE);

for(int i=0; i<MAX_SIZE;++i){
counter=old_index_id[i];
myoldpeds[i]=old_peds[i];

for (int k=0;k<new_index_id.size()-1;k++){
counter1=new_index_id[k];
if(counter == counter1){
diff[k]=old_peds[i] - new_peds[k];
//std::cout<<old_peds[i]<<" new_peds[k]"<<new_peds[k]<<std::endl;
myPedsFile<<counter<<" "<<diff[k]<<std::endl;
for (int i = 0; i < MAX_SIZE; ++i) {
counter = old_index_id[i];
myoldpeds[i] = old_peds[i];

for (int k = 0; k < new_index_id.size() - 1; k++) {
counter1 = new_index_id[k];
if (counter == counter1) {
diff[k] = old_peds[i] - new_peds[k];
//std::cout<<old_peds[i]<<" new_peds[k]"<<new_peds[k]<<std::endl;
myPedsFile << counter << " " << diff[k] << std::endl;
}
}
}
return 0;
}
Loading