Changeset 1337 for trunk/examples/extended/analysis/A01/src
- Timestamp:
- Sep 30, 2010, 2:47:17 PM (14 years ago)
- Location:
- trunk/examples/extended/analysis/A01/src
- Files:
-
- 6 edited
-
A01DetectorConstruction.cc (modified) (6 diffs)
-
A01EMPhysics.cc (modified) (3 diffs)
-
A01HadronPhysics.cc (modified) (15 diffs)
-
A01IonPhysics.cc (modified) (6 diffs)
-
A01MagneticField.cc (modified) (4 diffs)
-
A01MuonPhysics.cc (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/examples/extended/analysis/A01/src/A01DetectorConstruction.cc
r807 r1337 24 24 // ******************************************************************** 25 25 // 26 // $Id: A01DetectorConstruction.cc,v 1. 9 2006/06/29 16:32:22 gunterExp $26 // $Id: A01DetectorConstruction.cc,v 1.10 2009/11/21 00:22:55 perl Exp $ 27 27 // -------------------------------------------------------------- 28 28 // … … 32 32 #include "G4FieldManager.hh" 33 33 #include "G4TransportationManager.hh" 34 #include "G4Mag_UsualEqRhs.hh" 34 35 35 36 #include "G4Material.hh" 36 37 #include "G4Element.hh" 37 38 #include "G4MaterialTable.hh" 39 #include "G4NistManager.hh" 38 40 39 41 #include "G4VSolid.hh" … … 76 78 messenger = new A01DetectorConstMessenger(this); 77 79 magneticField = new A01MagneticField(); 80 fieldMgr = new G4FieldManager(); 78 81 armRotation = new G4RotationMatrix(); 79 82 armRotation->rotateY(armAngle); … … 84 87 delete armRotation; 85 88 delete magneticField; 89 delete fieldMgr; 86 90 delete messenger; 87 91 … … 111 115 G4VSensitiveDetector* HadCalorimeter; 112 116 //@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 113 114 117 ConstructMaterials(); 115 118 116 // Magnetic field ----------------------------------------------------------119 // Local Magnetic Field 117 120 static G4bool fieldIsInitialized = false; 121 118 122 if(!fieldIsInitialized) 119 123 { 120 G4FieldManager* fieldMgr121 = G4TransportationManager::GetTransportationManager()->GetFieldManager();122 124 fieldMgr->SetDetectorField(magneticField); 123 125 fieldMgr->CreateChordFinder(magneticField); … … 133 135 = new G4PVPlacement(0,G4ThreeVector(),worldLogical,"worldPhysical",0,0,0); 134 136 135 // magnetic field region 137 // Tube with Local Magnetic field 138 136 139 G4VSolid* magneticSolid = new G4Tubs("magneticTubs",0.,1.*m,1.*m,0.,360.*deg); 137 G4LogicalVolume* magneticLogical 138 = new G4LogicalVolume(magneticSolid,air,"magneticLogical",0,0,0); 140 G4NistManager* man = G4NistManager::Instance(); 141 G4Material* G4_Galactic = man->FindOrBuildMaterial("G4_Galactic"); 142 143 G4LogicalVolume* magneticLogical 144 = new G4LogicalVolume(magneticSolid,G4_Galactic,"magneticLogical",fieldMgr,0,0); 145 // ******** 146 147 // placement of Tube 148 139 149 G4RotationMatrix* fieldRot = new G4RotationMatrix(); 140 150 fieldRot->rotateX(90.*deg); -
trunk/examples/extended/analysis/A01/src/A01EMPhysics.cc
r807 r1337 24 24 // ******************************************************************** 25 25 // 26 // $Id: A01EMPhysics.cc,v 1. 8 2006/06/29 16:32:30 gunterExp $26 // $Id: A01EMPhysics.cc,v 1.9 2009/11/21 01:00:19 perl Exp $ 27 27 // -------------------------------------------------------------- 28 28 // … … 73 73 //Electorn 74 74 pManager = G4Electron::Electron()->GetProcessManager(); 75 G4VProcess* theeminusMultipleScattering = new G4 MultipleScattering();75 G4VProcess* theeminusMultipleScattering = new G4eMultipleScattering(); 76 76 G4VProcess* theeminusIonisation = new G4eIonisation(); 77 77 G4VProcess* theeminusBremsstrahlung = new G4eBremsstrahlung(); … … 94 94 //Positron 95 95 pManager = G4Positron::Positron()->GetProcessManager(); 96 G4VProcess* theeplusMultipleScattering = new G4 MultipleScattering();96 G4VProcess* theeplusMultipleScattering = new G4eMultipleScattering(); 97 97 G4VProcess* theeplusIonisation = new G4eIonisation(); 98 98 G4VProcess* theeplusBremsstrahlung = new G4eBremsstrahlung(); -
trunk/examples/extended/analysis/A01/src/A01HadronPhysics.cc
r807 r1337 24 24 // ******************************************************************** 25 25 // 26 // $Id: A01HadronPhysics.cc,v 1. 8 2006/06/29 16:32:48 gunterExp $26 // $Id: A01HadronPhysics.cc,v 1.9 2009/11/21 01:00:19 perl Exp $ 27 27 // -------------------------------------------------------------- 28 28 // … … 74 74 pManager->AddDiscreteProcess(thePionPlusInelasticProcess); 75 75 76 G4VProcess* theppMultipleScattering = new G4 MultipleScattering();76 G4VProcess* theppMultipleScattering = new G4hMultipleScattering(); 77 77 G4VProcess* theppIonisation = new G4hIonisation(); 78 78 // … … 107 107 pManager->AddDiscreteProcess(thePionMinusInelasticProcess); 108 108 109 G4VProcess* thepmMultipleScattering = new G4 MultipleScattering();109 G4VProcess* thepmMultipleScattering = new G4hMultipleScattering(); 110 110 G4VProcess* thepmIonisation = new G4hIonisation(); 111 111 // … … 141 141 pManager->AddDiscreteProcess(theKaonPlusInelasticProcess); 142 142 143 G4VProcess* thekpMultipleScattering = new G4 MultipleScattering();143 G4VProcess* thekpMultipleScattering = new G4hMultipleScattering(); 144 144 G4VProcess* thekpIonisation = new G4hIonisation(); 145 145 // … … 176 176 pManager->AddDiscreteProcess(theKaonMinusInelasticProcess); 177 177 178 G4VProcess* thekmMultipleScattering = new G4 MultipleScattering();178 G4VProcess* thekmMultipleScattering = new G4hMultipleScattering(); 179 179 G4VProcess* thekmIonisation = new G4hIonisation(); 180 180 … … 248 248 pManager->AddDiscreteProcess(theProtonInelasticProcess); 249 249 250 G4VProcess* thepMultipleScattering = new G4 MultipleScattering();250 G4VProcess* thepMultipleScattering = new G4hMultipleScattering(); 251 251 G4VProcess* thepIonisation = new G4hIonisation(); 252 252 … … 286 286 pManager->AddRestProcess(theAntiProtonAnnihilation); 287 287 288 G4VProcess* theapMultipleScattering = new G4 MultipleScattering();288 G4VProcess* theapMultipleScattering = new G4hMultipleScattering(); 289 289 G4VProcess* theapIonisation = new G4hIonisation(); 290 290 … … 417 417 pManager->AddDiscreteProcess(theSigmaPlusInelasticProcess); 418 418 419 G4VProcess* thespMultipleScattering = new G4 MultipleScattering();419 G4VProcess* thespMultipleScattering = new G4hMultipleScattering(); 420 420 G4VProcess* thespIonisation = new G4hIonisation(); 421 421 … … 451 451 pManager->AddDiscreteProcess(theAntiSigmaPlusInelasticProcess); 452 452 453 G4VProcess* theaspMultipleScattering = new G4 MultipleScattering();453 G4VProcess* theaspMultipleScattering = new G4hMultipleScattering(); 454 454 G4VProcess* theaspIonisation = new G4hIonisation(); 455 455 … … 485 485 pManager->AddDiscreteProcess(theSigmaMinusInelasticProcess); 486 486 487 G4VProcess* thesmMultipleScattering = new G4 MultipleScattering();487 G4VProcess* thesmMultipleScattering = new G4hMultipleScattering(); 488 488 G4VProcess* thesmIonisation = new G4hIonisation(); 489 489 … … 519 519 pManager->AddDiscreteProcess(theAntiSigmaMinusInelasticProcess); 520 520 521 G4VProcess* theasmMultipleScattering = new G4 MultipleScattering();521 G4VProcess* theasmMultipleScattering = new G4hMultipleScattering(); 522 522 G4VProcess* theasmIonisation = new G4hIonisation(); 523 523 … … 593 593 pManager->AddDiscreteProcess(theXiMinusInelasticProcess); 594 594 595 G4VProcess* thexmMultipleScattering = new G4 MultipleScattering();595 G4VProcess* thexmMultipleScattering = new G4hMultipleScattering(); 596 596 G4VProcess* thexmIonisation = new G4hIonisation(); 597 597 … … 627 627 pManager->AddDiscreteProcess(theAntiXiMinusInelasticProcess); 628 628 629 G4VProcess* theaxmMultipleScattering = new G4 MultipleScattering();629 G4VProcess* theaxmMultipleScattering = new G4hMultipleScattering(); 630 630 G4VProcess* theaxmIonisation = new G4hIonisation(); 631 631 … … 661 661 pManager->AddDiscreteProcess(theOmegaMinusInelasticProcess); 662 662 663 G4VProcess* theomMultipleScattering = new G4 MultipleScattering();663 G4VProcess* theomMultipleScattering = new G4hMultipleScattering(); 664 664 G4VProcess* theomIonisation = new G4hIonisation(); 665 665 … … 695 695 pManager->AddDiscreteProcess(theAntiOmegaMinusInelasticProcess); 696 696 697 G4VProcess* theaomMultipleScattering = new G4 MultipleScattering();697 G4VProcess* theaomMultipleScattering = new G4hMultipleScattering(); 698 698 G4VProcess* theaomIonisation = new G4hIonisation(); 699 699 -
trunk/examples/extended/analysis/A01/src/A01IonPhysics.cc
r807 r1337 24 24 // ******************************************************************** 25 25 // 26 // $Id: A01IonPhysics.cc,v 1. 9 2006/06/29 16:32:55 gunterExp $26 // $Id: A01IonPhysics.cc,v 1.10 2009/11/21 01:00:19 perl Exp $ 27 27 // -------------------------------------------------------------- 28 28 // … … 62 62 63 63 // add process 64 G4VProcess* thegionMultipleScattering = new G4 MultipleScattering();64 G4VProcess* thegionMultipleScattering = new G4hMultipleScattering(); 65 65 // 66 66 // G4hIonization may be not able to use for Geanric Ion in future … … 100 100 pManager->AddDiscreteProcess(theDeuteronInelasticProcess); 101 101 102 G4VProcess* thedueMultipleScattering = new G4 MultipleScattering();102 G4VProcess* thedueMultipleScattering = new G4hMultipleScattering(); 103 103 G4VProcess* thedueIonisation = new G4hIonisation(); 104 104 // … … 132 132 pManager->AddDiscreteProcess(theTritonInelasticProcess); 133 133 134 G4VProcess* thetriMultipleScattering = new G4 MultipleScattering();134 G4VProcess* thetriMultipleScattering = new G4hMultipleScattering(); 135 135 G4VProcess* thetriIonisation = new G4hIonisation(); 136 136 // … … 164 164 pManager->AddDiscreteProcess(theAlphaInelasticProcess); 165 165 166 G4VProcess* thealpMultipleScattering = new G4 MultipleScattering();166 G4VProcess* thealpMultipleScattering = new G4hMultipleScattering(); 167 167 G4VProcess* thealpIonisation = new G4hIonisation(); 168 168 // … … 189 189 pManager->AddDiscreteProcess(thehe3ElasticProcess); 190 190 191 G4VProcess* thehe3MultipleScattering = new G4 MultipleScattering();191 G4VProcess* thehe3MultipleScattering = new G4hMultipleScattering(); 192 192 G4VProcess* thehe3Ionisation = new G4hIonisation(); 193 193 // -
trunk/examples/extended/analysis/A01/src/A01MagneticField.cc
r807 r1337 24 24 // ******************************************************************** 25 25 // 26 // $Id: A01MagneticField.cc,v 1. 6 2006/06/29 16:32:57 gunterExp $26 // $Id: A01MagneticField.cc,v 1.7 2009/11/21 00:22:55 perl Exp $ 27 27 // -------------------------------------------------------------- 28 28 // … … 30 30 #include "A01MagneticField.hh" 31 31 #include "A01MagneticFieldMessenger.hh" 32 #include "globals.hh" 32 33 33 34 A01MagneticField::A01MagneticField() … … 35 36 messenger = new A01MagneticFieldMessenger(this); 36 37 By = 1.0*tesla; 37 rmax_sq = sqr(1.*m); 38 ymax = 100.*cm; 38 39 39 } 40 40 … … 42 42 { delete messenger; } 43 43 44 void A01MagneticField::GetFieldValue(const double Point[3],double *Bfield) const44 void A01MagneticField::GetFieldValue(const G4double [4],double *Bfield) const 45 45 { 46 46 Bfield[0] = 0.; 47 47 Bfield[2] = 0.; 48 if(std::abs(Point[1])<ymax && (sqr(Point[0])+sqr(Point[2]))<rmax_sq) 49 { Bfield[1] = By; } 50 else 51 { Bfield[1] = 0.; } 48 Bfield[1] = By; 49 52 50 } 53 51 -
trunk/examples/extended/analysis/A01/src/A01MuonPhysics.cc
r807 r1337 24 24 // ******************************************************************** 25 25 // 26 // $Id: A01MuonPhysics.cc,v 1. 8 2006/06/29 16:33:01 gunterExp $26 // $Id: A01MuonPhysics.cc,v 1.10 2009/12/02 22:45:09 perl Exp $ 27 27 // -------------------------------------------------------------- 28 28 // … … 62 62 //Muon+ 63 63 pManager = G4MuonPlus::MuonPlus()->GetProcessManager(); 64 G4VProcess* thempMultipleScattering = new G4Mu ltipleScattering();64 G4VProcess* thempMultipleScattering = new G4MuMultipleScattering(); 65 65 G4VProcess* thempBremsstrahlung = new G4MuBremsstrahlung(); 66 66 G4VProcess* thempPairProduction = new G4MuPairProduction(); … … 87 87 //Muon- 88 88 pManager = G4MuonMinus::MuonMinus()->GetProcessManager(); 89 G4VProcess* themmMultipleScattering = new G4Mu ltipleScattering();89 G4VProcess* themmMultipleScattering = new G4MuMultipleScattering(); 90 90 G4VProcess* themmBremsstrahlung = new G4MuBremsstrahlung(); 91 91 G4VProcess* themmPairProduction = new G4MuPairProduction(); … … 111 111 // Tau+ Physics 112 112 pManager = G4TauPlus::TauPlus()->GetProcessManager(); 113 G4VProcess* thetpMultipleScattering = new G4Mu ltipleScattering();113 G4VProcess* thetpMultipleScattering = new G4MuMultipleScattering(); 114 114 G4VProcess* thetpIonisation = new G4hIonisation(); 115 115 // … … 128 128 // Tau- Physics 129 129 pManager = G4TauMinus::TauMinus()->GetProcessManager(); 130 G4VProcess* thetmMultipleScattering = new G4Mu ltipleScattering();130 G4VProcess* thetmMultipleScattering = new G4MuMultipleScattering(); 131 131 G4VProcess* thetmIonisation = new G4hIonisation(); 132 132 //
Note: See TracChangeset
for help on using the changeset viewer.
