From 3830229ac0db5dc5a0d10655a35946c8df379db2 Mon Sep 17 00:00:00 2001 From: nemu Date: Thu, 22 Mar 2012 14:23:43 +0000 Subject: [PATCH] fixed some double/int inconsistencies --- src/classes/PRunAsymmetry.cpp | 4 ++-- src/classes/PRunDataHandler.cpp | 6 +++--- src/classes/PRunSingleHisto.cpp | 14 +++++++------- src/musrt0.cpp | 32 ++++++++++++++++---------------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/classes/PRunAsymmetry.cpp b/src/classes/PRunAsymmetry.cpp index d67174f1..6b301e90 100644 --- a/src/classes/PRunAsymmetry.cpp +++ b/src/classes/PRunAsymmetry.cpp @@ -617,7 +617,7 @@ Bool_t PRunAsymmetry::PrepareData() for (UInt_t j=0; jGetDataBin(forwardHistoNo[i])->size(); j++) { // loop over the bin indices // make sure that the index stays within proper range if ((j+fT0s[2*i]-fT0s[0] >= 0) && (j+fT0s[2*i]-fT0s[0] < runData->GetDataBin(forwardHistoNo[i])->size())) { - fForward[j] += forward[i][j+fT0s[2*i]-fT0s[0]]; + fForward[j] += forward[i][j+(Int_t)fT0s[2*i]-(Int_t)fT0s[0]]; } } } @@ -627,7 +627,7 @@ Bool_t PRunAsymmetry::PrepareData() for (UInt_t j=0; jGetDataBin(backwardHistoNo[i])->size(); j++) { // loop over the bin indices // make sure that the index stays within proper range if ((j+fT0s[2*i+1]-fT0s[1] >= 0) && (j+fT0s[2*i+1]-fT0s[1] < runData->GetDataBin(backwardHistoNo[i])->size())) { - fBackward[j] += backward[i][j+fT0s[2*i+1]-fT0s[1]]; + fBackward[j] += backward[i][j+(Int_t)fT0s[2*i+1]-(Int_t)fT0s[1]]; } } } diff --git a/src/classes/PRunDataHandler.cpp b/src/classes/PRunDataHandler.cpp index 26ee1796..3fd2f76d 100644 --- a/src/classes/PRunDataHandler.cpp +++ b/src/classes/PRunDataHandler.cpp @@ -1317,7 +1317,7 @@ Bool_t PRunDataHandler::ReadRootFile() dataSet.SetHistoNo(i+1); dataSet.SetTimeZeroBin(t0[i]); dataSet.SetTimeZeroBinEstimated(histo->GetMaximumBin()); - dataSet.SetFirstGoodBin(t0[i]); + dataSet.SetFirstGoodBin((Int_t)t0[i]); dataSet.SetLastGoodBin(histo->GetNbinsX()-1); dataSet.SetData(histoData); runData.SetDataSet(dataSet); @@ -1352,7 +1352,7 @@ Bool_t PRunDataHandler::ReadRootFile() dataSet.SetHistoNo(i+1+POST_PILEUP_HISTO_OFFSET); dataSet.SetTimeZeroBin(t0[i]); dataSet.SetTimeZeroBinEstimated(histo->GetMaximumBin()); - dataSet.SetFirstGoodBin(t0[i]); + dataSet.SetFirstGoodBin((Int_t)t0[i]); dataSet.SetLastGoodBin(histo->GetNbinsX()-1); dataSet.SetData(histoData); runData.SetDataSet(dataSet); @@ -5073,7 +5073,7 @@ Bool_t PRunDataHandler::WritePsiBinFile(TString fln) length = dataSet->GetData()->size(); histos[i].resize(length); for (UInt_t j=0; jGetData()->at(j); + histos[i][j] = (Int_t)dataSet->GetData()->at(j); } } } else { // rebin > 1 diff --git a/src/classes/PRunSingleHisto.cpp b/src/classes/PRunSingleHisto.cpp index 95567798..2cd11179 100644 --- a/src/classes/PRunSingleHisto.cpp +++ b/src/classes/PRunSingleHisto.cpp @@ -663,7 +663,7 @@ Bool_t PRunSingleHisto::PrepareData() for (UInt_t j=0; jGetDataBin(histoNo[i])->size(); j++) { // loop over the bin indices // make sure that the index stays within proper range if ((j+fT0s[i]-fT0s[0] >= 0) && (j+fT0s[i]-fT0s[0] < runData->GetDataBin(histoNo[i])->size())) { - fForward[j] += forward[i][j+fT0s[i]-fT0s[0]]; + fForward[j] += forward[i][j+(Int_t)fT0s[i]-(Int_t)fT0s[0]]; } } } @@ -719,7 +719,7 @@ Bool_t PRunSingleHisto::PrepareFitData(PRawRunData* runData, const UInt_t histoN // check if data range has been provided, and if not try to estimate them if (start < 0) { Int_t offset = (Int_t)(10.0e-3/fTimeResolution); - start = fT0s[0]+offset; + start = (Int_t)fT0s[0]+offset; fRunInfo->SetDataRange(start, 0); cerr << endl << ">> PRunSingleHisto::PrepareData(): **WARNING** data range was not provided, will try data range start = t0+" << offset << "(=10ns) = " << start << "."; cerr << endl << ">> NO WARRANTY THAT THIS DOES MAKE ANY SENSE."; @@ -778,7 +778,7 @@ Bool_t PRunSingleHisto::PrepareFitData(PRawRunData* runData, const UInt_t histoN } // everything looks fine, hence fill data set - Int_t t0 = fT0s[0]; + Int_t t0 = (Int_t)fT0s[0]; Double_t value = 0.0; Double_t normalizer = 1.0; // in order that after rebinning the fit does not need to be redone (important for plots) @@ -861,7 +861,7 @@ Bool_t PRunSingleHisto::PrepareRawViewData(PRawRunData* runData, const UInt_t hi // check if data range has been provided, and if not try to estimate them if (start < 0) { Int_t offset = (Int_t)(10.0e-3/fTimeResolution); - start = (fT0s[0]+offset) - ((fT0s[0]+offset)/packing)*packing; + start = ((Int_t)fT0s[0]+offset) - (((Int_t)fT0s[0]+offset)/packing)*packing; end = start + ((fForward.size()-start)/packing)*packing; cerr << endl << ">> PRunSingleHisto::PrepareData(): **WARNING** data range was not provided, will try data range start = " << start << "."; cerr << endl << ">> NO WARRANTY THAT THIS DOES MAKE ANY SENSE."; @@ -888,7 +888,7 @@ Bool_t PRunSingleHisto::PrepareRawViewData(PRawRunData* runData, const UInt_t hi } // everything looks fine, hence fill data set - Int_t t0 = fT0s[0]; + Int_t t0 = (Int_t)fT0s[0]; Double_t value = 0.0; // data start at data_start-t0 // time shifted so that packing is included correctly, i.e. t0 == t0 after packing @@ -1047,7 +1047,7 @@ Bool_t PRunSingleHisto::PrepareViewData(PRawRunData* runData, const UInt_t histo // transform raw histo data. This is done the following way (for details see the manual): // for the single histo fit, just the rebinned raw data are copied // first get start data, end data, and t0 - Int_t t0 = fT0s[0]; + Int_t t0 = (Int_t)fT0s[0]; // start = the first bin which is a multiple of packing backward from first good data bin Int_t start = fRunInfo->GetDataRange(0) - (fRunInfo->GetDataRange(0)/packing)*packing; @@ -1057,7 +1057,7 @@ Bool_t PRunSingleHisto::PrepareViewData(PRawRunData* runData, const UInt_t histo // check if data range has been provided, and if not try to estimate them if (start < 0) { Int_t offset = (Int_t)(10.0e-3/fTimeResolution); - start = (fT0s[0]+offset) - ((fT0s[0]+offset)/packing)*packing; + start = ((Int_t)fT0s[0]+offset) - (((Int_t)fT0s[0]+offset)/packing)*packing; end = start + ((fForward.size()-start)/packing)*packing; cerr << endl << ">> PRunSingleHisto::PrepareData(): **WARNING** data range was not provided, will try data range start = " << start << "."; cerr << endl << ">> NO WARRANTY THAT THIS DOES MAKE ANY SENSE."; diff --git a/src/musrt0.cpp b/src/musrt0.cpp index 397f0740..75b4d025 100644 --- a/src/musrt0.cpp +++ b/src/musrt0.cpp @@ -649,7 +649,7 @@ Int_t main(Int_t argc, Char_t *argv[]) musrT0Data.SetRawRunData(rawRunData); // feed data t0 if present if (rawRunData[0]->IsPresent(runList->at(i).GetForwardHistoNo(0))) { - musrT0Data.SetT0BinData(rawRunData[0]->GetT0Bin(runList->at(i).GetForwardHistoNo(0))); + musrT0Data.SetT0BinData((UInt_t)rawRunData[0]->GetT0Bin(runList->at(i).GetForwardHistoNo(0))); } musrT0Data.SetRunNo(i); musrT0Data.SetAddRunIdx(0); // no addruns @@ -683,7 +683,7 @@ Int_t main(Int_t argc, Char_t *argv[]) for (UInt_t j=0; jat(i).GetRunNameSize(); j++) { // feed data t0 if present if (rawRunData[j]->IsPresent(runList->at(i).GetForwardHistoNo(0))) { - musrT0Data.SetT0BinData(rawRunData[j]->GetT0Bin(runList->at(i).GetForwardHistoNo(0))); + musrT0Data.SetT0BinData((UInt_t)rawRunData[j]->GetT0Bin(runList->at(i).GetForwardHistoNo(0))); } // feed necessary data musrT0Data.SetAddRunIdx(j); // addruns @@ -710,7 +710,7 @@ Int_t main(Int_t argc, Char_t *argv[]) for (UInt_t j=0; jat(i).GetForwardHistoNoSize(); j++) { // feed data t0 if present if (rawRunData[0]->IsPresent(runList->at(i).GetForwardHistoNo(j))) { - musrT0Data.SetT0BinData(rawRunData[0]->GetT0Bin(runList->at(i).GetForwardHistoNo(j))); + musrT0Data.SetT0BinData((UInt_t)rawRunData[0]->GetT0Bin(runList->at(i).GetForwardHistoNo(j))); } // feed necessary data musrT0Data.SetHistoNoIdx(j); @@ -739,7 +739,7 @@ Int_t main(Int_t argc, Char_t *argv[]) for (UInt_t k=0; kat(i).GetForwardHistoNoSize(); k++) { // forward histo grouping // feed data t0 if present if (rawRunData[j]->IsPresent(runList->at(i).GetForwardHistoNo(k))) { - musrT0Data.SetT0BinData(rawRunData[j]->GetT0Bin(runList->at(i).GetForwardHistoNo(k))); + musrT0Data.SetT0BinData((UInt_t)rawRunData[j]->GetT0Bin(runList->at(i).GetForwardHistoNo(k))); } // feed necessary data musrT0Data.SetHistoNoIdx(k); @@ -754,9 +754,9 @@ Int_t main(Int_t argc, Char_t *argv[]) musrT0Data.SetCmdTag(PMUSRT0_GET_DATA_AND_BKG_RANGE); // feed all t0's for (UInt_t j=0; jat(i).GetT0BinSize(); j++) { - musrT0Data.SetT0Bin(runList->at(i).GetT0Bin(j), j); + musrT0Data.SetT0Bin((UInt_t)runList->at(i).GetT0Bin(j), j); for (UInt_t k=0; kat(i).GetAddT0BinEntries(); k++) { - musrT0Data.SetAddT0Bin(runList->at(i).GetAddT0Bin(k, j), k, j); + musrT0Data.SetAddT0Bin((UInt_t)runList->at(i).GetAddT0Bin(k, j), k, j); } } if (!musrt0_item(app, msrHandler, musrT0Data, 0)) { @@ -775,7 +775,7 @@ Int_t main(Int_t argc, Char_t *argv[]) musrT0Data.SetRawRunData(rawRunData); // feed data t0 if present if (rawRunData[0]->IsPresent(runList->at(i).GetForwardHistoNo(0))) { - musrT0Data.SetT0BinData(rawRunData[0]->GetT0Bin(runList->at(i).GetForwardHistoNo(0))); + musrT0Data.SetT0BinData((UInt_t)rawRunData[0]->GetT0Bin(runList->at(i).GetForwardHistoNo(0))); } musrT0Data.SetRunNo(i); musrT0Data.SetAddRunIdx(0); // no addruns @@ -798,7 +798,7 @@ Int_t main(Int_t argc, Char_t *argv[]) musrT0Data.SetRawRunData(rawRunData); // feed data t0 if present if (rawRunData[0]->IsPresent(runList->at(i).GetForwardHistoNo(0))) { - musrT0Data.SetT0BinData(rawRunData[0]->GetT0Bin(runList->at(i).GetForwardHistoNo(0))); + musrT0Data.SetT0BinData((UInt_t)rawRunData[0]->GetT0Bin(runList->at(i).GetForwardHistoNo(0))); } musrT0Data.SetRunNo(i); musrT0Data.SetAddRunIdx(0); // no addruns @@ -833,7 +833,7 @@ Int_t main(Int_t argc, Char_t *argv[]) for (UInt_t j=0; jat(i).GetRunNameSize(); j++) { // feed data t0 if present if (rawRunData[j]->IsPresent(runList->at(i).GetForwardHistoNo(0))) { - musrT0Data.SetT0BinData(rawRunData[j]->GetT0Bin(runList->at(i).GetForwardHistoNo(0))); + musrT0Data.SetT0BinData((UInt_t)rawRunData[j]->GetT0Bin(runList->at(i).GetForwardHistoNo(0))); } // feed necessary data musrT0Data.SetAddRunIdx(j); // addruns @@ -859,7 +859,7 @@ Int_t main(Int_t argc, Char_t *argv[]) for (UInt_t j=0; jat(i).GetRunNameSize(); j++) { // feed data t0 if present if (rawRunData[j]->IsPresent(runList->at(i).GetForwardHistoNo(0))) { - musrT0Data.SetT0BinData(rawRunData[j]->GetT0Bin(runList->at(i).GetForwardHistoNo(0))); + musrT0Data.SetT0BinData((UInt_t)rawRunData[j]->GetT0Bin(runList->at(i).GetForwardHistoNo(0))); } // feed necessary data musrT0Data.SetAddRunIdx(j); // addruns @@ -886,7 +886,7 @@ Int_t main(Int_t argc, Char_t *argv[]) for (UInt_t j=0; jat(i).GetForwardHistoNoSize(); j++) { // feed data t0 if present if (rawRunData[0]->IsPresent(runList->at(i).GetForwardHistoNo(j))) { - musrT0Data.SetT0BinData(rawRunData[0]->GetT0Bin(runList->at(i).GetForwardHistoNo(j))); + musrT0Data.SetT0BinData((UInt_t)rawRunData[0]->GetT0Bin(runList->at(i).GetForwardHistoNo(j))); } // feed necessary data musrT0Data.SetHistoNoIdx(j); @@ -912,7 +912,7 @@ Int_t main(Int_t argc, Char_t *argv[]) for (UInt_t j=0; jat(i).GetBackwardHistoNoSize(); j++) { // feed data t0 if present if (rawRunData[0]->IsPresent(runList->at(i).GetForwardHistoNo(j))) { - musrT0Data.SetT0BinData(rawRunData[0]->GetT0Bin(runList->at(i).GetForwardHistoNo(j))); + musrT0Data.SetT0BinData((UInt_t)rawRunData[0]->GetT0Bin(runList->at(i).GetForwardHistoNo(j))); } // feed necessary data musrT0Data.SetHistoNoIdx(j); @@ -941,7 +941,7 @@ Int_t main(Int_t argc, Char_t *argv[]) for (UInt_t k=0; kat(i).GetForwardHistoNoSize(); k++) { // forward histo grouping // feed data t0 if present if (rawRunData[j]->IsPresent(runList->at(i).GetForwardHistoNo(k))) { - musrT0Data.SetT0BinData(rawRunData[j]->GetT0Bin(runList->at(i).GetForwardHistoNo(k))); + musrT0Data.SetT0BinData((UInt_t)rawRunData[j]->GetT0Bin(runList->at(i).GetForwardHistoNo(k))); } // feed necessary data musrT0Data.SetHistoNoIdx(k); @@ -970,7 +970,7 @@ Int_t main(Int_t argc, Char_t *argv[]) for (UInt_t k=0; kat(i).GetBackwardHistoNoSize(); k++) { // backward histo grouping // feed data t0 if present if (rawRunData[j]->IsPresent(runList->at(i).GetForwardHistoNo(k))) { - musrT0Data.SetT0BinData(rawRunData[j]->GetT0Bin(runList->at(i).GetForwardHistoNo(k))); + musrT0Data.SetT0BinData((UInt_t)rawRunData[j]->GetT0Bin(runList->at(i).GetForwardHistoNo(k))); } // feed necessary data musrT0Data.SetHistoNoIdx(k); @@ -985,9 +985,9 @@ Int_t main(Int_t argc, Char_t *argv[]) musrT0Data.SetCmdTag(PMUSRT0_GET_DATA_AND_BKG_RANGE); // feed all t0's for (UInt_t j=0; jat(i).GetT0BinSize(); j++) { - musrT0Data.SetT0Bin(runList->at(i).GetT0Bin(j), j); + musrT0Data.SetT0Bin((UInt_t)runList->at(i).GetT0Bin(j), j); for (UInt_t k=0; kat(i).GetAddT0BinEntries(); k++) { - musrT0Data.SetAddT0Bin(runList->at(i).GetAddT0Bin(k, j), k, j); + musrT0Data.SetAddT0Bin((UInt_t)runList->at(i).GetAddT0Bin(k, j), k, j); } } musrT0Data.SetHistoNo(forwardHistos);