From 511089a74ba4a0a41a3edfdc6c60280e14060fc7 Mon Sep 17 00:00:00 2001
From: Rene Brun <Rene.Brun@cern.ch>
Date: Thu, 15 Jun 2006 10:38:22 +0000
Subject: [PATCH] Change reference values to take into account the change in
TRandom3
git-svn-id: http://root.cern.ch/svn/root/trunk@15441 27541ba8-7e3a-0410-8455-c3a389f83636
---
test/stress.cxx | 7 ++++---
test/stressGeom.cxx | 18 +++++++++---------
test/stressSpectrum.cxx | 18 +++++++++---------
3 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/test/stress.cxx b/test/stress.cxx
index 3ad9707fcb0..196026bdafb 100644
--- a/test/stress.cxx
+++ b/test/stress.cxx
@@ -1,4 +1,4 @@
-// @(#)root/test:$Name: $:$Id: stress.cxx,v 1.62 2005/06/03 07:37:06 brun Exp $
+// @(#)root/test:$Name: $:$Id: stress.cxx,v 1.63 2006/05/06 16:33:25 brun Exp $
// Author: Rene Brun 05/11/98
/////////////////////////////////////////////////////////////////
@@ -404,7 +404,7 @@ void stress4()
ntotout += f.GetBytesWritten();
//Compare results of fit with expected parameters
- Double_t th0=393.396, th5=614.03, th10=157.775;
+ Double_t th0=395.085, th5=620.957, th10=151.308;
Double_t dp0 = TMath::Abs((f2form->GetParameter(0) -th0)/th0);
Double_t dp5 = TMath::Abs((f2form->GetParameter(5) -th5)/th5);
Double_t dp10 = TMath::Abs((f2form->GetParameter(10)-th10)/th10);
@@ -414,6 +414,7 @@ void stress4()
else {
printf("failed\n");
printf("%-8s dp0=%g, dp5=%g, dp10=%g\n"," ",dp0,dp5,dp10);
+ printf("%-8s p0=%g, p5=%g, p10=%g\n"," ",f2form->GetParameter(0),f2form->GetParameter(5),f2form->GetParameter(10));
}
if (gPrintSubBench) { printf("Test 4 : "); gBenchmark->Show("stress");gBenchmark->Start("stress"); }
}
@@ -607,7 +608,7 @@ void stress7()
TH2F *hpxpy = new TH2F("hpxpy","px vx py with cutg",40,-4,4,40,-4,4);
ntuple->Draw("px:py>>hpxpy","cutg","goff");
Int_t npxpy = (Int_t)hpxpy->GetEntries();
- Int_t npxpyGood = 27902;
+ Int_t npxpyGood = 27918;
hpxpy->Write();
cutg->Write();
diff --git a/test/stressGeom.cxx b/test/stressGeom.cxx
index f528a339f19..546a7e57622 100644
--- a/test/stressGeom.cxx
+++ b/test/stressGeom.cxx
@@ -37,9 +37,9 @@ int main(int argc, char **argv)
void sample_volume(Int_t ivol)
{
- const Double_t vshape[16] = {40000.00, 36037.92, 40064.00, 48065.49, 28503.81,
- 8725.26, 42433.05, 9833.21, 12576.32, 65034.20, 37765.44, 23507.97,
- 25608.06, 18400.86, 50088.71, 47866.73};
+ const Double_t vshape[16] = {40000.0, 36028.3, 39978.70, 48001.3, 28481.2,
+ 8726.2, 42345.4, 9808.2, 12566.8, 64655.6, 37730.4, 23579.7,
+ 25559.5, 18418.3, 49960.2, 47771.1};
gRandom = new TRandom3();
TGeoVolume *vol = (TGeoVolume*)gGeoManager->GetListOfVolumes()->At(ivol);
TGeoShape *shape = vol->GetShape();
@@ -73,12 +73,12 @@ void sample_volume(Int_t ivol)
void length()
{
- const Double_t rms[16] = {6.25645, 10.7523, 9.5286, 14.011, 11.5621,
- 5.91477, 7.83918, 5.5406, 7.34634, 5.68608, 6.57027, 5.28381,
- 7.0067, 3.50071, 18.8318, 15.3187};
- const Double_t mean[16] = {19.3138, 22.7942, 17.975, 21.9554, 23.4203,
- 16.5027, 14.8842, 9.43152, 12.1661, 8.99384, 9.47465, 7.59458,
- 8.69, 6.70654, 28.1409, 25.7952};
+ const Double_t rms[16] = {6.284, 10.79, 9.545, 14.15, 11.45,
+ 5.871, 7.673, 5.935, 7.61, 5.334, 6.581, 4.954,
+ 7.718, 3.238, 19.09, 14.77};
+ const Double_t mean[16] = {19.34, 22.53, 18.87, 21.95, 23.29,
+ 16.73, 15.09, 9.516, 12.68, 8.852, 9.518, 7.432,
+ 8.881, 6.489, 28.29, 26.05};
TObjArray *vlist = gGeoManager->GetListOfVolumes();
TGeoVolume *volume;
Int_t nvolumes = vlist->GetEntriesFast();
diff --git a/test/stressSpectrum.cxx b/test/stressSpectrum.cxx
index be1f81d922c..a220afd255c 100644
--- a/test/stressSpectrum.cxx
+++ b/test/stressSpectrum.cxx
@@ -35,8 +35,8 @@
//****************************************************************************
//* Starting stress S P E C T R U M *
//****************************************************************************
-//Peak1 : found = 62.52/ 68.94, good = 66.64/ 67.11, ghost = 6.52/ 8.56,--- OK
-//Peak2 : found =173/300, good =173, ghost =7,----------------------------- OK
+//Peak1 : found = 70.21/ 73.75, good = 65.03/ 68.60, ghost = 8.54/ 8.39,--- OK
+//Peak2 : found =163/300, good =163, ghost =8,---------------------------- OK
//****************************************************************************
//stressSpectrum: Real Time = 19.86 seconds Cpu Time = 19.04 seconds
//****************************************************************************
@@ -157,9 +157,9 @@ void stress1(Int_t ntimes) {
Double_t ep2 = hgood->GetFunction("gaus")->GetParError(1);
Double_t p3 = hghost->GetFunction("gaus")->GetParameter(1);
Double_t ep3 = hghost->GetFunction("gaus")->GetParError(1);
- Double_t p1ref = 73.75; //ref numbers obtained with ntimes=1000
- Double_t p2ref = 68.60;
- Double_t p3ref = 8.39;
+ Double_t p1ref = 70.21; //ref numbers obtained with ntimes=1000
+ Double_t p2ref = 65.03;
+ Double_t p3ref = 8.54;
//printf("p1=%g+-%g, p2=%g+-%g, p3=%g+-%g\n",p1,ep1,p2,ep2,p3,ep3);
@@ -231,16 +231,16 @@ void stress2(Int_t np2) {
delete s;
delete f2;
delete h2;
- Int_t nfoundRef = 165;
- Int_t ngoodRef = 165;
- Int_t nghostRef = 12;
+ Int_t nfoundRef = 163;
+ Int_t ngoodRef = 163;
+ Int_t nghostRef = 8;
char sok[20];
if (nfound == nfoundRef && ngood == ngoodRef && nghost == nghostRef) {
sprintf(sok,"OK");
} else {
sprintf(sok,"failed");
}
- printf("Peak2 : found =%d/%d, good =%d, ghost =%d,---------------------------- %s\n",
+ printf("Peak2 : found =%d/%d, good =%d, ghost =%2d,---------------------------- %s\n",
nfound,npeaks,ngood,nghost,sok);
}
--
GitLab