- Timestamp:
- Jan 8, 2010, 11:56:51 AM (15 years ago)
- Location:
- trunk/source/processes/hadronic/models/chiral_inv_phase_space/fragmentation
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/processes/hadronic/models/chiral_inv_phase_space/fragmentation/History
r1199 r1228 17 17 ----------------------------------------------------------------- 18 18 19 1-Dec-2009 M.Kosov (hadr-chips-V09-02-29) 20 ----------------------------------------------------------------------- 21 Mutual tag: Compilation warning fix in G4QFragmentation and G4QIonIonCollision 22 19 23 17-Nov-2009 M.Kosov (hadr-chips-V09-02-24) 20 24 ----------------------------------------------------------------------- -
trunk/source/processes/hadronic/models/chiral_inv_phase_space/fragmentation/include/G4QFragmentation.hh
r1199 r1228 26 26 // 27 27 // $Id: G4QFragmentation.hh,v 1.1 2009/11/16 18:16:04 mkossov Exp $ 28 // GEANT4 tag $Name: geant4-09-03 -cand-01$28 // GEANT4 tag $Name: geant4-09-03 $ 29 29 // 30 30 // ----------------------------------------------------------------------------- -
trunk/source/processes/hadronic/models/chiral_inv_phase_space/fragmentation/include/G4QIonIonCollision.hh
r1199 r1228 26 26 // 27 27 // $Id: G4QIonIonCollision.hh,v 1.1 2009/11/16 18:16:04 mkossov Exp $ 28 // GEANT4 tag $Name: geant4-09-03 -cand-01$28 // GEANT4 tag $Name: geant4-09-03 $ 29 29 // 30 30 // ----------------------------------------------------------------------------- -
trunk/source/processes/hadronic/models/chiral_inv_phase_space/fragmentation/src/G4QFragmentation.cc
r1199 r1228 16 16 // * for the full disclaimer and the limitation of liability. * 17 17 // * * 18 // * This code implementation is the result of the scientific 2and *18 // * This code implementation is the result of the scientific and * 19 19 // * technical work of the GEANT4 collaboration. * 20 20 // * By using, copying, modifying or distributing the software (or * … … 25 25 // 26 26 // 27 // $Id: G4QFragmentation.cc,v 1. 1 2009/11/16 18:16:04 mkossovExp $28 // GEANT4 tag $Name: geant4-09-03 -cand-01$27 // $Id: G4QFragmentation.cc,v 1.6 2009/12/16 17:51:03 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-03 $ 29 29 // 30 30 // ----------------------------------------------------------------------------- … … 53 53 54 54 // Definition of static parameters 55 G4int G4QFragmentation::nCutMax=7; 56 G4double G4QFragmentation::stringTension=1. *GeV/fermi;57 G4double G4QFragmentation::tubeDensity =1. /fermi;58 // Parameters of diffractional fragmentation 59 G4double G4QFragmentation::widthOfPtSquare=- 0.72*GeV*GeV;// pt -width2 forStringExcitation55 G4int G4QFragmentation::nCutMax=7; 56 G4double G4QFragmentation::stringTension=1.5*GeV/fermi; 57 G4double G4QFragmentation::tubeDensity =1.5/fermi; 58 // Parameters of diffractional fragmentation (was .72*) 59 G4double G4QFragmentation::widthOfPtSquare=-GeV*GeV;// pt -width2 forStringExcitation 60 60 61 61 G4QFragmentation::G4QFragmentation(const G4QNucleus &aNucleus, const G4QHadron &aPrimary) … … 551 551 // >>>>>>>> make soft collisions (ordering is vital) 552 552 // 553 G4QInteractionVector::iterator i ;553 G4QInteractionVector::iterator it; 554 554 #ifdef debug 555 555 G4cout<<"G4QFragmentation::Construct: Creation ofSoftCollisionPartonPair STARTS"<<G4endl; 556 556 #endif 557 for(i = theInteractions.begin(); i != theInteractions.end(); i++)558 { 559 G4QInteraction* anIniteraction = *i ;557 for(it = theInteractions.begin(); it != theInteractions.end(); ++it) 558 { 559 G4QInteraction* anIniteraction = *it; 560 560 G4QPartonPair* aPair=0; 561 561 G4int nSoftCollisions = anIniteraction->GetNumberOfSoftCollisions(); … … 581 581 #endif 582 582 } 583 delete *i ;584 i =theInteractions.erase(i);// Soft interactions are converted & erased585 i --;583 delete *it; 584 it=theInteractions.erase(it); // Soft interactions are converted & erased 585 it--; 586 586 } 587 587 } -
trunk/source/processes/hadronic/models/chiral_inv_phase_space/fragmentation/src/G4QIonIonCollision.cc
r1199 r1228 25 25 // 26 26 // 27 // $Id: G4QIonIonCollision.cc,v 1. 1 2009/11/16 18:16:04 mkossov Exp $28 // GEANT4 tag $Name: geant4-09-03 -cand-01$27 // $Id: G4QIonIonCollision.cc,v 1.2 2009/12/01 09:24:24 mkossov Exp $ 28 // GEANT4 tag $Name: geant4-09-03 $ 29 29 // 30 30 // ----------------------------------------------------------------------------- … … 454 454 // >>>>>>>> make soft collisions (ordering is vital) 455 455 // 456 G4QInteractionVector::iterator i ;456 G4QInteractionVector::iterator it; 457 457 #ifdef debug 458 458 G4cout<<"G4QIonIonCollision::Constr: Creation ofSoftCollisionPartonPair STARTS"<<G4endl; 459 459 #endif 460 for(i = theInteractions.begin(); i != theInteractions.end(); i++)461 { 462 G4QInteraction* anIniteraction = *i ;460 for(it = theInteractions.begin(); it != theInteractions.end(); ++it) 461 { 462 G4QInteraction* anIniteraction = *it; 463 463 G4QPartonPair* aPair=0; 464 464 G4int nSoftCollisions = anIniteraction->GetNumberOfSoftCollisions(); … … 484 484 #endif 485 485 } 486 delete *i ;487 i =theInteractions.erase(i);// SoftInteractions're converted&erased488 i --;486 delete *it; 487 it=theInteractions.erase(it); // SoftInteractions're converted&erased 488 it--; 489 489 } 490 490 }
Note: See TracChangeset
for help on using the changeset viewer.