Skip to content
Snippets Groups Projects
Commit d2a6875c authored by Stephen A. Wood's avatar Stephen A. Wood
Browse files

Get rid of some warnings and excess couts

parent 55fd013e
No related branches found
No related tags found
No related merge requests found
...@@ -329,9 +329,9 @@ void THcDetectorMap::Load(const char *fname) ...@@ -329,9 +329,9 @@ void THcDetectorMap::Load(const char *fname)
fNchans++; fNchans++;
} }
} }
cout << endl << " Detector ID Map" << endl << endl; cout << endl << " Detector ID Map" << endl << endl;
for(Int_t i=0; i < fNIDs; i++) { for(Int_t i=0; i < fNIDs; i++) {
cout << i << " "; cout << " ";
cout << fIDMap[i].name << " " << fIDMap[i].id << endl; cout << fIDMap[i].name << " " << fIDMap[i].id << endl;
} }
cout << endl; cout << endl;
......
...@@ -91,7 +91,6 @@ Int_t THcDriftChamberPlane::ReadDatabase( const TDatime& date ) ...@@ -91,7 +91,6 @@ Int_t THcDriftChamberPlane::ReadDatabase( const TDatime& date )
Int_t NumDriftMapBins; Int_t NumDriftMapBins;
Double_t DriftMapFirstBin; Double_t DriftMapFirstBin;
Double_t DriftMapBinSize; Double_t DriftMapBinSize;
Double_t DriftMap[1000];
prefix[0]=tolower(GetParent()->GetPrefix()[0]); prefix[0]=tolower(GetParent()->GetPrefix()[0]);
prefix[1]='\0'; prefix[1]='\0';
...@@ -99,11 +98,17 @@ Int_t THcDriftChamberPlane::ReadDatabase( const TDatime& date ) ...@@ -99,11 +98,17 @@ Int_t THcDriftChamberPlane::ReadDatabase( const TDatime& date )
{"driftbins", &NumDriftMapBins, kInt}, {"driftbins", &NumDriftMapBins, kInt},
{"drift1stbin", &DriftMapFirstBin, kDouble}, {"drift1stbin", &DriftMapFirstBin, kDouble},
{"driftbinsz", &DriftMapBinSize, kDouble}, {"driftbinsz", &DriftMapBinSize, kDouble},
{Form("wc%sfract",GetName()),DriftMap,kDouble,1000},
{0} {0}
}; };
gHcParms->LoadParmValues((DBRequest*)&list,prefix); gHcParms->LoadParmValues((DBRequest*)&list,prefix);
Double_t *DriftMap = new Double_t[NumDriftMapBins];
DBRequest list2[]={
{Form("wc%sfract",GetName()),DriftMap,kDouble,NumDriftMapBins},
{0}
};
gHcParms->LoadParmValues((DBRequest*)&list2,prefix);
// Retrieve parameters we need from parent class // Retrieve parameters we need from parent class
THcDC* fParent; THcDC* fParent;
...@@ -194,10 +199,11 @@ Int_t THcDriftChamberPlane::ReadDatabase( const TDatime& date ) ...@@ -194,10 +199,11 @@ Int_t THcDriftChamberPlane::ReadDatabase( const TDatime& date )
fPlaneCoef[7]=-hzchi*hxpsi + hxchi*hzpsi; // 0. fPlaneCoef[7]=-hzchi*hxpsi + hxchi*hzpsi; // 0.
fPlaneCoef[8]= hychi*hxpsi - hxchi*hypsi; // 1. fPlaneCoef[8]= hychi*hxpsi - hxchi*hypsi; // 1.
cout << fPlaneNum << " " << fNWires << " " << fWireOrder << endl; // cout << fPlaneNum << " " << fNWires << " " << fWireOrder << endl;
fTTDConv = new THcDCLookupTTDConv(DriftMapFirstBin,fPitch/2,DriftMapBinSize, fTTDConv = new THcDCLookupTTDConv(DriftMapFirstBin,fPitch/2,DriftMapBinSize,
NumDriftMapBins,DriftMap); NumDriftMapBins,DriftMap);
delete [] DriftMap;
Int_t nWires = fParent->GetNWires(fPlaneNum); Int_t nWires = fParent->GetNWires(fPlaneNum);
// For HMS, wire numbers start with one, but arrays start with zero. // For HMS, wire numbers start with one, but arrays start with zero.
......
...@@ -245,7 +245,7 @@ Int_t THcHallCSpectrometer::ReadDatabase( const TDatime& date ) ...@@ -245,7 +245,7 @@ Int_t THcHallCSpectrometer::ReadDatabase( const TDatime& date )
int good=1; int good=1;
while(good && line[0]=='!') { while(good && line[0]=='!') {
good = getline(ifile,line).good(); good = getline(ifile,line).good();
cout << line << endl; // cout << line << endl;
} }
// Read in focal plane rotation coefficients // Read in focal plane rotation coefficients
// Probably not used, so for now, just paste in fortran code as a comment // Probably not used, so for now, just paste in fortran code as a comment
...@@ -262,9 +262,9 @@ Int_t THcHallCSpectrometer::ReadDatabase( const TDatime& date ) ...@@ -262,9 +262,9 @@ Int_t THcHallCSpectrometer::ReadDatabase( const TDatime& date )
// Read in reconstruction coefficients and exponents // Read in reconstruction coefficients and exponents
line=" "; line=" ";
good = getline(ifile,line).good(); good = getline(ifile,line).good();
cout << line << endl; // cout << line << endl;
fNReconTerms = 0; fNReconTerms = 0;
cout << "Reading matrix elements" << endl; //cout << "Reading matrix elements" << endl;
while(good && line.compare(0,4," ---")!=0) { while(good && line.compare(0,4," ---")!=0) {
if(fNReconTerms >= fMaxReconElements) { if(fNReconTerms >= fMaxReconElements) {
Error(here, "too much data in reconstruction coefficient file %s",reconCoeffFilename.c_str()); Error(here, "too much data in reconstruction coefficient file %s",reconCoeffFilename.c_str());
...@@ -283,8 +283,9 @@ Int_t THcHallCSpectrometer::ReadDatabase( const TDatime& date ) ...@@ -283,8 +283,9 @@ Int_t THcHallCSpectrometer::ReadDatabase( const TDatime& date )
fNReconTerms++; fNReconTerms++;
good = getline(ifile,line).good(); good = getline(ifile,line).good();
} }
cout << "Read " << fNReconTerms << " matrix element terms" << endl;
if(!good) { if(!good) {
Error(here, "error processing reconstruction coefficient file %s",reconCoeffFilename.c_str()); Error(here, "Error processing reconstruction coefficient file %s",reconCoeffFilename.c_str());
return kInitError; // Is this the right return code? return kInitError; // Is this the right return code?
} }
......
...@@ -86,8 +86,8 @@ THcInterface::THcInterface( const char* appClassName, int* argc, char** argv, ...@@ -86,8 +86,8 @@ THcInterface::THcInterface( const char* appClassName, int* argc, char** argv,
// gHaDB = new THaFileDB(); // gHaDB = new THaFileDB();
gHaTextvars = new THaTextvars; gHaTextvars = new THaTextvars;
cout << "In THcInterface ... " << endl; // cout << "In THcInterface ... " << endl;
cout << "Decoder => " << gHaDecoder << endl; // cout << "Decoder => " << gHaDecoder << endl;
// Set the maximum size for a file written by Podd contained by the TTree // Set the maximum size for a file written by Podd contained by the TTree
// putting it to 1.5 GB, down from the default 1.9 GB since something odd // putting it to 1.5 GB, down from the default 1.9 GB since something odd
......
...@@ -61,7 +61,7 @@ void THcParmList::Load( const char* fname, Int_t RunNumber ) ...@@ -61,7 +61,7 @@ void THcParmList::Load( const char* fname, Int_t RunNumber )
Int_t nfiles=0; Int_t nfiles=0;
ifiles[nfiles].open(fname); ifiles[nfiles].open(fname);
if(ifiles[nfiles].is_open()) { if(ifiles[nfiles].is_open()) {
cout << nfiles << ": " << "Opened \"" << fname << "\"" << endl; cout << "Opening parameter file: [" << nfiles << "] " << fname << endl;
nfiles++; nfiles++;
} }
...@@ -94,7 +94,7 @@ void THcParmList::Load( const char* fname, Int_t RunNumber ) ...@@ -94,7 +94,7 @@ void THcParmList::Load( const char* fname, Int_t RunNumber )
if(!getline(ifiles[nfiles-1],line)) { if(!getline(ifiles[nfiles-1],line)) {
ifiles[nfiles-1].close(); ifiles[nfiles-1].close();
nfiles--; nfiles--;
cout << nfiles << ": " << "Closed" << endl; // cout << nfiles << ": " << "Closed" << endl;
continue; continue;
} }
// Look for include statement // Look for include statement
...@@ -112,10 +112,10 @@ void THcParmList::Load( const char* fname, Int_t RunNumber ) ...@@ -112,10 +112,10 @@ void THcParmList::Load( const char* fname, Int_t RunNumber )
} else { } else {
line.erase(line.find_first_of(whtspc)); line.erase(line.find_first_of(whtspc));
} }
cout << line << endl; // cout << line << endl;
ifiles[nfiles].open(line.c_str()); ifiles[nfiles].open(line.c_str());
if(ifiles[nfiles].is_open()) { if(ifiles[nfiles].is_open()) {
cout << nfiles << ": " << "Opened \"" << line << "\"" << endl; cout << "Opening parameter file: [" << nfiles << "] " << line << endl;
nfiles++; nfiles++;
} }
continue; continue;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment