diff --git a/Trigger/TrigFTK/TrigFTKBankGen/TrigFTKBankGen/FTKConstGenAlgo.h b/Trigger/TrigFTK/TrigFTKBankGen/TrigFTKBankGen/FTKConstGenAlgo.h index 2b855daff82dd9e92b404c0e976a78b70761de7a..8f1647c3cbafc8b33a62b5494bf075183c365888 100644 --- a/Trigger/TrigFTK/TrigFTKBankGen/TrigFTKBankGen/FTKConstGenAlgo.h +++ b/Trigger/TrigFTK/TrigFTKBankGen/TrigFTKBankGen/FTKConstGenAlgo.h @@ -53,7 +53,6 @@ public: private: - ITHistSvc *m_thistSvc; bool m_merging; bool m_genconst; bool m_subregion; @@ -65,7 +64,6 @@ public: std::string m_extractpath; std::string m_outfilename; // the algorithm mostly produce a single file, if set this is the name of the file, a default option is otherwise used - TFile *m_file; TFile *m_good_file; TFile *m_cfile; TTree *m_ctree; @@ -78,12 +76,9 @@ public: int m_nfile; int m_addPattReturnCode; float m_nsector; - bool m_match; double m_pr; - int m_nevent; - int m_nplane; int m_nplane8; diff --git a/Trigger/TrigFTK/TrigFTKBankGen/src/FTKConstGenAlgo.cxx b/Trigger/TrigFTK/TrigFTKBankGen/src/FTKConstGenAlgo.cxx index 1c433ed30c5a7a2f0d32a60428e7af736cfc4d65..1a71a72bf0ad7114fb99157ca500aed445ae3fd9 100644 --- a/Trigger/TrigFTK/TrigFTKBankGen/src/FTKConstGenAlgo.cxx +++ b/Trigger/TrigFTK/TrigFTKBankGen/src/FTKConstGenAlgo.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ #include "TrigFTKBankGen/FTKBankGenAlgo.h" #include "TrigFTKBankGen/FTKConstGenAlgo.h" @@ -849,8 +849,8 @@ void FTKConstGenAlgo::constantgen() eigvec[i]= &eigvec_v[ndim*i]; } - geo_const =(struct geo_constants *) malloc(nsector*sizeof(struct geo_constants)); - gcorth =(struct geo_constants *) malloc(nsector*sizeof(struct geo_constants)); + geo_const =(geo_constants *) malloc(nsector*sizeof(geo_constants)); + gcorth =(geo_constants *) malloc(nsector*sizeof(geo_constants)); for(int i=0;i<nsector;i++){ geo_const[i].Vd = (double *) calloc(ndim,sizeof(double)); @@ -2034,7 +2034,7 @@ void FTKConstGenAlgo::make_subregion() if(nlayer==11 || nlayer==8) ndim=nlayer+3;//w/o IBL or 1st stage else if(nlayer==12) ndim=nlayer+4;//IBL - tmp_const =(struct geo_constants *) malloc(nsector*sizeof(struct geo_constants)); + tmp_const =(geo_constants *) malloc(nsector*sizeof(geo_constants)); sectorID=(int *) calloc(nsector,sizeof(int)); for(int j=0;j<nsector;j++){ tmp_const[j].Vd = (double *) calloc(ndim,sizeof(double)); @@ -2157,17 +2157,17 @@ void FTKConstGenAlgo::make_subregion() sprintf(gcon_filename[sub],"corrgen_raw_%dL_%dM_reg%d_sub%d.gcon",nlayer,m_nsubregion,i,sub); gcon_file = fopen(gcon_filename[sub],"w"); for(int j=0;j<6;j++){ - fprintf(gcon_file,init_line[j].c_str()); + fprintf(gcon_file,"%s",init_line[j].c_str()); fprintf(gcon_file,"\n"); } fprintf(gcon_file," %d\n",nlayer); - fprintf(gcon_file,init_line[6].c_str()); + fprintf(gcon_file,"%s",init_line[6].c_str()); fprintf(gcon_file,"\n"); fprintf(gcon_file,"%d\n",sub_nsector); - fprintf(gcon_file,init_line[7].c_str()); + fprintf(gcon_file,"%s",init_line[7].c_str()); fprintf(gcon_file,"\n"); fprintf(gcon_file," %d\n",2); - fprintf(gcon_file,init_line[8].c_str()); + fprintf(gcon_file,"%s",init_line[8].c_str()); for(int id=0;id<sub_nsector;id++){ fprintf(gcon_file,"sector\n"); fprintf(gcon_file,"%d\n",id);