Changeset 1315 for trunk/source/geometry/magneticfield
- Timestamp:
- Jun 18, 2010, 11:42:07 AM (14 years ago)
- Location:
- trunk/source/geometry/magneticfield
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/geometry/magneticfield/History
r1231 r1315 1 $Id: History,v 1.14 7 2009/11/12 18:45:02japost Exp $1 $Id: History,v 1.146 2009/11/12 15:05:49 japost Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 18 18 ---------------------------------------------------------- 19 19 20 Nov 12th, 2009 J.Apostolakis - field-V09-02-0921 -----------------------------22 - G4MagIntegratorDriver: Activate Peter Gumplinger's check on integration23 error for spin.24 25 20 Nov 12th, 2009 J.Apostolakis - field-V09-02-08 26 ----------------------------- (fix only)21 ----------------------------- 27 22 - G4Nystrom: Corrected interface method getField: array now has explicit dimension[4] 28 23 (Problem found by gcc 4.3 - it checked indices used in inline method! ) -
trunk/source/geometry/magneticfield/src/G4MagIntegratorDriver.cc
r1231 r1315 25 25 // 26 26 // 27 // $Id: G4MagIntegratorDriver.cc,v 1.5 6 2009/11/12 18:41:03 japost Exp $28 // GEANT4 tag $Name: $27 // $Id: G4MagIntegratorDriver.cc,v 1.53 2009/11/05 22:31:43 japost Exp $ 28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $ 29 29 // 30 30 // … … 208 208 209 209 #ifdef G4DEBUG_FIELD 210 G4double xSubStepStart= x;211 210 for (i=0;i<nvar;i++) { ySubStepStart[i] = y[i]; } 212 211 yFldTrkStart.LoadFromArray(y, fNoIntegrationVariables); … … 228 227 lastStepSucceeded= (hdid == h); 229 228 #ifdef G4DEBUG_FIELD 230 if (dbg>2) { 231 PrintStatus( ySubStepStart, xSubStepStart, y, x, h, nstp); // Only 229 if (dbg>2) 230 { 231 PrintStatus( ySubStepStart, xSubStart, y, x, h, nstp); // Only 232 232 } 233 233 #endif … … 291 291 { 292 292 if( nstp==nStpPr ) { G4cout << "***** Many steps ****" << G4endl; } 293 G4cout << "MagIntDrv: " ;294 293 G4cout << "hdid=" << std::setw(12) << hdid << " " 295 << "hnext=" << std::setw(12) << hnext << " " 296 << "hstep=" << std::setw(12) << hstep << " (requested) " 297 << G4endl; 294 << "hnext=" << std::setw(12) << hnext << " " << G4endl; 298 295 PrintStatus( ystart, x1, y, x, h, (nstp==nStpPr) ? -nstp: nstp); 299 296 } … … 372 369 lastStep = true; 373 370 #ifdef G4DEBUG_FIELD 374 if (dbg >2)371 if (dbg) 375 372 { 376 int prec= G4cout.precision(12);377 373 G4cout << "Warning: G4MagIntegratorDriver::AccurateAdvance" 378 374 << G4endl 379 375 << " Integration step 'h' became " 380 << h << " due to roundoff. " << G4endl 381 << " Calculated as difference of x2= "<< x2 << " and x=" << x 376 << h << " due to roundoff " << G4endl 382 377 << " Forcing termination of advance." << G4endl; 383 G4cout.precision(prec);384 378 } 385 379 #endif … … 587 581 / ( sqr(y[9]) + sqr(y[10]) + sqr(y[11]) ); 588 582 errspin_sq *= inv_eps_vel_sq; 589 errmax_sq = std::max( errmax_sq, errspin_sq ); 590 } 583 } 591 584 592 585 if ( errmax_sq <= 1.0 ) { break; } // Step succeeded.
Note: See TracChangeset
for help on using the changeset viewer.