Changeset 1340 for trunk/source/processes/hadronic/models/incl/src/G4InclLightIonInterface.cc

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

File:

• trunk/source/processes/hadronic/models/incl/src/G4InclLightIonInterface.cc (modified) (8 diffs)

trunk/source/processes/hadronic/models/incl/src/G4InclLightIonInterface.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4InclLightIonInterface.cc,v 1.10 2007/12/10 16:32:07 gunter Exp $ 
+// $Id: G4InclLightIonInterface.cc,v 1.12 2010/10/26 02:47:59 kaitanie Exp $ 
 // Translation of INCL4.2/ABLA V3 
 // Pekka Kaitaniemi, HIP (translation)
@@ -43 +43 @@
 
   varntp = new G4VarNtp();
-  calincl = new G4Calincl();
+  calincl = 0;
   ws = new G4Ws();
   mat = new G4Mat();
@@ -65 +65 @@
   G4int maxTries = 200;
 
-  G4int particleI, n = 0;
-
   G4int bulletType = 0;
+  G4int particleI;
 
   // Print diagnostic messages: 0 = silent, 1 and 2 = verbose
@@ -86 +85 @@
   G4double bulletE = aTrack.GetKineticEnergy() / MeV;
 
-  G4double targetA = theNucleus.GetN();
-  G4double targetZ = theNucleus.GetZ();
+  G4int targetA = theNucleus.GetA_asInt();
+  G4int targetZ = theNucleus.GetZ_asInt();
 
   G4double eKin;
@@ -116 +115 @@
   if (aTrack.GetDefinition() == G4Alpha::Alpha()         ) bulletType = he4;
 
-  for(int i = 0; i < 15; i++) {
-    calincl->f[i] = 0.0; // Initialize INCL input data
-  }
+  calincl = new G4InclInput();
 
   // Check wheter the input is acceptable.
   if((bulletType != 0) && ((targetA != 1) && (targetZ != 1))) {
-    calincl->f[0] = targetA;    // Target mass number
-    calincl->f[1] = targetZ;    // Charge number
-    calincl->f[6] = bulletType; // Type
-    calincl->f[2] = bulletE;    // Energy [MeV]
-    calincl->f[5] = 1.0;        // Time scaling
-    calincl->f[4] = 45.0;       // Nuclear potential
-
     ws->nosurf = -2;  // Nucleus surface, -2 = Woods-Saxon 
     ws->xfoisa = 8;
@@ -137 +127 @@
 
     mat->nbmat = 1;
-    mat->amat[0] = int(calincl->f[0]);
-    mat->zmat[0] = int(calincl->f[1]);
+    mat->amat[0] = int(calincl->targetA());
+    mat->zmat[0] = int(calincl->targetZ());
 
     incl->initIncl(true);
@@ -147 +137 @@
         G4cout <<"G4InclLightIonInterface: Try number = " << nTries << G4endl; 
       }
-      incl->processEventIncl();
+      incl->processEventIncl(calincl);
 
       if(verboseLevel > 1) {
@@ -170 +160 @@
         diagdata <<"G4InclLightIonInterface: Target A:  " << targetA << G4endl;
         diagdata <<"G4InclLightIonInterface: Target Z:  " << targetZ << G4endl;
-      }
-
-      for(particleI = 0; particleI < varntp->ntrack; particleI++) {
-        G4cout << n                       << " " << calincl->f[6]             << " " << calincl->f[2] << " ";
-        G4cout << varntp->massini         << " " << varntp->mzini             << " ";
-        G4cout << varntp->exini           << " " << varntp->mulncasc          << " " << varntp->mulnevap          << " " << varntp->mulntot << " ";
-        G4cout << varntp->bimpact         << " " << varntp->jremn             << " " << varntp->kfis              << " " << varntp->estfis << " ";
-        G4cout << varntp->izfis           << " " << varntp->iafis             << " " << varntp->ntrack            << " " << varntp->itypcasc[particleI] << " ";
-        G4cout << varntp->avv[particleI]  << " " << varntp->zvv[particleI]    << " " << varntp->enerj[particleI]  << " ";
-        G4cout << varntp->plab[particleI] << " " << varntp->tetlab[particleI] << " " << varntp->philab[particleI] << G4endl;
-        // For diagnostic output
-        if(verboseLevel > 3) {
-          diagdata << n                       << " " << calincl->f[6]             << " " << calincl->f[2] << " ";
-          diagdata << varntp->massini         << " " << varntp->mzini             << " ";
-          diagdata << varntp->exini           << " " << varntp->mulncasc          << " " << varntp->mulnevap          << " " << varntp->mulntot << " ";
-          diagdata << varntp->bimpact         << " " << varntp->jremn             << " " << varntp->kfis              << " " << varntp->estfis << " ";
-          diagdata << varntp->izfis           << " " << varntp->iafis             << " " << varntp->ntrack            << " ";
-          diagdata                                                                       << varntp->itypcasc[particleI] << " ";
-          diagdata << varntp->avv[particleI]  << " " << varntp->zvv[particleI]    << " " << varntp->enerj[particleI]  << " ";
-          diagdata << varntp->plab[particleI] << " " << varntp->tetlab[particleI] << " " << varntp->philab[particleI] << G4endl;
-        }
       }
     }