Index: trunk/source/processes/hadronic/models/de_excitation/evaporation/test/EvaporationTest.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/evaporation/test/EvaporationTest.cc	(revision 1350)
+++ 	(revision )
@@ -1,226 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-//
-
-#include <iostream>
-#include <iomanip>
-#include "globals.hh"
-
-#include "G4Evaporation.hh"
-#include "G4NucleiProperties.hh"
-#include "G4Gamma.hh"
-#include "G4Neutron.hh"
-#include "G4Proton.hh"
-#include "G4He3.hh"
-#include "G4Alpha.hh"
-#include "G4Deuteron.hh"
-#include "G4Triton.hh"
-#include "G4Electron.hh"
-#include "G4Fragment.hh"
-#include "G4ParticleTable.hh"
-#include "G4IonTable.hh"
-#include "G4ThreeVector.hh" 
-
-
-int main()
-{
-  G4ParticleDefinition *theGamma = G4Gamma::GammaDefinition();
-  G4ParticleDefinition *theElectron = G4Electron::ElectronDefinition();
-  G4ParticleDefinition *theNeutron = G4Neutron::NeutronDefinition();
-  G4ParticleDefinition *theProton = G4Proton::ProtonDefinition();   
-  G4ParticleDefinition *theDeuteron = G4Deuteron::DeuteronDefinition();
-  G4ParticleDefinition *theTriton = G4Triton::TritonDefinition();
-  G4ParticleDefinition *theHelium3 = G4He3::He3Definition();
-  G4ParticleDefinition *theAlpha = G4Alpha::AlphaDefinition();
-
-
-  theProton->SetCuts(1.0);
-  theGamma->SetCuts(1.0);
-  theElectron->SetCuts(1.0);
-  theNeutron->SetCuts(1.0);
-  theDeuteron->SetCuts(1.0);
-  theTriton->SetCuts(1.0);
-  theHelium3->SetCuts(1.0);
-  theAlpha->SetCuts(1.0);
-
-
-  cout << G4endl << "Evaporation Test program" << G4endl;
- 
-  G4Evaporation * theEvaporation = new G4Evaporation;
-
-  G4int mode = -1;
-  while (mode != 0 && mode != 1) {
-    cout << "Mode (0 or 1): ";
-    G4cin >> mode;
-  }
-
-  cout << G4endl << G4endl << G4endl;
-
-  if (mode == 0) {
-   
-    cout << "A = ";
-    G4int MyA;
-    G4cin >> MyA;
-    cout << "Z = ";
-    G4int MyZ;
-    G4cin >> MyZ;
-    cout << "ExcitationEnergy (MeV) = ";
-    G4double MyExE;
-    G4cin >> MyExE;
-    //    MyExE *= MyA;
-    G4double AtomicMass = G4NucleiProperties::GetAtomicMass(MyA,MyZ)/MeV + MyExE;
-    cout << "Momentum (MeV): " << G4endl;
-    cout << "                Px = ";
-    G4double MyPx;
-    G4cin >> MyPx;
-    cout << "                Py = ";
-    G4double MyPy;
-    G4cin >> MyPy;
-    cout << "                Pz = ";
-    G4double MyPz;
-    G4cin >> MyPz;
-    
-
-    G4ThreeVector triV(MyPx*MeV,MyPy*MeV,MyPz*MeV);
-    //    G4LorentzVector initialMomentum(triV,sqrt(triV.mag2()+AtomicMass*AtomicMass));
-    G4LorentzVector initialMomentum(triV,std::sqrt(triV.mag2()+AtomicMass*AtomicMass*MeV*MeV));
-    
-
-    // put info about excited nucleus in fragment class
-    G4Fragment theExcitedNucleus(MyA,MyZ,initialMomentum);
-
-
-    G4int events = 1;
-    cout << "Iterations: ";
-    G4cin >> events;
-
-    G4double NofP = 0.0;
-    G4double NofN = 0.0;
-
-    for (G4int i = 0; i < events; i++) {
-
-      cout << "Iteration: " << i+1 << G4endl;
-      cout << "----------------" << G4endl;
-      cout << "     Initial fragment" << G4endl;
-      cout << theExcitedNucleus << G4endl << G4endl;
-
-      cout << "     Fragments evaporated" << G4endl << G4endl;
-      // DeExcite the nucleus 
-      G4FragmentVector * theFragVector = theEvaporation->BreakItUp(theExcitedNucleus);
-
-      
-      G4LorentzVector TestMomentum(initialMomentum);
-      for (G4int j=0; j < theFragVector->entries(); j++) {
-	cout << theFragVector->at(j) << G4endl;
-
-	// Test 4-momentum conservation 
-	TestMomentum -= theFragVector->at(j)->GetMomentum();
-
-	// Calculating multiplicities
-	if (theFragVector->at(j)->GetA() == 1 && theFragVector->at(j)->GetZ() == 1) NofP++;
-	else if (theFragVector->at(j)->GetA() == 1 && theFragVector->at(j)->GetZ() == 0) NofN++;
-      }
-
-      cout << "******************" << G4endl;
-      cout << "* Test Momentum = " << TestMomentum << G4endl;
-      cout << "******************" << G4endl;
-      
-      theFragVector->clearAndDestroy();
-      delete theFragVector;
-    }
-
-    G4cout << "Multiplicities: Neutrons -> " << NofN/events << " Protons -> " << NofP/events << G4endl;
-  } else if (mode == 1) {
-
-
-    G4int events = 0;
-    cout << "Number of events: ";
-    G4cin >> events;
-
-    for (G4int i = 0; i < events; i++) {
-
-      cout << "Event number: " << i+1 << G4endl;
-      cout << "--------------------" << G4endl;
-      
-      G4int MyA = RandFlat::shoot(17,200);
-
-      G4int MyZ = RandFlat::shoot(G4NucleiPropertiesTable::MinZ(MyA),
-				  G4NucleiPropertiesTable::MaxZ(MyA));
-
-      G4double AtomicMass = G4NucleiProperties::GetAtomicMass(MyA,MyZ)/MeV;
-      
-      G4double MyExE = RandFlat::shoot(2.0*MyA,10.0*MyA);
-      G4double MyPx = RandFlat::shoot(-2000,2000);
-      G4double MyPy = RandFlat::shoot(-2000,2000);
-      G4double MyPz = RandFlat::shoot(-2000,2000);
-
-      G4ThreeVector triV(MyPx*MeV,MyPy*MeV,MyPz*MeV);
-      G4LorentzVector initialMomentum(triV,std::sqrt(triV.mag2()+
-						(AtomicMass*MeV+MyExE*MeV)*
-						(AtomicMass*MeV+MyExE*MeV))
-				      );
-
-    
-      // put info about excited nucleus in fragment class
-      G4Fragment theExcitedNucleus(MyA,MyZ,initialMomentum);
-      
-      cout << "Excited fragment: "<< G4endl;
-      cout << theExcitedNucleus << G4endl;
-      
-      G4FragmentVector * theFragVector = theEvaporation->BreakItUp(theExcitedNucleus);
-      
-
-      G4LorentzVector TestMomentum(initialMomentum);
-      for (G4int j=0; j < theFragVector->entries(); j++) {
-	//	cout << theFragVector->at(j) << G4endl;
-
-	// Test 4-momentum conservation 
-	TestMomentum -= theFragVector->at(j)->GetMomentum();
-      }
-
-      cout << "******************" << G4endl;
-      cout << "* Test Momentum = " << TestMomentum << G4endl;
-      cout << "******************" << G4endl;
-
-
-
-      theFragVector->clearAndDestroy();
-      delete theFragVector;
-      
-    }
-    
-  }
-
-  delete theEvaporation;
-
-
-  return 0;
-
-}
-
-
-
-
Index: trunk/source/processes/hadronic/models/de_excitation/evaporation/test/G4EvaporationProbabilityTest.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/evaporation/test/G4EvaporationProbabilityTest.cc	(revision 1350)
+++ 	(revision )
@@ -1,540 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-//
-// -------------------------------------------------------------------
-//      GEANT 4 class file --- Copyright CERN 1998
-//      CERN Geneva Switzerland
-//
-//
-//      File name:     G4EvaporationProbabilityTest.cc 
-//
-//      Author:        Maria Grazia Pia (pia@genova.infn.it), 
-// 
-//      Creation date: 27 October 1998
-//
-//      Modifications: 
-//
-// -------------------------------------------------------------------
-
-#include "globals.hh"
-
-#include "G4ios.hh"
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-
-#include "CLHEP/Hist/TupleManager.h"
-#include "CLHEP/Hist/HBookFile.h"
-#include "CLHEP/Hist/Histogram.h"
-#include "CLHEP/Hist/Tuple.h"
-#include "CLHEP/String/Strings.h"
-#include "G4VEvaporationChannel.hh"
-#include "G4CompetitiveFission.hh"
-
-#include "G4VEvaporationChannel.hh"
-#include "G4EvaporationChannel.hh"
-#include "G4PhotonEvaporation.hh"
-#include "G4DataVector.hh"
-#include "G4LorentzVector.hh"
-#include "G4ThreeVector.hh"
-#include "G4NucleiProperties.hh"
-#include "G4Fragment.hh"
-#include "Randomize.hh"
-#include "G4FragmentVector.hh"
-
-#include "g4rw/tvvector.h"
-
-int main()
-{
-  // MGP ---- HBOOK initialization
-  HepTupleManager* hbookManager;
-  hbookManager = new HBookFile("prob.hbook", 58);
-  assert (hbookManager != 0);
-
-  // MGP ---- Book histograms
-
-  HepHistogram* hGammaE;
-  hGammaE = hbookManager->histogram("Gamma energy", 100,0.,10.);
-  assert (hGammaE != 0);  
-
-  HepHistogram* hNProducts;
-  hNProducts = hbookManager->histogram("Number of products", 20,0.,20.);
-  assert (hNProducts != 0);  
-
-  HepHistogram* hProb;
-  hProb = hbookManager->histogram("Probability * 1.e25", 100,0.,10.);
-  assert (hProb != 0);  
-
-  // MGP ---- Book a ntuple
-  HepTuple* ntuple;
-  ntuple = hbookManager->ntuple("G4EvaporationProbability");
-  assert (ntuple != 0);
-
-  G4int Z;
-  G4int A;
-
-  G4cout << "Enter Z and A" << G4endl;
-  G4cin >> Z >> A;
-
-  assert (Z > 0);
-  assert (A > 0);
-  assert (A > Z);
-  
-  G4int iter;
-  G4cout << "Enter number of iterations " << G4endl;
-  G4cin >> iter;
-  if (iter <1) iter = 1;
-
-  G4int nProbs;
-  G4cout << "Enter max number of channels (0 - 32) " << G4endl;
-  G4cin >> nProbs;
-  if (nProbs < 0 || nProbs > 32) nProbs = 32;
-
-  G4double excMin;
-  G4double excMax;    
-  G4cout << "Enter initial min an max excitation energy" << G4endl;
-  G4cin >> excMin >> excMax;
-  assert (excMin >= 0.);
-  assert (excMax > 0.);
-  assert (excMax >= excMin);
-
-
-  // G4EvaporationProbability for this (Z,A) material
-
-  // Excitation energy levels for each channel
-
-  G4int nExcitedStates = 10;
-
-  G4double zero = 0.;
-
-  G4RWTValVector<G4double> ExcitEnergyChann00(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann01(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann02(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann03(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann04(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann05(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann06(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann07(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann08(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann09(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann10(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann11(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann12(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann13(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann14(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann15(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann16(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann17(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann18(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann19(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann20(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann21(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann22(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann23(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann24(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann25(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann26(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann27(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann28(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann29(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann30(nExcitedStates,zero);
-  G4RWTValVector<G4double> ExcitEnergyChann31(nExcitedStates,zero);
-
-
-  // Spin of excitation energy levels for each channel
-
-  G4int izero = 0;
-
-  G4RWTValVector<G4int> ExcitSpinChann00(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann01(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann02(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann03(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann04(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann05(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann06(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann07(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann08(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann09(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann10(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann11(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann12(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann13(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann14(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann15(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann16(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann17(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann18(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann19(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann20(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann21(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann22(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann23(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann24(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann25(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann26(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann27(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann28(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann29(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann30(nExcitedStates,izero);
-  G4RWTValVector<G4int> ExcitSpinChann31(nExcitedStates,izero);
-
-
-  // (in MeV)
-
-  ExcitEnergyChann09(0) = 3.56;
-
-  ExcitEnergyChann10(0) = 0.48;
-
-  ExcitEnergyChann11(0) = 0.98;
-
-  ExcitEnergyChann12(0) = 0.43;
-  
-  ExcitEnergyChann15(0) = 3.37;
-  ExcitEnergyChann15(1) = 5.96;
-  ExcitEnergyChann15(2) = 6.18;
-  ExcitEnergyChann15(3) = 6.26;
-
-  ExcitEnergyChann17(0) = 0.72;
-  ExcitEnergyChann17(1) = 1.74;
-  ExcitEnergyChann17(2) = 2.15;
-  ExcitEnergyChann17(3) = 3.59;
-
-  ExcitEnergyChann18(0) = 2.13;
-  ExcitEnergyChann18(1) = 4.44;
-  ExcitEnergyChann18(2) = 5.02;
-  ExcitEnergyChann18(3) = 6.76;
-  ExcitEnergyChann18(4) = 7.29;
-  ExcitEnergyChann18(5) = 7.98;
-  ExcitEnergyChann18(6) = 8.56;
-
-  ExcitEnergyChann19(0) = 0.95;
-  ExcitEnergyChann19(1) = 1.67;
-  ExcitEnergyChann19(2) = 6.25;
-
-  ExcitEnergyChann20(0) = 2.00;
-  ExcitEnergyChann20(1) = 4.32;
-  ExcitEnergyChann20(2) = 4.80;
-  ExcitEnergyChann20(3) = 6.34;
-  ExcitEnergyChann20(4) = 6.48;
-  ExcitEnergyChann20(5) = 6.90;
-  ExcitEnergyChann20(6) = 7.50;
-  ExcitEnergyChann20(7) = 8.10;
-  ExcitEnergyChann20(8) = 8.42;
-  ExcitEnergyChann20(9) = 8.66;
-
-  ExcitEnergyChann21(0) = 4.44;
-
-  ExcitEnergyChann22(0) = 3.09;
-  ExcitEnergyChann22(1) = 3.68;
-  ExcitEnergyChann22(2) = 3.85;
-
-  ExcitEnergyChann23(0) = 6.09;
-  ExcitEnergyChann23(1) = 6.69;
-  ExcitEnergyChann23(2) = 6.96;
-  ExcitEnergyChann23(3) = 7.34;
-
-  ExcitEnergyChann25(0) = 2.31;
-  ExcitEnergyChann25(1) = 3.95;
-  ExcitEnergyChann25(2) = 4.92;
-  ExcitEnergyChann25(3) = 5.11;
-  ExcitEnergyChann25(4) = 5.69;
-  ExcitEnergyChann25(5) = 5.83;
-  ExcitEnergyChann25(6) = 6.20;
-  ExcitEnergyChann25(7) = 6.44;
-  ExcitEnergyChann25(8) = 7.03;
-
-  ExcitEnergyChann26(0) = 5.28;
-  ExcitEnergyChann26(1) = 6.32;
-  ExcitEnergyChann26(2) = 7.22;
-  ExcitEnergyChann26(3) = 7.57;
-  ExcitEnergyChann26(4) = 8.31;
-  ExcitEnergyChann26(5) = 8.57;
-  ExcitEnergyChann26(6) = 9.15;
-  ExcitEnergyChann26(7) = 9.79;
-  ExcitEnergyChann26(8) = 10.0;
-
-  ExcitEnergyChann27(0) = 0.12;
-  ExcitEnergyChann27(1) = 0.30;
-  ExcitEnergyChann27(2) = 0.40;
-
-  ExcitEnergyChann28(0) = 5.22;
-  ExcitEnergyChann28(1) = 6.18;
-  ExcitEnergyChann28(2) = 6.83;
-  ExcitEnergyChann28(3) = 7.28;
-
-  ExcitEnergyChann29(0) = 6.10;
-  ExcitEnergyChann29(1) = 6.92;
-  ExcitEnergyChann29(2) = 7.12;
-
-  ExcitEnergyChann30(0) = 0.87;
-  ExcitEnergyChann30(1) = 3.06;
-  ExcitEnergyChann30(2) = 3.84;
-
-  ExcitEnergyChann31(0) = 1.98;
-  ExcitEnergyChann31(1) = 3.57;
-  ExcitEnergyChann31(2) = 3.92;
-  ExcitEnergyChann31(3) = 4.46;
-  ExcitEnergyChann31(4) = 5.10;
-  ExcitEnergyChann31(5) = 5.33;
-  ExcitEnergyChann31(6) = 5.53;
-  ExcitEnergyChann31(7) = 6.20;
-  ExcitEnergyChann31(8) = 6.38;
-  ExcitEnergyChann31(9) = 6.88;
-
-
-  ExcitSpinChann09(0) = 1;
-
-  ExcitSpinChann10(0) = 2;
-
-  ExcitSpinChann11(0) = 3;
-
-  ExcitSpinChann12(0) = 2;
-
-  ExcitSpinChann15(0) = 5;
-  ExcitSpinChann15(1) = 8;
-  ExcitSpinChann15(2) = 1;
-  ExcitSpinChann15(3) = 5;
-
-  ExcitSpinChann17(0) = 3;
-  ExcitSpinChann17(1) = 1;
-  ExcitSpinChann17(2) = 3;
-  ExcitSpinChann17(3) = 5;
-
-  ExcitSpinChann18(0) = 2;
-  ExcitSpinChann18(1) = 6;
-  ExcitSpinChann18(2) = 4;
-  ExcitSpinChann18(3) = 10;
-  ExcitSpinChann18(4) = 6;
-  ExcitSpinChann18(5) = 4;
-  ExcitSpinChann18(6) = 6;
-
-  ExcitSpinChann19(0) = 5;
-  ExcitSpinChann19(1) = 5;
-  ExcitSpinChann19(2) = 4;
-
-  ExcitSpinChann20(0) = 2;
-  ExcitSpinChann20(1) = 6;
-  ExcitSpinChann20(2) = 4;
-  ExcitSpinChann20(3) = 2;
-  ExcitSpinChann20(4) = 8;
-  ExcitSpinChann20(5) = 6;
-  ExcitSpinChann20(6) = 4;
-  ExcitSpinChann20(7) = 4;
-  ExcitSpinChann20(8) = 6;
-  ExcitSpinChann20(9) = 8;
-
-  ExcitSpinChann21(0) = 5;
-
-  ExcitSpinChann22(0) = 2;
-  ExcitSpinChann22(1) = 4;
-  ExcitSpinChann22(2) = 6;
-
-  ExcitSpinChann23(0) = 3;
-  ExcitSpinChann23(1) = 8;
-  ExcitSpinChann23(2) = 6;
-  ExcitSpinChann23(3) = 5;
-
-  ExcitSpinChann25(0) = 1;
-  ExcitSpinChann25(1) = 3;
-  ExcitSpinChann25(2) = 1;
-  ExcitSpinChann25(3) = 5;
-  ExcitSpinChann25(4) = 3;
-  ExcitSpinChann25(5) = 7;
-  ExcitSpinChann25(6) = 3;
-  ExcitSpinChann25(7) = 7;
-  ExcitSpinChann25(8) = 5;
-
-  ExcitSpinChann26(0) = 8;
-  ExcitSpinChann26(1) = 4;
-  ExcitSpinChann26(2) = 10;
-  ExcitSpinChann26(3) = 8;
-  ExcitSpinChann26(4) = 2;
-  ExcitSpinChann26(5) = 4;
-  ExcitSpinChann26(6) = 14;
-  ExcitSpinChann26(7) = 14;
-  ExcitSpinChann26(8) = 8;
-
-  ExcitSpinChann27(0) = 1;
-  ExcitSpinChann27(1) = 7;
-  ExcitSpinChann27(2) = 3;
-
-  ExcitSpinChann28(0) = 8;
-  ExcitSpinChann28(1) = 4;
-  ExcitSpinChann28(2) = 10;
-  ExcitSpinChann28(3) = 8;
-
-  ExcitSpinChann29(0) = 8;
-  ExcitSpinChann29(1) = 5;
-  ExcitSpinChann29(2) = 3;
-
-  ExcitSpinChann30(0) = 2;
-  ExcitSpinChann30(1) = 2;
-  ExcitSpinChann30(2) = 6;
-
-  ExcitSpinChann31(0) = 5;
-  ExcitSpinChann31(1) = 10;
-  ExcitSpinChann31(2) = 5;
-  ExcitSpinChann31(3) = 3;
-  ExcitSpinChann31(4) = 7;
-  ExcitSpinChann31(5) = 13;
-  ExcitSpinChann31(6) = 5;
-  ExcitSpinChann31(7) = 3;
-  ExcitSpinChann31(8) = 12;
-  ExcitSpinChann31(9) = 1;
-
-  G4RWTPtrOrderedVector<G4VEvaporationChannel>* theChannels = new G4RWTPtrOrderedVector<G4VEvaporationChannel>;
-
-  //                                        |Gamma|A| Z| 
-  //                                        +-----+-+--+
-
-  theChannels->insert(new G4EvaporationChannel(  2,  1, 0, &ExcitEnergyChann00, &ExcitSpinChann00)); // n
-  theChannels->insert(new G4EvaporationChannel(  2,  1, 1, &ExcitEnergyChann01, &ExcitSpinChann01)); // p
-  theChannels->insert(new G4EvaporationChannel(  6,  2, 1, &ExcitEnergyChann02, &ExcitSpinChann02)); // H2
-  theChannels->insert(new G4EvaporationChannel(  6,  3, 1, &ExcitEnergyChann03, &ExcitSpinChann03)); // H3
-  theChannels->insert(new G4EvaporationChannel(  6,  3, 2, &ExcitEnergyChann04, &ExcitSpinChann04)); // He3
-  theChannels->insert(new G4EvaporationChannel(  4,  4, 2, &ExcitEnergyChann05, &ExcitSpinChann05)); // He4
-  theChannels->insert(new G4EvaporationChannel( 20,  5, 2, &ExcitEnergyChann06, &ExcitSpinChann06)); // He5
-  theChannels->insert(new G4EvaporationChannel( 30,  6, 2, &ExcitEnergyChann07, &ExcitSpinChann07)); // He6
-  theChannels->insert(new G4EvaporationChannel( 20,  5, 3, &ExcitEnergyChann08, &ExcitSpinChann08)); // Li5
-  theChannels->insert(new G4EvaporationChannel( 54,  6, 3, &ExcitEnergyChann09, &ExcitSpinChann09)); // Li6
-  theChannels->insert(new G4EvaporationChannel( 73,  7, 3, &ExcitEnergyChann10, &ExcitSpinChann10)); // Li7
-  theChannels->insert(new G4EvaporationChannel(101,  8, 3, &ExcitEnergyChann11, &ExcitSpinChann11)); // Li8
-  theChannels->insert(new G4EvaporationChannel( 73,  7, 4, &ExcitEnergyChann12, &ExcitSpinChann12)); // Be7
-  theChannels->insert(new G4EvaporationChannel(  8,  8, 4, &ExcitEnergyChann13, &ExcitSpinChann13)); // Be8
-  theChannels->insert(new G4EvaporationChannel(146,  9, 4, &ExcitEnergyChann14, &ExcitSpinChann14)); // Be9
-  theChannels->insert(new G4EvaporationChannel(100, 10, 4, &ExcitEnergyChann15, &ExcitSpinChann15)); // Be10 
-  theChannels->insert(new G4EvaporationChannel(100,  9, 5, &ExcitEnergyChann16, &ExcitSpinChann16)); // B9
-  theChannels->insert(new G4EvaporationChannel(343, 10, 5, &ExcitEnergyChann17, &ExcitSpinChann17)); // B10
-  theChannels->insert(new G4EvaporationChannel(174, 11, 5, &ExcitEnergyChann18, &ExcitSpinChann18)); // B11
-  theChannels->insert(new G4EvaporationChannel(393, 12, 5, &ExcitEnergyChann19, &ExcitSpinChann19)); // B12
-  theChannels->insert(new G4EvaporationChannel(186, 11, 6, &ExcitEnergyChann20, &ExcitSpinChann20)); // C11
-  theChannels->insert(new G4EvaporationChannel( 61, 12, 6, &ExcitEnergyChann21, &ExcitSpinChann21)); // C12
-  theChannels->insert(new G4EvaporationChannel(202, 13, 6, &ExcitEnergyChann22, &ExcitSpinChann22)); // C13
-  theChannels->insert(new G4EvaporationChannel(113, 14, 6, &ExcitEnergyChann23, &ExcitSpinChann23)); // C14
-  theChannels->insert(new G4EvaporationChannel(213, 13, 7, &ExcitEnergyChann24, &ExcitSpinChann24)); // N13
-  theChannels->insert(new G4EvaporationChannel(233, 14, 7, &ExcitEnergyChann25, &ExcitSpinChann25)); // N14
-  theChannels->insert(new G4EvaporationChannel(180, 15, 7, &ExcitEnergyChann26, &ExcitSpinChann26)); // N15
-  theChannels->insert(new G4EvaporationChannel(696, 16, 7, &ExcitEnergyChann27, &ExcitSpinChann27)); // N16
-  theChannels->insert(new G4EvaporationChannel(194, 15, 8, &ExcitEnergyChann28, &ExcitSpinChann28)); // O15
-  theChannels->insert(new G4EvaporationChannel(120, 16, 8, &ExcitEnergyChann29, &ExcitSpinChann29)); // O16
-  theChannels->insert(new G4EvaporationChannel(458, 17, 8, &ExcitEnergyChann30, &ExcitSpinChann30)); // O17
-  theChannels->insert(new G4EvaporationChannel(590, 18, 8, &ExcitEnergyChann31, &ExcitSpinChann31)); // O18
-  theChannels->insert(new G4CompetitiveFission()); // Fission Channel
-  theChannels->insert(new G4PhotonEvaporation()); // Photon Channel
-
-  G4int nChannels = theChannels->entries();
-
-  G4PhotonEvaporation* photonEvaporation = new G4PhotonEvaporation;
-
-  G4int i;
-  for (i=0; i<iter; i++)
-    {
-      G4double excitation = excMin + G4UniformRand() * (excMax - excMin);
-
-      G4cout << G4endl << "TEST >>>>>>>>> Iteration " << i 
-		 << " <<<<<<<<< Initial excitation " << excitation << G4endl;
-	  
-      G4LorentzVector p4(0.,0.,0.,G4NucleiProperties::GetAtomicMass(A,Z)+excitation);
-      G4Fragment nucleus(A,Z,p4);
-
-      ntuple->column("exc",excitation);
-
-      // Photon evaporation probability
-      photonEvaporation->Initialize(nucleus);
-      G4FragmentVector* products = photonEvaporation->BreakUp(nucleus);
-      G4double probPhoton = photonEvaporation->GetEmissionProbability();
-      G4cout << "TEST: Photon probability = " << probPhoton << G4endl;
-      ntuple->column("probg",probPhoton);
-
-      // Probability for each channel
-
-      G4int n;
-      for (n=0; n<=nProbs; n++)
-	{
-	  G4Fragment initialNucleus(A,Z,p4);
-          theChannels->at(n)->Initialize(initialNucleus);
-	  G4double prob = theChannels->at(n)->GetEmissionProbability();
-	  G4cout << "TEST: probability(" << n << ") = " << prob << G4endl;
-	  ntuple->column("prob"+HepString(n),prob);
-	}
-
-
-      // Fill histograms 
-
-      G4int nProducts = 0;
-      if (products !=0) nProducts = products->entries();
-
-      G4cout << "TEST: " << nProducts << " products generated: gammaE ";
-      
-      G4int ig = 0;
-      for (ig=0; ig<nProducts; ig++)
-	{
-	  G4double productE = products->at(ig)->GetMomentum().e();
-	  G4ThreeVector pProd(products->at(ig)->GetMomentum());
-	  if (products->at(ig)->GetA() < 1)
-	    {
-	      G4cout << productE << " ";
-	      hGammaE->accumulate(productE);
-              ntuple->column("egamma",productE);
-	    }
-	  else
-	    { G4cout << "(" << products->at(ig)->GetZ() << "," << products->at(ig)->GetA() << ") "; }
-	}
-      G4cout << G4endl;
-      
-      ntuple->dumpData();
-      
-      delete products;
-
-    }
-
-  hbookManager->write();
-
-  theChannels->clearAndDestroy();
-  delete theChannels;
-  delete photonEvaporation;
-  
-  return EXIT_SUCCESS;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: trunk/source/processes/hadronic/models/de_excitation/evaporation/test/GNUmakefile
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/evaporation/test/GNUmakefile	(revision 1350)
+++ 	(revision )
@@ -1,28 +1,0 @@
-# $Id: GNUmakefile,v 1.1 2003/10/07 12:52:06 lara Exp $
-# ----------------------------------------------------------------
-# Makes test program in environment variable G4TARGET.
-# ----------------------------------------------------------------
-
-ifndef G4TARGET
-  G4TARGET := $(TESTTARGET)
-endif
-
-ifndef G4INSTALL
-  G4INSTALL = ../../../../../../../
-endif
-
-G4EXEC_BUILD = true
-
-include $(G4INSTALL)/config/architecture.gmk
-
-include $(G4INSTALL)/config/binmake.gmk
-
-
-
-
-
-
-
-
-
-
Index: trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4FermiPhaseSpaceDecay.icc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4FermiPhaseSpaceDecay.icc	(revision 1350)
+++ 	(revision )
@@ -1,97 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-// Hadronic Process: Nuclear De-excitations
-// by V. Lara
-
-inline G4FermiPhaseSpaceDecay::G4FermiPhaseSpaceDecay()
-{
-}
-
-inline G4FermiPhaseSpaceDecay::~G4FermiPhaseSpaceDecay()
-{
-}
-
-inline G4FermiPhaseSpaceDecay::G4FermiPhaseSpaceDecay(const G4FermiPhaseSpaceDecay&)
-{
-  // This is meant to not be used
-}
-
-inline const G4FermiPhaseSpaceDecay & 
-G4FermiPhaseSpaceDecay::operator=(const G4FermiPhaseSpaceDecay&)
-{
-  //This is menat to not be used
-  return *this;
-}
-
-inline G4bool 
-G4FermiPhaseSpaceDecay::operator==(const G4FermiPhaseSpaceDecay&)
-{
-  // This is meant to not be used
-  return false;
-}
-
-inline G4bool
-G4FermiPhaseSpaceDecay::operator!=(const G4FermiPhaseSpaceDecay&)
-{
-  // This is meant to not be used
-  return true;
-}
-
-
-inline G4double 
-G4FermiPhaseSpaceDecay::PtwoBody(G4double E, G4double P1, G4double P2) const
-{
-  G4double P = (E+P1+P2)*(E+P1-P2)*(E-P1+P2)*(E-P1-P2)/(4.0*E*E);
-  if (P>0.0) return std::sqrt(P);
-  else return -1.0;
-}
-
-
-inline std::vector<G4LorentzVector*> * G4FermiPhaseSpaceDecay::
-Decay(const G4double parent_mass, const std::vector<G4double>& fragment_masses) const
-{
-  //  if (fragment_masses.size() == 2)  
-  //    {
-  //      return this->TwoBodyDecay(parent_mass,fragment_masses);
-  //    }
-  //  else return this->NBodyDecay(parent_mass,fragment_masses);
-  //  else 
-  //    {
-      return this->KopylovNBodyDecay(parent_mass,fragment_masses);
-      //    }
-}
-
-inline G4double 
-G4FermiPhaseSpaceDecay::BetaKopylov(const G4int K) const
-{
-  // Notice that alpha > beta always
-  const G4double beta = 1.5;
-  G4double alpha = 1.5*(K-1);
-  G4double Y1 = CLHEP::RandGamma::shoot(alpha,1);
-  G4double Y2 = CLHEP::RandGamma::shoot(beta,1);
-  
-  return Y1/(Y1+Y2);
-}
Index: trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/test/G4FermiTest.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/test/G4FermiTest.cc	(revision 1350)
+++ 	(revision )
@@ -1,93 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-
-#include "G4FermiBreakUp.hh"
-
-#include "G4NucleiProperties.hh"
-
-
-
-
-int main()
-{
-  G4int A, Z;
-  
-  std::cout << "Please enter Z : ";
-  std::cin >> Z;
-  std::cout << "Please enter A : ";
-  std::cin >> A;
-  
-  G4double energy;
-
-  std::cout << "Please enter excitation energy (MeV) : ";
-  std::cin >> energy;
-  
-
-  energy *= MeV;
-  
-  G4int iterations;
-  std::cout << "Please enter number of interations : ";
-  std::cin >> iterations;
-  
-  G4double NuclearMass = G4NucleiProperties::GetNuclearMass(A,Z) + energy;
-
-  
-  G4LorentzVector p4(0.0,0.0,0.0,NuclearMass);
-  G4Fragment aFragment(A,Z,p4);
-  
-  G4FermiBreakUp model;
-
-  std::cout << "Excited Nucleus\n";
-  std::cout << aFragment << "\n\n";
-  
-  G4LorentzVector p4null(0.0,0.0,0.0,0.0);
-
-  //  std::ios::fmtflags old_floatfield = std::cout.flags();
-  std::cout.setf(std::ios::scientific,std::ios::floatfield);
-  for (G4int i = 0; i < iterations; ++i)
-    {
-      G4LorentzVector p4cons;
-      p4cons = p4null;
-      std::cout << "############ event " << i+1 << "###########################\n";
-      G4FragmentVector * theResult = model.BreakItUp(aFragment);
-      std::cout << "Number of fragments: " << theResult->size() << '\n';
-      std::cout << "-------------------------------------------\n";
-      for (G4FragmentVector::iterator i = theResult->begin(); i != theResult->end(); ++i)
-        {
-          std::cout << (*i);
-          std::cout << "\n-------------------------------------------\n";
-          p4cons += (*i)->GetMomentum();
-          delete (*i);
-        }
-      delete theResult;
-      std::cout << "        Initial momentum : " << p4/MeV << '\n';
-      std::cout << "Fragments total momentum : " << p4cons/MeV << '\n';
-      std::cout << "            Conservation : " << (p4-p4cons)/MeV << '\n';
-    }
-  return 0;
-}
-
-      
Index: trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/test/GNUmakefile
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/test/GNUmakefile	(revision 1350)
+++ 	(revision )
@@ -1,28 +1,0 @@
-# $Id: GNUmakefile,v 1.1 2003/11/03 10:27:05 lara Exp $
-# ----------------------------------------------------------------
-# Makes test program in environment variable G4TARGET.
-# ----------------------------------------------------------------
-
-ifndef G4TARGET
-  G4TARGET := $(TESTTARGET)
-endif
-
-ifndef G4INSTALL
-  G4INSTALL = ../../../../../../../
-endif
-
-G4EXEC_BUILD = true
-
-include $(G4INSTALL)/config/architecture.gmk
-
-include $(G4INSTALL)/config/binmake.gmk
-
-
-
-
-
-
-
-
-
-
Index: trunk/source/processes/hadronic/models/de_excitation/fission/test/G4CompetitiveFissionTest.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fission/test/G4CompetitiveFissionTest.cc	(revision 1350)
+++ 	(revision )
@@ -1,87 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-
-#include "globals.hh"
-
-#include "G4ios.hh"
-
-#include "G4CompetitiveFission.hh"
-#include "G4NucleiProperties.hh"
-#include "G4ParticleTable.hh"
-#include "../src/G4FissionParameters.cc"
-
-int main()
-{
-
-  G4int A, Z;
-
-  G4cout << "Please enter Z and A" << G4endl;
-  G4cin >> Z >> A;
-
-  G4int iter;
-  G4cout << "Please enter number of iterations " << G4endl;
-  G4cin >> iter;
-  
-  G4double energy;
-  G4cout << "Please enter the excitation energy" << G4endl;
-  G4cin >> energy;
-
-  G4CompetitiveFission theFission;
-
-  G4int i=0;
-  for (i=0; i<iter; i++)
-  {
-    G4LorentzVector p4(0.,0.,0.,G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass( Z, A )+energy);
-    G4Fragment aFragment(A,Z,p4);
-    G4FragmentVector * theResult = theFission.BreakUp(aFragment);
-    int ii=0;
-    for(ii=0; ii<theResult->entries(); ii++)
-    {
-      G4cout <<theResult->at(ii)->GetA() << " "<<theResult->at(ii)->GetZ() << G4endl;
-      delete theResult->at(ii);
-    }
-    delete theResult;
-  }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: trunk/source/processes/hadronic/models/de_excitation/fission/test/GNUmakefile
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fission/test/GNUmakefile	(revision 1350)
+++ 	(revision )
@@ -1,28 +1,0 @@
-# $Id: GNUmakefile,v 1.1 2003/10/07 12:53:08 lara Exp $
-# ----------------------------------------------------------------
-# Makes test program in environment variable G4TARGET.
-# ----------------------------------------------------------------
-
-ifndef G4TARGET
-  G4TARGET := $(TESTTARGET)
-endif
-
-ifndef G4INSTALL
-  G4INSTALL = ../../../../../../../
-endif
-
-G4EXEC_BUILD = true
-
-include $(G4INSTALL)/config/architecture.gmk
-
-include $(G4INSTALL)/config/binmake.gmk
-
-
-
-
-
-
-
-
-
-
Index: trunk/source/processes/hadronic/models/de_excitation/handler/test/G4ExcitationHandlerTest.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/handler/test/G4ExcitationHandlerTest.cc	(revision 1350)
+++ 	(revision )
@@ -1,217 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-//
-// -------------------------------------------------------------------
-//      GEANT 4 class file --- Copyright CERN 1998
-//      CERN Geneva Switzerland
-//
-//
-//      File name:     G4ExcitationHandlerTest.cc 
-//
-//      Author:        Maria Grazia Pia (pia@genova.infn.it), 
-// 
-//      Creation date: 27 October 1998
-//
-//      Modifications: 
-//
-// -------------------------------------------------------------------
-
-#include "globals.hh"
-
-#include "G4ios.hh"
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-
-#include "CLHEP/Hist/TupleManager.h"
-#include "CLHEP/Hist/HBookFile.h"
-#include "CLHEP/Hist/Histogram.h"
-#include "CLHEP/Hist/Tuple.h"
-#include "CLHEP/String/Strings.h"
-#include "G4VEvaporationChannel.hh"
-#include "G4CompetitiveFission.hh"
-
-#include "G4ReactionProductVector.hh"
-#include "G4ReactionProduct.hh"
-#include "G4DynamicParticleVector.hh"
-#include "G4DynamicParticle.hh"
-#include "G4ParticleDefinition.hh"
-
-#include "G4ExcitationHandler.hh"
-#include "G4EvaporationChannel.hh"
-#include "G4PhotonEvaporation.hh"
-#include "G4DataVector.hh"
-#include "G4LorentzVector.hh"
-#include "G4ThreeVector.hh"
-#include "G4NucleiProperties.hh"
-#include "G4Fragment.hh"
-#include "Randomize.hh"
-#include "G4Material.hh"
-#include "G4Element.hh"
-#include "G4FragmentVector.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4IonTable.hh"
-#include "G4Electron.hh"
-#include "G4Proton.hh"
-#include "G4Neutron.hh"
-#include "G4ParticleTypes.hh"
-#include "G4IonTable.hh"
-#include "G4GenericIon.hh"
-#include "G4NucleiPropertiesTable.hh"
-
-#include "g4rw/tvvector.h"
-
-int main()
-{
-  // MGP ---- HBOOK initialization
-  HepTupleManager* hbookManager;
-  hbookManager = new HBookFile("handler.hbook", 58);
-  assert (hbookManager != 0);
-
-  // MGP ---- Book histograms
-
-  HepHistogram* hGammaE;
-  hGammaE = hbookManager->histogram("Gamma energy", 200,0.,20.);
-  assert (hGammaE != 0);  
-
-  HepHistogram* hNProducts;
-  hNProducts = hbookManager->histogram("Number of products", 100,0.,100.);
-  assert (hNProducts != 0);  
-
-  HepHistogram* hProb;
-  hProb = hbookManager->histogram("Probability * 1.e25", 100,0.,10.);
-  assert (hProb != 0);  
-
-  // MGP ---- Book a ntuple
-  HepTuple* ntuple;
-  ntuple = hbookManager->ntuple("G4ExcitationHandler");
-  assert (ntuple != 0);
-
-  G4int Z;
-  G4int A;
-
-  G4cout << "Enter Z and A" << G4endl;
-  G4cin >> Z >> A;
-
-  assert (Z > 0);
-  assert (A > 0);
-  assert (A > Z);
-  
-  G4int iter;
-  G4cout << "Enter number of iterations " << G4endl;
-  G4cin >> iter;
-  if (iter <1) iter = 1;
-
-  G4double excMin;
-  G4double excMax;    
-  G4cout << "Enter initial min an max excitation energy" << G4endl;
-  G4cin >> excMin >> excMax;
-  assert (excMin >= 0.);
-  assert (excMax > 0.);
-  assert (excMax >= excMin);
-
-  G4ParticleDefinition *theElectron = G4Electron::ElectronDefinition();
-  G4ParticleDefinition* ion  = G4GenericIon::GenericIonDefinition();
-  G4ParticleTable* theTableOfParticles;
-  theTableOfParticles = G4ParticleTable::GetParticleTable();
-  G4IonTable* theTable = new G4IonTable();
-
-  // G4ExcitationHandler for this (Z,A) material
-  // Excitation energy levels for each channel
-
-  G4int i;
-  for (i=0; i<iter; i++)
-    {
-      G4double excitation = excMin + G4UniformRand() * (excMax - excMin);
-
-      G4cout << G4endl << "TEST >>>>>>>>> Iteration " << i 
-	     << " <<<<<<<<< Initial excitation " << excitation << G4endl;
-
-      G4double px = 0.;
-      G4double py = 0.;
-      G4double pz = 0.;
-
-      G4ThreeVector p(px,py,pz);
-      G4double nuclearMass = G4NucleiProperties::GetNuclearMass(A,Z);
-      G4LorentzVector p4(p,std::sqrt((nuclearMass+excitation)*(nuclearMass+excitation)));
-
-      G4Fragment nucleus(A,Z,p4);
-
-      G4ExcitationHandler* handler = new G4ExcitationHandler;
-      //      G4DynamicParticleVector* products = handler->BreakItUp(nucleus);
-      G4ReactionProductVector* products = handler->BreakItUp(nucleus);
-
-      // Fill histograms 
-
-      G4int nProducts = 0;
-      if (products !=0) nProducts = products->entries();
-
-      G4cout << nProducts << " products: gammaE ";
-      
-      G4int ig = 0;
-      for (ig=0; ig<nProducts; ig++)
-	{
-	  if (products->at(ig)->GetDefinition() == G4Gamma::GammaDefinition())
-	    {
-	      //	      G4double productE = products->at(ig)->Get4Momentum().e();
-	      G4double productE = products->at(ig)->GetTotalEnergy();
-	      G4cout << productE << " ";
-	      hGammaE->accumulate(productE);
-              ntuple->column("egamma",productE);
-	      ntuple->dumpData();
-	    }
-	}
-      G4cout << G4endl;
-      
-      delete handler;
-      products->clearAndDestroy();
-      delete products;
-    }
-
-  hbookManager->write();
-
-  
-  return EXIT_SUCCESS;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: trunk/source/processes/hadronic/models/de_excitation/handler/test/GNUmakefile
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/handler/test/GNUmakefile	(revision 1350)
+++ 	(revision )
@@ -1,28 +1,0 @@
-# $Id: GNUmakefile,v 1.1 2003/10/07 12:54:57 lara Exp $
-# ----------------------------------------------------------------
-# Makes test program in environment variable G4TARGET.
-# ----------------------------------------------------------------
-
-ifndef G4TARGET
-  G4TARGET := $(TESTTARGET)
-endif
-
-ifndef G4INSTALL
-  G4INSTALL = ../../../../../../../
-endif
-
-G4EXEC_BUILD = true
-
-include $(G4INSTALL)/config/architecture.gmk
-
-include $(G4INSTALL)/config/binmake.gmk
-
-
-
-
-
-
-
-
-
-
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/test/G4MultiFragTest.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/test/G4MultiFragTest.cc	(revision 1350)
+++ 	(revision )
@@ -1,95 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-
-#include "G4StatMF.hh"
-
-#include "G4NucleiProperties.hh"
-
-
-
-
-int main()
-{
-  G4int A, Z;
-  
-  std::cout << "Please enter Z : ";
-  std::cin >> Z;
-  std::cout << "Please enter A : ";
-  std::cin >> A;
-  
-  G4double energy;
-
-  std::cout << "Please enter excitation energy per nucleon (MeV) : ";
-  std::cin >> energy;
-  
-
-  energy *= static_cast<G4double>(A)*MeV;
-  
-  G4int iterations;
-  std::cout << "Please enter number of interations : ";
-  std::cin >> iterations;
-  
-  G4double NuclearMass = G4NucleiProperties::GetNuclearMass(A,Z) + energy;
-
-  
-  G4LorentzVector p4(0.0,0.0,0.0,NuclearMass);
-  G4Fragment aFragment(A,Z,p4);
-  
-  G4StatMF model;
-
-  std::cout << "Excited Nucleus\n";
-  std::cout << aFragment << "\n\n";
-  
-  G4LorentzVector p4null(0.0,0.0,0.0,0.0);
-  G4double multiplicity = 0.0;
-  
-  for (G4int i = 0; i < iterations; ++i)
-    {
-      G4LorentzVector p4cons;
-      p4cons = p4null;
-      std::cout << "############ event " << i+1 << "###########################\n";
-      G4FragmentVector * theResult = model.BreakItUp(aFragment);
-      std::cout << "Number of fragments: " << theResult->size() << '\n';
-      std::cout << "-------------------------------------------\n";
-      multiplicity += static_cast<G4double>(theResult->size());
-      for (G4FragmentVector::iterator i = theResult->begin(); i != theResult->end(); ++i)
-        {
-          std::cout << (*i);
-          std::cout << "\n-------------------------------------------\n";
-          p4cons += (*i)->GetMomentum();
-          delete (*i);
-        }
-      delete theResult;
-      std::cout << "        Initial momentum : " << p4 << '\n';
-      std::cout << "Fragments total momentum : " << p4cons << '\n';
-      std::cout << "            Conservation : " << p4-p4cons << '\n';
-    }
-  std::cout << "\n###########################################\n";
-  std::cout << "       Mean multiplicity : " << multiplicity/static_cast<G4double>(iterations) << '\n';
-  return 0;
-}
-
-      
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/test/GNUmakefile
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/test/GNUmakefile	(revision 1350)
+++ 	(revision )
@@ -1,37 +1,0 @@
-# $Id: GNUmakefile,v 1.2 2008/07/25 11:43:17 vnivanch Exp $
-# ----------------------------------------------------------------
-# Makes test program in environment variable G4TARGET.
-# ----------------------------------------------------------------
-
-ifndef G4TARGET
-  G4TARGET := $(TESTTARGET)
-endif
-
-ifndef G4INSTALL
-  G4INSTALL = ../../../../../../../
-endif
-
-G4EXEC_BUILD = true
-
-ifdef G4ANALYSIS_USE_ROOT
-  CPPFLAGS += -DG4ANALYSIS_USE_ROOT
-endif
-
-include $(G4INSTALL)/config/architecture.gmk
-
-ifdef G4ANALYSIS_USE_ROOT
-  CPPFLAGS += $(shell $(ROOTSYS)/bin/root-config --cflags)
-  LDFLAGS  += $(shell $(ROOTSYS)/bin/root-config --glibs)
-endif
-
-include $(G4INSTALL)/config/binmake.gmk
-
-
-
-
-
-
-
-
-
-
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/test/MFTestHisto.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/test/MFTestHisto.cc	(revision 1350)
+++ 	(revision )
@@ -1,126 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-//
-// Igor Pshenichnov 10.05.2008
-// This main{} used to run standalone tests for multifragmentation of excited nuclei
-// ROOT installation is reqired
-  
-
-#include "G4StatMF.hh"
-#include "G4NucleiProperties.hh"
-#include "MFTestHistoManager.hh"
-#include "Randomize.hh"
-
-#ifdef G4ANALYSIS_USE_ROOT
-#include "TFile.h"
-#include "TH1D.h"
-#include "TH2D.h" 
-#endif
-
-#include "MFTestHistoManager.cc"
-
-int main()
-{
-  // The user will be asked for the charge and mass of the hot nuclear system to
-  // simulate decay. 
-
-  MFTestHistoManager histoManager;
-
-  // Histograms will be booked now.
-  histoManager.BookHisto();
-
-  G4int A = histoManager.GetA();
-  G4int Z = histoManager.GetZ();
-    
-  G4StatMF model;
-
-  G4LorentzVector p4null(0.0,0.0,0.0,0.0);
-
-
-  G4double totalNumFragments = 0.;
-  G4int thisEventNumFragments = 0;
-
-  G4int iterations = histoManager.GetIterations();
-
-  std::cout.setf(std::ios::scientific,std::ios::floatfield);
-
-  for (G4int i = 0; i < iterations; ++i) {
-
-  G4double energy = (histoManager.GetUpEn() - histoManager.GetLowEn())*G4UniformRand() 
-                                                             + histoManager.GetLowEn();
-
-  G4double NuclearMass = G4NucleiProperties::GetNuclearMass(A,Z) + energy;
-  G4LorentzVector p4(0.0,0.0,0.0,NuclearMass);
-  G4Fragment aFragment(A,Z,p4);
-                                                          
-  G4LorentzVector p4cons;
-  p4cons = p4null;
-      
-  G4FragmentVector * theResult = model.BreakItUp(aFragment);
-  thisEventNumFragments = theResult->size();
-  if ( i%100 == 0 ) std::cout << "### event " << i << " at " 
-			      << energy/A << " MeV/nucleon" 
-			      << " with "<< thisEventNumFragments <<" fragments #####\n";
-  histoManager.fill(0,energy/A,thisEventNumFragments);
-
-  totalNumFragments += thisEventNumFragments;
- 
-  for (G4FragmentVector::iterator i = theResult->begin(); i != theResult->end(); ++i)
-    {
-      p4cons += (*i)->GetMomentum();
-
-      G4double thisFragmentZ = (*i)->GetZ();
-      G4double thisFragmentA = (*i)->GetA();
-      histoManager.fill2(0,energy/A,thisFragmentZ,1.);
-      histoManager.fill2(1,energy/A,thisFragmentA,1.);
-     
-      histoManager.fill(3,thisFragmentA,thisFragmentZ);
-      histoManager.fill(4,thisFragmentA,1.);
-       
-      if ( (int)thisFragmentZ == 6 && (int)thisFragmentA == 10) {
-	histoManager.fill(1,energy/A,1.);
-      }
-      if ( (int)thisFragmentZ == 6 && (int)thisFragmentA == 11) {
-	histoManager.fill(2,energy/A,1.);
-      }
-                      
-      delete (*i);
-    }
-  delete theResult;
-  }
-
-  std::cout << " ------------------------------------------------------------------  " << '\n';
-  std::cout << " Average fragment multiplicty for the whole energy range: " 
-	    << totalNumFragments/iterations << '\n';
-  
-  histoManager.NormalizeHisto();
-  histoManager.CleanHisto();
-
-  return 0;
-}
-
-
-      
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/test/MFTestHistoManager.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/test/MFTestHistoManager.cc	(revision 1350)
+++ 	(revision )
@@ -1,181 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-//
-// Igor Pshenichnov 01.12.2006
-
-#include "MFTestHistoManager.hh"
-
-#ifdef G4ANALYSIS_USE_ROOT
-#include "TFile.h"
-#include "TH1D.h"
-#include "TH2D.h" 
-#endif
-
-MFTestHistoManager::MFTestHistoManager()
-  : Z(0), A(0), lowLimitExEn(-1.), upperLimitExEn(-1.), binsExEn(1), eventsPerBin(1) 
-{  
-  std::cout << "######### Test the Statistical Multifragmentation model of GEANT4" << G4endl;
-
-  while ( (Z<8) || (Z>100) )  {
-  std::cout << "Please choose Z from 8 to 100: ";
-  std::cin >> Z;
-  }
-
-  while ( (A<16) || (A>250) ) {
-  std::cout << "Please choose A from 16 to 250: ";
-  std::cin >> A;
-  }
-
-  while ( (lowLimitExEn<0.) || (lowLimitExEn>100.) ) {
-  std::cout << "Please choose the low limit for the range of excitation energy (per nucleon in MeV) : from 0 to 100: ";
-  std::cin >> lowLimitExEn;
-  }
-
-  while ( (upperLimitExEn<0.) || (upperLimitExEn>100.) || (upperLimitExEn<lowLimitExEn) ) {
-  std::cout << "Please choose the upper limit for the range of excitation energy (per nucleon in MeV) : from 0 to 100: ";
-  std::cin >> upperLimitExEn;
-  }
-  lowLimitExEn *= A;
-  lowLimitExEn *= MeV;
-  upperLimitExEn *=A;
-  upperLimitExEn *=MeV;
-
-
-  while ( (binsExEn<10) || (binsExEn>10000) ) {
-  std::cout << "Please choose the number of bins in histograms (10 - 1000): ";
-  std::cin >> binsExEn;
-  }
-
-  while ( (eventsPerBin<10) || (eventsPerBin>10000) ) {
-  std::cout << "Please enter the average number of break-up events in each bin (10 - 10000): ";
-  std::cin >> eventsPerBin;
-  } 
-  iterations = binsExEn*eventsPerBin;
-
-  std::cout << "Please enter the file name to write histograms (.root will be supplied): ";
-  std::cin >> fileName;
- 
-#ifdef G4ANALYSIS_USE_ROOT
-  for (G4int j=0; j<20; j++) histo[j] = 0;
-  for (G4int l=0; l<10; l++) histo2[l] = 0;
-#endif
-
-}
-
-
-MFTestHistoManager::~MFTestHistoManager()
-{}
-
-void MFTestHistoManager::BookHisto()
-{
-#ifdef G4ANALYSIS_USE_ROOT
-
-  // Open a file to keep histograms inside it ... 
-
-  if ( fileName == "") fileName = "MFTest";
-  fileType = "root";
-
-  fileFullName = fileName+"."+fileType;
-  compressionFactor = 8;
-  fFile = new TFile(fileFullName, "RECREATE", fileName, compressionFactor);
-  G4cout << "Histograms will be written to " << fileFullName << G4endl;
-
-  // Book all histograms there ...
-
-  histo[0] =  new TH1D("multip","Average multiplicity",binsExEn,lowLimitExEn/A,upperLimitExEn/A);
-  histo[1] =  new TH1D("C10","Yield of C-10",binsExEn,lowLimitExEn/A,upperLimitExEn/A);
-  histo[2] =  new TH1D("C11","Yield of C-11",binsExEn,lowLimitExEn/A,upperLimitExEn/A);
-  histo[3] =  new TH1D("<Z>(A)","aver Z for given A", A+2, -0.5, A+1.5);
-  histo[4] =  new TH1D("NofE(A)","Number of entries for each A",  A+2, -0.5, A+1.5);
-
-  histo2[0] = new TH2D("Z", "Charge distribution of fragments",
-		       binsExEn,lowLimitExEn/A,upperLimitExEn/A,
-		       Z+2, -0.5, Z+1.5);
-  histo2[1] = new TH2D("A", "Mass distribution of fragments",
-		       binsExEn,lowLimitExEn/A,upperLimitExEn/A,
-		       A+2, -0.5, A+1.5);
-
-#endif  
-}
-
-void MFTestHistoManager::NormalizeHisto()
-{
-#ifdef G4ANALYSIS_USE_ROOT
-
-  // Divide by the number of events in each energy bin:
- 
-  G4double factor = 1./eventsPerBin;
-
-  histo[0]->Scale(factor);
-  histo[1]->Scale(factor);
-  histo[2]->Scale(factor);
-  histo2[0]->Scale(factor);
-  histo2[1]->Scale(factor);
-
-  // Special procedure to calculate the average Z for given A
-
-  G4double content = 0.;
-  G4double NofEventsInTheBin = 0.;
-  
-  for (G4int i=0; i<=histo[3]->GetNbinsX(); i++){
-   
-    content = histo[3]->GetBinContent(i);
-    NofEventsInTheBin = histo[4]->GetBinContent(i);
-
-    if (NofEventsInTheBin > 0.) {
-      content /= NofEventsInTheBin;
-      histo[3]->SetBinContent(i,content); 
-    }
-  }; 
- 
-#endif   
-
-}
-
-void MFTestHistoManager::CleanHisto()
-{
-#ifdef G4ANALYSIS_USE_ROOT
-  fFile->Write();
-  G4cout << "\n----> Histograms were written into the file " << fileFullName << G4endl;
-  //  delete [] histo;
-  //  delete [] histo2;
-  delete fFile;
-#endif
-}
-
-void MFTestHistoManager::fill(G4int i, G4double x, G4double y)
-{
-#ifdef G4ANALYSIS_USE_ROOT
-  histo[i]->Fill(x,y);
-#endif
-}
-  
-void MFTestHistoManager::fill2(G4int i, G4double x, G4double y, G4double z)
-{
-#ifdef G4ANALYSIS_USE_ROOT
-  histo2[i]->Fill(x,y,z);
-#endif
-}
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/test/MFTestHistoManager.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/test/MFTestHistoManager.hh	(revision 1350)
+++ 	(revision )
@@ -1,91 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-//
-// Igor Pshenichnov 01.12.2006
-
-#ifndef MFTestHistoManager_h
-#define MFTestHistoManager_h 1
-
-#include "globals.hh"
-
-class TFile;
-class TH1D;
-class TH2D;
-
-class MFTestHistoManager
-{
-  public:
-
-  MFTestHistoManager();
-   ~MFTestHistoManager();
-
-#ifdef G4ANALYSIS_USE_ROOT
-  TH1D* GetHisto(G4int id) {return histo[id];};
-  TH2D* GetHisto2(G4int id) {return histo2[id];};
-#endif
-       
-  void BookHisto();
-  void NormalizeHisto();
-  void CleanHisto();
-
-  void fill(G4int i, G4double x, G4double y);
-  void fill2(G4int i, G4double x, G4double y, G4double z);
-
-  inline G4int GetZ()    {return Z;};
-  inline G4int GetA()    {return A;};
-  inline G4int GetIterations()  {return iterations;};
-  inline G4double GetLowEn() {return lowLimitExEn;};
-  inline G4double GetUpEn() {return upperLimitExEn;};
-
-
-  
-  private:
-
-#ifdef G4ROOT_USE
-  TFile* fFile;
-  TH1D*  histo[20];
-  TH2D*  histo2[10];   
-#endif
-
-
-  G4int Z;
-  G4int A;
-  G4int iterations; 
-   
-  G4String fileName;
-  G4String fileType;
-
-  G4String     fileFullName;
-  G4int        compressionFactor;
-
-  G4double lowLimitExEn;
-  G4double upperLimitExEn;
-  G4int    binsExEn;
-  G4int    eventsPerBin;      
-
-};
-
-#endif
Index: trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/include/G4DummyProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/include/G4DummyProbability.hh	(revision 1350)
+++ 	(revision )
@@ -1,66 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-//
-//
-
-#ifndef G4DummyProbability_hh
-#define G4DummyProbability_hh
-
-#include "globals.hh"
-#include "G4VEmissionProbability.hh"
-#include "G4Fragment.hh"
-#include "G4VLevelDensityParameter.hh"
-
-class G4DummyProbability : public G4VEmissionProbability
-{
-
-public:
-
-  G4DummyProbability() {};
-
-  ~G4DummyProbability();
-
-  G4double EmissionProbability(const G4Fragment& frag, const G4double excite);
-  G4double EmissionProbDensity(const G4Fragment& frag, const G4double ePhoton);
-
-private:
-
-  // G4DummyProbability() {};
-
-  G4DummyProbability(const G4DummyProbability& right);
-
-  const G4DummyProbability& operator=(const G4DummyProbability& right);
-  G4bool operator==(const G4DummyProbability& right) const;
-  G4bool operator!=(const G4DummyProbability& right) const;
-
-};
-
-#endif
-
-
-
-
-
Index: trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/include/G4E1Probability001.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/include/G4E1Probability001.hh	(revision 1350)
+++ 	(revision )
@@ -1,69 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-//
-//
-
-#ifndef G4E1Probability001_hh
-#define G4E1Probability001_hh
-
-#include "globals.hh"
-#include "G4VEmissionProbability.hh"
-#include "G4Fragment.hh"
-#include "G4VLevelDensityParameter.hh"
-
-class G4E1Probability001 : public G4VEmissionProbability
-{
-
-public:
-
-  G4E1Probability001() {};
-
-  ~G4E1Probability001();
-
-  G4double EmissionProbability(const G4Fragment& frag, const G4double excite);
-  G4double EmissionProbDensity(const G4Fragment& frag, const G4double ePhoton);
-
-private:
-
-  // G4E1Probability001() {};
-
-  G4E1Probability001(const G4E1Probability001& right);
-
-  const G4E1Probability001& operator=(const G4E1Probability001& right);
-  G4bool operator==(const G4E1Probability001& right) const;
-  G4bool operator!=(const G4E1Probability001& right) const;
-
-  // Integrator (simple Gaussian quadrature)
-
-  G4double EmissionIntegration(const G4Fragment& frag, const G4double excite,
-                               const G4double lowLim, const G4double upLim,
-                               const G4int numIters);
-
-  // G4VLevelDensityParameter* _levelDensity; // Don't need this
-
-};
-
-#endif
Index: trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/include/G4E1Probability01.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/include/G4E1Probability01.hh	(revision 1350)
+++ 	(revision )
@@ -1,69 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-//
-//
-
-#ifndef G4E1Probability01_hh
-#define G4E1Probability01_hh
-
-#include "globals.hh"
-#include "G4VEmissionProbability.hh"
-#include "G4Fragment.hh"
-#include "G4VLevelDensityParameter.hh"
-
-class G4E1Probability01 : public G4VEmissionProbability
-{
-
-public:
-
-  G4E1Probability01() {};
-
-  ~G4E1Probability01();
-
-  G4double EmissionProbability(const G4Fragment& frag, const G4double excite);
-  G4double EmissionProbDensity(const G4Fragment& frag, const G4double ePhoton);
-
-private:
-
-  // G4E1Probability01() {};
-
-  G4E1Probability01(const G4E1Probability01& right);
-
-  const G4E1Probability01& operator=(const G4E1Probability01& right);
-  G4bool operator==(const G4E1Probability01& right) const;
-  G4bool operator!=(const G4E1Probability01& right) const;
-
-  // Integrator (simple Gaussian quadrature)
-
-  G4double EmissionIntegration(const G4Fragment& frag, const G4double excite,
-                               const G4double lowLim, const G4double upLim,
-                               const G4int numIters);
-
-  // G4VLevelDensityParameter* _levelDensity; // Don't need this
-
-};
-
-#endif
Index: trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/include/G4E1Probability10.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/include/G4E1Probability10.hh	(revision 1350)
+++ 	(revision )
@@ -1,69 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-//
-//
-
-#ifndef G4E1Probability10_hh
-#define G4E1Probability10_hh
-
-#include "globals.hh"
-#include "G4VEmissionProbability.hh"
-#include "G4Fragment.hh"
-#include "G4VLevelDensityParameter.hh"
-
-class G4E1Probability10 : public G4VEmissionProbability
-{
-
-public:
-
-  G4E1Probability10() {};
-
-  ~G4E1Probability10();
-
-  G4double EmissionProbability(const G4Fragment& frag, const G4double excite);
-  G4double EmissionProbDensity(const G4Fragment& frag, const G4double ePhoton);
-
-private:
-
-  // G4E1Probability10() {};
-
-  G4E1Probability10(const G4E1Probability10& right);
-
-  const G4E1Probability10& operator=(const G4E1Probability10& right);
-  G4bool operator==(const G4E1Probability10& right) const;
-  G4bool operator!=(const G4E1Probability10& right) const;
-
-  // Integrator (simple Gaussian quadrature)
-
-  G4double EmissionIntegration(const G4Fragment& frag, const G4double excite,
-                               const G4double lowLim, const G4double upLim,
-                               const G4int numIters);
-
-  // G4VLevelDensityParameter* _levelDensity; // Don't need this
-
-};
-
-#endif
Index: trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/include/G4E1Probability100.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/include/G4E1Probability100.hh	(revision 1350)
+++ 	(revision )
@@ -1,69 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-//
-//
-
-#ifndef G4E1Probability100_hh
-#define G4E1Probability100_hh
-
-#include "globals.hh"
-#include "G4VEmissionProbability.hh"
-#include "G4Fragment.hh"
-#include "G4VLevelDensityParameter.hh"
-
-class G4E1Probability100 : public G4VEmissionProbability
-{
-
-public:
-
-  G4E1Probability100() {};
-
-  ~G4E1Probability100();
-
-  G4double EmissionProbability(const G4Fragment& frag, const G4double excite);
-  G4double EmissionProbDensity(const G4Fragment& frag, const G4double ePhoton);
-
-private:
-
-  // G4E1Probability100() {};
-
-  G4E1Probability100(const G4E1Probability100& right);
-
-  const G4E1Probability100& operator=(const G4E1Probability100& right);
-  G4bool operator==(const G4E1Probability100& right) const;
-  G4bool operator!=(const G4E1Probability100& right) const;
-
-  // Integrator (simple Gaussian quadrature)
-
-  G4double EmissionIntegration(const G4Fragment& frag, const G4double excite,
-                               const G4double lowLim, const G4double upLim,
-                               const G4int numIters);
-
-  // G4VLevelDensityParameter* _levelDensity; // Don't need this
-
-};
-
-#endif
Index: trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/include/G4E1SingleProbability001.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/include/G4E1SingleProbability001.hh	(revision 1350)
+++ 	(revision )
@@ -1,70 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-//
-//
-
-#ifndef G4E1SingleProbability001_hh
-#define G4E1SingleProbability001_hh
-
-#include "globals.hh"
-#include "G4VEmissionProbability.hh"
-#include "G4Fragment.hh"
-#include "G4VLevelDensityParameter.hh"
-
-class G4E1SingleProbability001 : public G4VEmissionProbability
-{
-
-public:
-
-  G4E1SingleProbability001() {};
-
-  ~G4E1SingleProbability001();
-
-  G4double EmissionProbability(const G4Fragment& frag, const G4double excite);
-  G4double EmissionProbDensity(const G4Fragment& frag, const G4double ePhoton);
-
-private:
-
-  // G4E1SingleProbability001() {};
-
-  G4E1SingleProbability001(const G4E1SingleProbability001& right);
-
-  const G4E1SingleProbability001& operator=(const G4E1SingleProbability001& 
-					    right);
-  G4bool operator==(const G4E1SingleProbability001& right) const;
-  G4bool operator!=(const G4E1SingleProbability001& right) const;
-
-  // Integrator (simple Gaussian quadrature)
-
-  G4double EmissionIntegration(const G4Fragment& frag, const G4double excite,
-                               const G4double lowLim, const G4double upLim,
-                               const G4int numIters);
-
-  // G4VLevelDensityParameter* _levelDensity; // Don't need this
-
-};
-
-#endif
Index: trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/include/G4E1SingleProbability01.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/include/G4E1SingleProbability01.hh	(revision 1350)
+++ 	(revision )
@@ -1,70 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-//
-//
-
-#ifndef G4E1SingleProbability01_hh
-#define G4E1SingleProbability01_hh
-
-#include "globals.hh"
-#include "G4VEmissionProbability.hh"
-#include "G4Fragment.hh"
-#include "G4VLevelDensityParameter.hh"
-
-class G4E1SingleProbability01 : public G4VEmissionProbability
-{
-
-public:
-
-  G4E1SingleProbability01() {};
-
-  ~G4E1SingleProbability01();
-
-  G4double EmissionProbability(const G4Fragment& frag, const G4double excite);
-  G4double EmissionProbDensity(const G4Fragment& frag, const G4double ePhoton);
-
-private:
-
-  // G4E1SingleProbability01() {};
-
-  G4E1SingleProbability01(const G4E1SingleProbability01& right);
-
-  const G4E1SingleProbability01& operator=(const G4E1SingleProbability01& 
-					   right);
-  G4bool operator==(const G4E1SingleProbability01& right) const;
-  G4bool operator!=(const G4E1SingleProbability01& right) const;
-
-  // Integrator (simple Gaussian quadrature)
-
-  G4double EmissionIntegration(const G4Fragment& frag, const G4double excite,
-                               const G4double lowLim, const G4double upLim,
-                               const G4int numIters);
-
-  // G4VLevelDensityParameter* _levelDensity; // Don't need this
-
-};
-
-#endif
Index: trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/include/G4E1SingleProbability10.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/include/G4E1SingleProbability10.hh	(revision 1350)
+++ 	(revision )
@@ -1,70 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-//
-//
-
-#ifndef G4E1SingleProbability10_hh
-#define G4E1SingleProbability10_hh
-
-#include "globals.hh"
-#include "G4VEmissionProbability.hh"
-#include "G4Fragment.hh"
-#include "G4VLevelDensityParameter.hh"
-
-class G4E1SingleProbability10 : public G4VEmissionProbability
-{
-
-public:
-
-  G4E1SingleProbability10() {};
-
-  ~G4E1SingleProbability10();
-
-  G4double EmissionProbability(const G4Fragment& frag, const G4double excite);
-  G4double EmissionProbDensity(const G4Fragment& frag, const G4double ePhoton);
-
-private:
-
-  // G4E1SingleProbability10() {};
-
-  G4E1SingleProbability10(const G4E1SingleProbability10& right);
-
-  const G4E1SingleProbability10& operator=(const G4E1SingleProbability10& 
-					   right);
-  G4bool operator==(const G4E1SingleProbability10& right) const;
-  G4bool operator!=(const G4E1SingleProbability10& right) const;
-
-  // Integrator (simple Gaussian quadrature)
-
-  G4double EmissionIntegration(const G4Fragment& frag, const G4double excite,
-                               const G4double lowLim, const G4double upLim,
-                               const G4int numIters);
-
-  // G4VLevelDensityParameter* _levelDensity; // Don't need this
-
-};
-
-#endif
Index: trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/include/G4E1SingleProbability100.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/include/G4E1SingleProbability100.hh	(revision 1350)
+++ 	(revision )
@@ -1,70 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-//
-//
-
-#ifndef G4E1SingleProbability100_hh
-#define G4E1SingleProbability100_hh
-
-#include "globals.hh"
-#include "G4VEmissionProbability.hh"
-#include "G4Fragment.hh"
-#include "G4VLevelDensityParameter.hh"
-
-class G4E1SingleProbability100 : public G4VEmissionProbability
-{
-
-public:
-
-  G4E1SingleProbability100() {};
-
-  ~G4E1SingleProbability100();
-
-  G4double EmissionProbability(const G4Fragment& frag, const G4double excite);
-  G4double EmissionProbDensity(const G4Fragment& frag, const G4double ePhoton);
-
-private:
-
-  // G4E1SingleProbability100() {};
-
-  G4E1SingleProbability100(const G4E1SingleProbability100& right);
-
-  const G4E1SingleProbability100& operator=(const G4E1SingleProbability100& 
-					    right);
-  G4bool operator==(const G4E1SingleProbability100& right) const;
-  G4bool operator!=(const G4E1SingleProbability100& right) const;
-
-  // Integrator (simple Gaussian quadrature)
-
-  G4double EmissionIntegration(const G4Fragment& frag, const G4double excite,
-                               const G4double lowLim, const G4double upLim,
-                               const G4int numIters);
-
-  // G4VLevelDensityParameter* _levelDensity; // Don't need this
-
-};
-
-#endif
Index: trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4DummyProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4DummyProbability.cc	(revision 1350)
+++ 	(revision )
@@ -1,100 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-//
-//  Class G4DummyProbability.cc
-//
-
-#include "G4DummyProbability.hh"
-#include "G4ConstantLevelDensityParameter.hh"
-#include "Randomize.hh"
-
-// Constructors and operators
-//
-
-G4DummyProbability::G4DummyProbability(const G4DummyProbability& ) : G4VEmissionProbability()
-{
-
-  throw G4HadronicException(__FILE__, __LINE__, "G4DummyProbability::copy_constructor meant to not be accessible");
-
-}
-
-const G4DummyProbability& G4DummyProbability::
-operator=(const G4DummyProbability& ) 
-{
-
-  throw G4HadronicException(__FILE__, __LINE__, "G4DummyProbability::operator= meant to not be accessible");
-  return *this;
-}
-
-G4bool G4DummyProbability::operator==(const G4DummyProbability& ) const
-{
-
-  return false;
-
-}
-
-G4bool G4DummyProbability::operator!=(const G4DummyProbability& ) const
-{
-
-  return true;
-
-}
-
-// Calculate the emission probability
-//
-
-G4double G4DummyProbability::EmissionProbDensity(const G4Fragment& , 
-                                                 const G4double )
-{
-
-  G4double theProb = 0.0;
-
-  return theProb;
-
-}
-
-G4double G4DummyProbability::EmissionProbability(const G4Fragment& , 
-                                                 const G4double )
-{
-
-  // From nuclear fragment properties and the excitation energy, calculate
-  // the probability for photon evaporation down to last ground level.
-  // fragment = nuclear fragment BEFORE de-excitation
-
-  G4double theProb = 0.0;
-
-  // Fall-back is a uniform random number
-
-  G4double uniformNum = G4UniformRand();
-  theProb = uniformNum;
-
-  return theProb;
-
-}
-
-G4DummyProbability::~G4DummyProbability() {}
-
-
Index: trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4E1Probability001.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4E1Probability001.cc	(revision 1350)
+++ 	(revision )
@@ -1,217 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-//
-//  Class G4E1Probability001.cc
-//
-
-#include "G4E1Probability001.hh"
-#include "G4ConstantLevelDensityParameter.hh"
-#include "Randomize.hh"
-
-// Constructors and operators
-//
-
-G4E1Probability001::G4E1Probability001(const G4E1Probability001& ) : G4VEmissionProbability()
-
-{
-
- throw G4HadronicException(__FILE__, __LINE__, "G4E1Probability001::copy_constructor meant to not be accessible");
-
-}
-
-const G4E1Probability001& G4E1Probability001::
-operator=(const G4E1Probability001& ) 
-{
-
-  throw G4HadronicException(__FILE__, __LINE__, "G4E1Probability001::operator= meant to not be accessible");
-  return *this;
-}
-
-G4bool G4E1Probability001::operator==(const G4E1Probability001& ) const
-{
-
-  return false;
-
-}
-
-G4bool G4E1Probability001::operator!=(const G4E1Probability001& ) const
-{
-
-  return true;
-
-}
-
-// Calculate the emission probability
-//
-
-G4double G4E1Probability001::EmissionProbDensity(const G4Fragment& frag, 
-						 const G4double exciteE)
-{
-
-  // Calculate the probability density here
-
-  // From nuclear fragment properties and the excitation energy, calculate
-  // the probability density for photon evaporation from U to U - exciteE
-  // (U = nucleus excitation energy, exciteE = total evaporated photon
-  // energy).
-  // fragment = nuclear fragment BEFORE de-excitation
-
-  G4double theProb = 0.0;
-
-  const G4double Afrag = frag.GetA();
-  const G4double Zfrag = frag.GetZ();
-  const G4double Uexcite = frag.GetExcitationEnergy();
-
-  if( (Uexcite-exciteE) < 0.0 || exciteE < 0 || Uexcite <= 0) return theProb;
-
-  // Need a level density parameter.
-  // For now, just use the constant approximation (not reliable near magic
-  // nuclei).
-
-  G4ConstantLevelDensityParameter a;
-  G4double aLevelDensityParam = a.LevelDensityParameter(static_cast<G4int>(Afrag),
-							static_cast<G4int>(Zfrag),
-							Uexcite);
-
-  G4double levelDensBef = std::exp(2.0*std::sqrt(aLevelDensityParam*Uexcite));
-  G4double levelDensAft = std::exp(2.0*std::sqrt(aLevelDensityParam*(Uexcite-exciteE)));
-
-  // Now form the probability density
-
-  // Define constants for the photoabsorption cross-section (the reverse
-  // process of our de-excitation)
-
-  G4double sigma0 = 2.5 * Afrag * millibarn;  // millibarns
-
-  G4double Egdp = (40.3 / std::pow(Afrag,0.2) )*MeV;
-  G4double GammaR = 0.30 * Egdp;
- 
-  G4double normC = 1.0 / ((pi * hbarc)*(pi * hbarc));
-
-  // CD
-  //cout<<"  PROB TESTS "<<G4endl;
-  //cout<<" hbarc = "<<hbarc<<G4endl;
-  //cout<<" pi = "<<pi<<G4endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite<<"  "<<exciteE<<G4endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<"  "<<exciteE*MeV<<G4endl;
-  //cout<<" lev density param = "<<aLevelDensityParam<<G4endl;
-  //cout<<" level densities = "<<levelDensBef<<"  "<<levelDensAft<<G4endl;
-  //cout<<" sigma0 = "<<sigma0<<G4endl;
-  //cout<<" Egdp, GammaR = "<<Egdp<<"  "<<GammaR<<G4endl;
-  //cout<<" normC = "<<normC<<G4endl;
-
-  G4double numerator = sigma0 * exciteE*exciteE * GammaR*GammaR;
-  G4double denominator = (exciteE*exciteE - Egdp*Egdp)*
-           (exciteE*exciteE - Egdp*Egdp) + GammaR*GammaR*exciteE*exciteE;
-
-  G4double sigmaAbs = numerator/denominator; 
-
-  theProb = normC * sigmaAbs * exciteE*exciteE *
-            levelDensAft/levelDensBef;
-
-  // CD
-  //cout<<" sigmaAbs = "<<sigmaAbs<<G4endl;
-  //cout<<" Probability = "<<theProb<<G4endl;
-
-  return theProb;
-
-}
-
-G4double G4E1Probability001::EmissionProbability(const G4Fragment& frag, 
-						 const G4double exciteE)
-{
-
-  // From nuclear fragment properties and the excitation energy, calculate
-  // the probability for photon evaporation down to last ground level.
-  // fragment = nuclear fragment BEFORE de-excitation
-
-  G4double theProb = 0.0;
-
-  G4double ScaleFactor = 0.001;
-
-  G4double Uafter = 0.0;
-  const G4double Uexcite = frag.GetExcitationEnergy();
-
-  G4double normC = 3.0;
-
-  const G4double upperLim = Uexcite;
-  const G4double lowerLim = Uafter;
-  const G4int numIters = 25;
-
-  // Fall-back is a uniform random number
-
-  //G4double uniformNum = G4UniformRand();
-  //theProb = uniformNum;
-
-  // Need to integrate EmissionProbDensity from lowerLim to upperLim 
-  // and multiply by normC
-
-  G4double integ = normC *
-           EmissionIntegration(frag,exciteE,lowerLim,upperLim,numIters);
-  if(integ > 0.0) theProb = integ;
-
-  return theProb * ScaleFactor;
-
-}
-
-G4double G4E1Probability001::EmissionIntegration(const G4Fragment& frag, 
-                             const G4double ,
-                             const G4double lowLim, const G4double upLim,
-                             const G4int numIters)
-
-{
-
-  // Simple Gaussian quadrature integration
-
-  G4double x;
-  G4double root3 = 1.0/std::sqrt(3.0);
-
-  G4double Step = (upLim-lowLim)/(2.0*numIters);
-  G4double Delta = Step*root3;
-
-  G4double mean = 0.0;
-
-  G4double theInt = 0.0;
-
-  for(G4int i = 0; i < numIters; i++) {
-
-    x = (2*i + 1)/Step;
-    G4double E1ProbDensityA = EmissionProbDensity(frag,x+Delta);
-    G4double E1ProbDensityB = EmissionProbDensity(frag,x-Delta);
-
-    mean += E1ProbDensityA + E1ProbDensityB;
-
-  }
-
-  if(mean*Step > 0.0) theInt = mean*Step;
-
-  return theInt;
-
-}
-
-G4E1Probability001::~G4E1Probability001() {}
-
-
Index: trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4E1Probability01.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4E1Probability01.cc	(revision 1350)
+++ 	(revision )
@@ -1,216 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-//
-//  Class G4E1Probability01.cc
-//
-
-#include "G4E1Probability01.hh"
-#include "G4ConstantLevelDensityParameter.hh"
-#include "Randomize.hh"
-
-// Constructors and operators
-//
-
-G4E1Probability01::G4E1Probability01(const G4E1Probability01& ) : G4VEmissionProbability()
-{
-
- throw G4HadronicException(__FILE__, __LINE__, "G4E1Probability01::copy_constructor meant to not be accessible");
-
-}
-
-const G4E1Probability01& G4E1Probability01::
-operator=(const G4E1Probability01& ) 
-{
-
-  throw G4HadronicException(__FILE__, __LINE__, "G4E1Probability01::operator= meant to not be accessible");
-  return *this;
-}
-
-G4bool G4E1Probability01::operator==(const G4E1Probability01& ) const
-{
-
-  return false;
-
-}
-
-G4bool G4E1Probability01::operator!=(const G4E1Probability01& ) const
-{
-
-  return true;
-
-}
-
-// Calculate the emission probability
-//
-
-G4double G4E1Probability01::EmissionProbDensity(const G4Fragment& frag, 
-						const G4double exciteE)
-{
-
-  // Calculate the probability density here
-
-  // From nuclear fragment properties and the excitation energy, calculate
-  // the probability density for photon evaporation from U to U - exciteE
-  // (U = nucleus excitation energy, exciteE = total evaporated photon
-  // energy).
-  // fragment = nuclear fragment BEFORE de-excitation
-
-  G4double theProb = 0.0;
-
-  const G4double Afrag = frag.GetA();
-  const G4double Zfrag = frag.GetZ();
-  const G4double Uexcite = frag.GetExcitationEnergy();
-
-  if( (Uexcite-exciteE) < 0.0 || exciteE < 0 || Uexcite <= 0) return theProb;
-
-  // Need a level density parameter.
-  // For now, just use the constant approximation (not reliable near magic
-  // nuclei).
-
-  G4ConstantLevelDensityParameter a;
-  G4double aLevelDensityParam = a.LevelDensityParameter(static_cast<G4int>(Afrag),
-							static_cast<G4int>(Zfrag),
-							Uexcite);
-
-  G4double levelDensBef = std::exp(2.0*std::sqrt(aLevelDensityParam*Uexcite));
-  G4double levelDensAft = std::exp(2.0*std::sqrt(aLevelDensityParam*(Uexcite-exciteE)));
-
-  // Now form the probability density
-
-  // Define constants for the photoabsorption cross-section (the reverse
-  // process of our de-excitation)
-
-  G4double sigma0 = 2.5 * Afrag * millibarn;  // millibarns
-
-  G4double Egdp = (40.3 / std::pow(Afrag,0.2) )*MeV;
-  G4double GammaR = 0.30 * Egdp;
- 
-  G4double normC = 1.0 / ((pi * hbarc)*(pi * hbarc));
-
-  // CD
-  //cout<<"  PROB TESTS "<<G4endl;
-  //cout<<" hbarc = "<<hbarc<<G4endl;
-  //cout<<" pi = "<<pi<<G4endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite<<"  "<<exciteE<<G4endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<"  "<<exciteE*MeV<<G4endl;
-  //cout<<" lev density param = "<<aLevelDensityParam<<G4endl;
-  //cout<<" level densities = "<<levelDensBef<<"  "<<levelDensAft<<G4endl;
-  //cout<<" sigma0 = "<<sigma0<<G4endl;
-  //cout<<" Egdp, GammaR = "<<Egdp<<"  "<<GammaR<<G4endl;
-  //cout<<" normC = "<<normC<<G4endl;
-
-  G4double numerator = sigma0 * exciteE*exciteE * GammaR*GammaR;
-  G4double denominator = (exciteE*exciteE - Egdp*Egdp)*
-           (exciteE*exciteE - Egdp*Egdp) + GammaR*GammaR*exciteE*exciteE;
-
-  G4double sigmaAbs = numerator/denominator; 
-
-  theProb = normC * sigmaAbs * exciteE*exciteE *
-            levelDensAft/levelDensBef;
-
-  // CD
-  //cout<<" sigmaAbs = "<<sigmaAbs<<G4endl;
-  //cout<<" Probability = "<<theProb<<G4endl;
-
-  return theProb;
-
-}
-
-G4double G4E1Probability01::EmissionProbability(const G4Fragment& frag, 
-						const G4double exciteE)
-{
-
-  // From nuclear fragment properties and the excitation energy, calculate
-  // the probability for photon evaporation down to last ground level.
-  // fragment = nuclear fragment BEFORE de-excitation
-
-  G4double theProb = 0.0;
-
-  G4double ScaleFactor = 0.01;
-
-  G4double Uafter = 0.0;
-  const G4double Uexcite = frag.GetExcitationEnergy();
-
-  G4double normC = 3.0;
-
-  const G4double upperLim = Uexcite;
-  const G4double lowerLim = Uafter;
-  const G4int numIters = 25;
-
-  // Fall-back is a uniform random number
-
-  //G4double uniformNum = G4UniformRand();
-  //theProb = uniformNum;
-
-  // Need to integrate EmissionProbDensity from lowerLim to upperLim 
-  // and multiply by normC
-
-  G4double integ = normC *
-           EmissionIntegration(frag,exciteE,lowerLim,upperLim,numIters);
-  if(integ > 0.0) theProb = integ;
-
-  return theProb * ScaleFactor;
-
-}
-
-G4double G4E1Probability01::EmissionIntegration(const G4Fragment& frag, 
-                             const G4double ,
-                             const G4double lowLim, const G4double upLim,
-                             const G4int numIters)
-
-{
-
-  // Simple Gaussian quadrature integration
-
-  G4double x;
-  G4double root3 = 1.0/std::sqrt(3.0);
-
-  G4double Step = (upLim-lowLim)/(2.0*numIters);
-  G4double Delta = Step*root3;
-
-  G4double mean = 0.0;
-
-  G4double theInt = 0.0;
-
-  for(G4int i = 0; i < numIters; i++) {
-
-    x = (2*i + 1)/Step;
-    G4double E1ProbDensityA = EmissionProbDensity(frag,x+Delta);
-    G4double E1ProbDensityB = EmissionProbDensity(frag,x-Delta);
-
-    mean += E1ProbDensityA + E1ProbDensityB;
-
-  }
-
-  if(mean*Step > 0.0) theInt = mean*Step;
-
-  return theInt;
-
-}
-
-G4E1Probability01::~G4E1Probability01() {}
-
-
Index: trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4E1Probability10.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4E1Probability10.cc	(revision 1350)
+++ 	(revision )
@@ -1,216 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-//
-//  Class G4E1Probability10.cc
-//
-
-#include "G4E1Probability10.hh"
-#include "G4ConstantLevelDensityParameter.hh"
-#include "Randomize.hh"
-
-// Constructors and operators
-//
-
-G4E1Probability10::G4E1Probability10(const G4E1Probability10& ): G4VEmissionProbability()
-{
-
- throw G4HadronicException(__FILE__, __LINE__, "G4E1Probability10::copy_constructor meant to not be accessible");
-
-}
-
-const G4E1Probability10& G4E1Probability10::
-operator=(const G4E1Probability10& ) 
-{
-
-  throw G4HadronicException(__FILE__, __LINE__, "G4E1Probability10::operator= meant to not be accessible");
-  return *this;
-}
-
-G4bool G4E1Probability10::operator==(const G4E1Probability10& ) const
-{
-
-  return false;
-
-}
-
-G4bool G4E1Probability10::operator!=(const G4E1Probability10& ) const
-{
-
-  return true;
-
-}
-
-// Calculate the emission probability
-//
-
-G4double G4E1Probability10::EmissionProbDensity(const G4Fragment& frag, 
-						const G4double exciteE)
-{
-
-  // Calculate the probability density here
-
-  // From nuclear fragment properties and the excitation energy, calculate
-  // the probability density for photon evaporation from U to U - exciteE
-  // (U = nucleus excitation energy, exciteE = total evaporated photon
-  // energy).
-  // fragment = nuclear fragment BEFORE de-excitation
-
-  G4double theProb = 0.0;
-
-  const G4double Afrag = frag.GetA();
-  const G4double Zfrag = frag.GetZ();
-  const G4double Uexcite = frag.GetExcitationEnergy();
-
-  if( (Uexcite-exciteE) < 0.0 || exciteE < 0 || Uexcite <= 0) return theProb;
-
-  // Need a level density parameter.
-  // For now, just use the constant approximation (not reliable near magic
-  // nuclei).
-
-  G4ConstantLevelDensityParameter a;
-  G4double aLevelDensityParam = a.LevelDensityParameter(static_cast<G4int>(Afrag),
-							static_cast<G4int>(Zfrag),
-							Uexcite);
-
-  G4double levelDensBef = std::exp(2.0*std::sqrt(aLevelDensityParam*Uexcite));
-  G4double levelDensAft = std::exp(2.0*std::sqrt(aLevelDensityParam*(Uexcite-exciteE)));
-
-  // Now form the probability density
-
-  // Define constants for the photoabsorption cross-section (the reverse
-  // process of our de-excitation)
-
-  G4double sigma0 = 2.5 * Afrag * millibarn;  // millibarns
-
-  G4double Egdp = (40.3 / std::pow(Afrag,0.2) )*MeV;
-  G4double GammaR = 0.30 * Egdp;
- 
-  G4double normC = 1.0 / ((pi * hbarc)*(pi * hbarc));
-
-  // CD
-  //cout<<"  PROB TESTS "<<G4endl;
-  //cout<<" hbarc = "<<hbarc<<G4endl;
-  //cout<<" pi = "<<pi<<G4endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite<<"  "<<exciteE<<G4endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<"  "<<exciteE*MeV<<G4endl;
-  //cout<<" lev density param = "<<aLevelDensityParam<<G4endl;
-  //cout<<" level densities = "<<levelDensBef<<"  "<<levelDensAft<<G4endl;
-  //cout<<" sigma0 = "<<sigma0<<G4endl;
-  //cout<<" Egdp, GammaR = "<<Egdp<<"  "<<GammaR<<G4endl;
-  //cout<<" normC = "<<normC<<G4endl;
-
-  G4double numerator = sigma0 * exciteE*exciteE * GammaR*GammaR;
-  G4double denominator = (exciteE*exciteE - Egdp*Egdp)*
-           (exciteE*exciteE - Egdp*Egdp) + GammaR*GammaR*exciteE*exciteE;
-
-  G4double sigmaAbs = numerator/denominator; 
-
-  theProb = normC * sigmaAbs * exciteE*exciteE *
-            levelDensAft/levelDensBef;
-
-  // CD
-  //cout<<" sigmaAbs = "<<sigmaAbs<<G4endl;
-  //cout<<" Probability = "<<theProb<<G4endl;
-
-  return theProb;
-
-}
-
-G4double G4E1Probability10::EmissionProbability(const G4Fragment& frag, 
-						const G4double exciteE)
-{
-
-  // From nuclear fragment properties and the excitation energy, calculate
-  // the probability for photon evaporation down to last ground level.
-  // fragment = nuclear fragment BEFORE de-excitation
-
-  G4double theProb = 0.0;
-
-  G4double ScaleFactor = 10.0;
-
-  G4double Uafter = 0.0;
-  const G4double Uexcite = frag.GetExcitationEnergy();
-
-  G4double normC = 3.0;
-
-  const G4double upperLim = Uexcite;
-  const G4double lowerLim = Uafter;
-  const G4int numIters = 25;
-
-  // Fall-back is a uniform random number
-
-  //G4double uniformNum = G4UniformRand();
-  //theProb = uniformNum;
-
-  // Need to integrate EmissionProbDensity from lowerLim to upperLim 
-  // and multiply by normC
-
-  G4double integ = normC *
-           EmissionIntegration(frag,exciteE,lowerLim,upperLim,numIters);
-  if(integ > 0.0) theProb = integ;
-
-  return theProb * ScaleFactor;
-
-}
-
-G4double G4E1Probability10::EmissionIntegration(const G4Fragment& frag, 
-                             const G4double ,
-                             const G4double lowLim, const G4double upLim,
-                             const G4int numIters)
-
-{
-
-  // Simple Gaussian quadrature integration
-
-  G4double x;
-  G4double root3 = 1.0/std::sqrt(3.0);
-
-  G4double Step = (upLim-lowLim)/(2.0*numIters);
-  G4double Delta = Step*root3;
-
-  G4double mean = 0.0;
-
-  G4double theInt = 0.0;
-
-  for(G4int i = 0; i < numIters; i++) {
-
-    x = (2*i + 1)/Step;
-    G4double E1ProbDensityA = EmissionProbDensity(frag,x+Delta);
-    G4double E1ProbDensityB = EmissionProbDensity(frag,x-Delta);
-
-    mean += E1ProbDensityA + E1ProbDensityB;
-
-  }
-
-  if(mean*Step > 0.0) theInt = mean*Step;
-
-  return theInt;
-
-}
-
-G4E1Probability10::~G4E1Probability10() {}
-
-
Index: trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4E1Probability100.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4E1Probability100.cc	(revision 1350)
+++ 	(revision )
@@ -1,216 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-//
-//  Class G4E1Probability100.cc
-//
-
-#include "G4E1Probability100.hh"
-#include "G4ConstantLevelDensityParameter.hh"
-#include "Randomize.hh"
-
-// Constructors and operators
-//
-
-G4E1Probability100::G4E1Probability100(const G4E1Probability100& ) : G4VEmissionProbability()
-{
-
- throw G4HadronicException(__FILE__, __LINE__, "G4E1Probability100::copy_constructor meant to not be accessible");
-
-}
-
-const G4E1Probability100& G4E1Probability100::
-operator=(const G4E1Probability100& ) 
-{
-
-  throw G4HadronicException(__FILE__, __LINE__, "G4E1Probability100::operator= meant to not be accessible");
-  return *this;
-}
-
-G4bool G4E1Probability100::operator==(const G4E1Probability100& ) const
-{
-
-  return false;
-
-}
-
-G4bool G4E1Probability100::operator!=(const G4E1Probability100& ) const
-{
-
-  return true;
-
-}
-
-// Calculate the emission probability
-//
-
-G4double G4E1Probability100::EmissionProbDensity(const G4Fragment& frag, 
-						 const G4double exciteE)
-{
-
-  // Calculate the probability density here
-
-  // From nuclear fragment properties and the excitation energy, calculate
-  // the probability density for photon evaporation from U to U - exciteE
-  // (U = nucleus excitation energy, exciteE = total evaporated photon
-  // energy).
-  // fragment = nuclear fragment BEFORE de-excitation
-
-  G4double theProb = 0.0;
-
-  const G4double Afrag = frag.GetA();
-  const G4double Zfrag = frag.GetZ();
-  const G4double Uexcite = frag.GetExcitationEnergy();
-
-  if( (Uexcite-exciteE) < 0.0 || exciteE < 0 || Uexcite <= 0) return theProb;
-
-  // Need a level density parameter.
-  // For now, just use the constant approximation (not reliable near magic
-  // nuclei).
-
-  G4ConstantLevelDensityParameter a;
-  G4double aLevelDensityParam = a.LevelDensityParameter(static_cast<G4int>(Afrag),
-							static_cast<G4int>(Zfrag),
-							Uexcite);
-
-  G4double levelDensBef = std::exp(2.0*std::sqrt(aLevelDensityParam*Uexcite));
-  G4double levelDensAft = std::exp(2.0*std::sqrt(aLevelDensityParam*(Uexcite-exciteE)));
-
-  // Now form the probability density
-
-  // Define constants for the photoabsorption cross-section (the reverse
-  // process of our de-excitation)
-
-  G4double sigma0 = 2.5 * Afrag * millibarn;  // millibarns
-
-  G4double Egdp = (40.3 / std::pow(Afrag,0.2) )*MeV;
-  G4double GammaR = 0.30 * Egdp;
- 
-  G4double normC = 1.0 / ((pi * hbarc)*(pi * hbarc));
-
-  // CD
-  //cout<<"  PROB TESTS "<<G4endl;
-  //cout<<" hbarc = "<<hbarc<<G4endl;
-  //cout<<" pi = "<<pi<<G4endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite<<"  "<<exciteE<<G4endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<"  "<<exciteE*MeV<<G4endl;
-  //cout<<" lev density param = "<<aLevelDensityParam<<G4endl;
-  //cout<<" level densities = "<<levelDensBef<<"  "<<levelDensAft<<G4endl;
-  //cout<<" sigma0 = "<<sigma0<<G4endl;
-  //cout<<" Egdp, GammaR = "<<Egdp<<"  "<<GammaR<<G4endl;
-  //cout<<" normC = "<<normC<<G4endl;
-
-  G4double numerator = sigma0 * exciteE*exciteE * GammaR*GammaR;
-  G4double denominator = (exciteE*exciteE - Egdp*Egdp)*
-           (exciteE*exciteE - Egdp*Egdp) + GammaR*GammaR*exciteE*exciteE;
-
-  G4double sigmaAbs = numerator/denominator; 
-
-  theProb = normC * sigmaAbs * exciteE*exciteE *
-            levelDensAft/levelDensBef;
-
-  // CD
-  //cout<<" sigmaAbs = "<<sigmaAbs<<G4endl;
-  //cout<<" Probability = "<<theProb<<G4endl;
-
-  return theProb;
-
-}
-
-G4double G4E1Probability100::EmissionProbability(const G4Fragment& frag, 
-						 const G4double exciteE)
-{
-
-  // From nuclear fragment properties and the excitation energy, calculate
-  // the probability for photon evaporation down to last ground level.
-  // fragment = nuclear fragment BEFORE de-excitation
-
-  G4double theProb = 0.0;
-
-  G4double ScaleFactor = 100.0;
-
-  G4double Uafter = 0.0;
-  const G4double Uexcite = frag.GetExcitationEnergy();
-
-  G4double normC = 3.0;
-
-  const G4double upperLim = Uexcite;
-  const G4double lowerLim = Uafter;
-  const G4int numIters = 25;
-
-  // Fall-back is a uniform random number
-
-  //G4double uniformNum = G4UniformRand();
-  //theProb = uniformNum;
-
-  // Need to integrate EmissionProbDensity from lowerLim to upperLim 
-  // and multiply by normC
-
-  G4double integ = normC *
-           EmissionIntegration(frag,exciteE,lowerLim,upperLim,numIters);
-  if(integ > 0.0) theProb = integ;
-
-  return theProb * ScaleFactor;
-
-}
-
-G4double G4E1Probability100::EmissionIntegration(const G4Fragment& frag, 
-                             const G4double ,
-                             const G4double lowLim, const G4double upLim,
-                             const G4int numIters)
-
-{
-
-  // Simple Gaussian quadrature integration
-
-  G4double x;
-  G4double root3 = 1.0/std::sqrt(3.0);
-
-  G4double Step = (upLim-lowLim)/(2.0*numIters);
-  G4double Delta = Step*root3;
-
-  G4double mean = 0.0;
-
-  G4double theInt = 0.0;
-
-  for(G4int i = 0; i < numIters; i++) {
-
-    x = (2*i + 1)/Step;
-    G4double E1ProbDensityA = EmissionProbDensity(frag,x+Delta);
-    G4double E1ProbDensityB = EmissionProbDensity(frag,x-Delta);
-
-    mean += E1ProbDensityA + E1ProbDensityB;
-
-  }
-
-  if(mean*Step > 0.0) theInt = mean*Step;
-
-  return theInt;
-
-}
-
-G4E1Probability100::~G4E1Probability100() {}
-
-
Index: trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4E1SingleProbability001.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4E1SingleProbability001.cc	(revision 1350)
+++ 	(revision )
@@ -1,217 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-//
-//  Class G4E1SingleProbability001.cc
-//
-
-#include "G4E1SingleProbability001.hh"
-#include "G4ConstantLevelDensityParameter.hh"
-#include "Randomize.hh"
-
-// Constructors and operators
-//
-
-G4E1SingleProbability001::G4E1SingleProbability001(
-			  const G4E1SingleProbability001& ): G4VEmissionProbability()
-{
-
-  throw G4HadronicException(__FILE__, __LINE__, "G4E1SingleProbability001::copy_constructor meant to not be accessible");
-
-}
-
-const G4E1SingleProbability001& G4E1SingleProbability001::
-operator=(const G4E1SingleProbability001& ) 
-{
-
- throw G4HadronicException(__FILE__, __LINE__, "G4E1SingleProbability001::operator= meant to not be accessible");
- return *this;
-}
-
-G4bool G4E1SingleProbability001::operator==(const G4E1SingleProbability001& 
-					    ) const
-{
-
-  return false;
-
-}
-
-G4bool G4E1SingleProbability001::operator!=(const G4E1SingleProbability001& 
-					    )
-const
-{
-
-  return true;
-
-}
-
-// Calculate the emission probability
-//
-
-G4double G4E1SingleProbability001::EmissionProbDensity(const G4Fragment& frag, 
-						       const G4double exciteE)
-{
-
-  // Calculate the probability density here
-
-  // From nuclear fragment properties and the excitation energy, calculate
-  // the probability density for photon evaporation from U to U - exciteE
-  // (U = nucleus excitation energy, exciteE = total evaporated photon
-  // energy).
-  // fragment = nuclear fragment BEFORE de-excitation
-
-  G4double theProb = 0.0;
-
-  const G4double Afrag = frag.GetA();
-  const G4double Zfrag = frag.GetZ();
-  const G4double Uexcite = frag.GetExcitationEnergy();
-
-  if( (Uexcite-exciteE) < 0.0 || exciteE < 0 || Uexcite <= 0) return theProb;
-
-  // Need a level density parameter.
-  // For now, just use the constant approximation (not reliable near magic
-  // nuclei).
-
-  G4ConstantLevelDensityParameter a;
-  G4double aLevelDensityParam = a.LevelDensityParameter(static_cast<G4int>(Afrag),
-							static_cast<G4int>(Zfrag),
-							Uexcite);
-
-  G4double levelDensBef = std::exp(2.0*std::sqrt(aLevelDensityParam*Uexcite));
-  G4double levelDensAft = std::exp(2.0*std::sqrt(aLevelDensityParam*(Uexcite-exciteE)));
-
-  // Now form the probability density
-
-  // Define constants for the photoabsorption cross-section (the reverse
-  // process of our de-excitation)
-
-  G4double sigma0 = 2.5 * Afrag * millibarn;  // millibarns
-
-  G4double Egdp = (40.3 / std::pow(Afrag,0.2) )*MeV;
-  G4double GammaR = 0.30 * Egdp;
- 
-  G4double normC = 1.0 / ((pi * hbarc)*(pi * hbarc));
-
-  // CD
-  //cout<<"  PROB TESTS "<<G4endl;
-  //cout<<" hbarc = "<<hbarc<<G4endl;
-  //cout<<" pi = "<<pi<<G4endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite<<"  "<<exciteE<<G4endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<"  "<<exciteE*MeV<<G4endl;
-  //cout<<" lev density param = "<<aLevelDensityParam<<G4endl;
-  //cout<<" level densities = "<<levelDensBef<<"  "<<levelDensAft<<G4endl;
-  //cout<<" sigma0 = "<<sigma0<<G4endl;
-  //cout<<" Egdp, GammaR = "<<Egdp<<"  "<<GammaR<<G4endl;
-  //cout<<" normC = "<<normC<<G4endl;
-
-  G4double numerator = sigma0 * exciteE*exciteE * GammaR*GammaR;
-  G4double denominator = (exciteE*exciteE - Egdp*Egdp)*
-           (exciteE*exciteE - Egdp*Egdp) + GammaR*GammaR*exciteE*exciteE;
-
-  G4double sigmaAbs = numerator/denominator; 
-
-  theProb = normC * sigmaAbs * exciteE*exciteE *
-            levelDensAft/levelDensBef;
-
-  // CD
-  //cout<<" sigmaAbs = "<<sigmaAbs<<G4endl;
-  //cout<<" Probability = "<<theProb<<G4endl;
-
-  return theProb;
-
-}
-
-G4double G4E1SingleProbability001::EmissionProbability(const G4Fragment& frag, 
-						       const G4double exciteE)
-{
-
-  // From nuclear fragment properties and the excitation energy, calculate
-  // the probability for photon evaporation down to the level
-  // Uexcite-exciteE.
-  // fragment = nuclear fragment BEFORE de-excitation
-
-  G4double theProb = 0.0;
-
-  G4double ScaleFactor = 0.01;     // playing with scale factors
-
-  const G4double Uexcite = frag.GetExcitationEnergy();
-  G4double Uafter = Uexcite - exciteE;
-
-  G4double normC = 3.0;
-
-  const G4double upperLim = Uexcite;
-  const G4double lowerLim = Uafter;
-  const G4int numIters = 25;
-
-  // Need to integrate EmissionProbDensity from lowerLim to upperLim 
-  // and multiply by normC
-
-  G4double integ = normC *
-           EmissionIntegration(frag,exciteE,lowerLim,upperLim,numIters);
-
-  if(integ > 0.0) theProb = integ;
-
-  return theProb * ScaleFactor;
-
-}
-
-G4double G4E1SingleProbability001::EmissionIntegration(const G4Fragment& frag, 
-                             const G4double ,
-                             const G4double lowLim, const G4double upLim,
-                             const G4int numIters)
-
-{
-
-  // Simple Gaussian quadrature integration
-
-  G4double x;
-  G4double root3 = 1.0/std::sqrt(3.0);
-
-  G4double Step = (upLim-lowLim)/(2.0*numIters);
-  G4double Delta = Step*root3;
-
-  G4double mean = 0.0;
-
-  G4double theInt = 0.0;
-
-  for(G4int i = 0; i < numIters; i++) {
-
-    x = (2*i + 1)/Step;
-    G4double E1ProbDensityA = EmissionProbDensity(frag,x+Delta);
-    G4double E1ProbDensityB = EmissionProbDensity(frag,x-Delta);
-
-    mean += E1ProbDensityA + E1ProbDensityB;
-
-  }
-
-  if(mean*Step > 0.0) theInt = mean*Step;
-
-  return theInt;
-
-}
-
-G4E1SingleProbability001::~G4E1SingleProbability001() {}
-
-
Index: trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4E1SingleProbability01.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4E1SingleProbability01.cc	(revision 1350)
+++ 	(revision )
@@ -1,217 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-//
-//  Class G4E1SingleProbability01.cc
-//
-
-#include "G4E1SingleProbability01.hh"
-#include "G4ConstantLevelDensityParameter.hh"
-#include "Randomize.hh"
-
-// Constructors and operators
-//
-
-G4E1SingleProbability01::G4E1SingleProbability01(
-			 const G4E1SingleProbability01& ) : G4VEmissionProbability()
-{
-
-  throw G4HadronicException(__FILE__, __LINE__, "G4E1SingleProbability01::copy_constructor meant to not be accessible");
-
-}
-
-const G4E1SingleProbability01& G4E1SingleProbability01::
-operator=(const G4E1SingleProbability01& ) 
-{
-
-  throw G4HadronicException(__FILE__, __LINE__, "G4E1SingleProbability01::operator= meant to not be accessible");
-  return *this;
-}
-
-G4bool G4E1SingleProbability01::operator==(const G4E1SingleProbability01& 
-					   ) const
-{
-
-  return false;
-
-}
-
-G4bool G4E1SingleProbability01::operator!=(const G4E1SingleProbability01& 
-					   )
-const
-{
-
-  return true;
-
-}
-
-// Calculate the emission probability
-//
-
-G4double G4E1SingleProbability01::EmissionProbDensity(const G4Fragment& frag, 
-						      const G4double exciteE)
-{
-
-  // Calculate the probability density here
-
-  // From nuclear fragment properties and the excitation energy, calculate
-  // the probability density for photon evaporation from U to U - exciteE
-  // (U = nucleus excitation energy, exciteE = total evaporated photon
-  // energy).
-  // fragment = nuclear fragment BEFORE de-excitation
-
-  G4double theProb = 0.0;
-
-  const G4double Afrag = frag.GetA();
-  const G4double Zfrag = frag.GetZ();
-  const G4double Uexcite = frag.GetExcitationEnergy();
-
-  if( (Uexcite-exciteE) < 0.0 || exciteE < 0 || Uexcite <= 0) return theProb;
-
-  // Need a level density parameter.
-  // For now, just use the constant approximation (not reliable near magic
-  // nuclei).
-
-  G4ConstantLevelDensityParameter a;
-  G4double aLevelDensityParam = a.LevelDensityParameter(static_cast<G4int>(Afrag),
-							static_cast<G4int>(Zfrag),
-							Uexcite);
-
-  G4double levelDensBef = std::exp(2.0*std::sqrt(aLevelDensityParam*Uexcite));
-  G4double levelDensAft = std::exp(2.0*std::sqrt(aLevelDensityParam*(Uexcite-exciteE)));
-
-  // Now form the probability density
-
-  // Define constants for the photoabsorption cross-section (the reverse
-  // process of our de-excitation)
-
-  G4double sigma0 = 2.5 * Afrag * millibarn;  // millibarns
-
-  G4double Egdp = (40.3 / std::pow(Afrag,0.2) )*MeV;
-  G4double GammaR = 0.30 * Egdp;
- 
-  G4double normC = 1.0 / ((pi * hbarc)*(pi * hbarc));
-
-  // CD
-  //cout<<"  PROB TESTS "<<G4endl;
-  //cout<<" hbarc = "<<hbarc<<G4endl;
-  //cout<<" pi = "<<pi<<G4endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite<<"  "<<exciteE<<G4endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<"  "<<exciteE*MeV<<G4endl;
-  //cout<<" lev density param = "<<aLevelDensityParam<<G4endl;
-  //cout<<" level densities = "<<levelDensBef<<"  "<<levelDensAft<<G4endl;
-  //cout<<" sigma0 = "<<sigma0<<G4endl;
-  //cout<<" Egdp, GammaR = "<<Egdp<<"  "<<GammaR<<G4endl;
-  //cout<<" normC = "<<normC<<G4endl;
-
-  G4double numerator = sigma0 * exciteE*exciteE * GammaR*GammaR;
-  G4double denominator = (exciteE*exciteE - Egdp*Egdp)*
-           (exciteE*exciteE - Egdp*Egdp) + GammaR*GammaR*exciteE*exciteE;
-
-  G4double sigmaAbs = numerator/denominator; 
-
-  theProb = normC * sigmaAbs * exciteE*exciteE *
-            levelDensAft/levelDensBef;
-
-  // CD
-  //cout<<" sigmaAbs = "<<sigmaAbs<<G4endl;
-  //cout<<" Probability = "<<theProb<<G4endl;
-
-  return theProb;
-
-}
-
-G4double G4E1SingleProbability01::EmissionProbability(const G4Fragment& frag, 
-						      const G4double exciteE)
-{
-
-  // From nuclear fragment properties and the excitation energy, calculate
-  // the probability for photon evaporation down to the level
-  // Uexcite-exciteE.
-  // fragment = nuclear fragment BEFORE de-excitation
-
-  G4double theProb = 0.0;
-
-  G4double ScaleFactor = 0.1;     // playing with scale factors
-
-  const G4double Uexcite = frag.GetExcitationEnergy();
-  G4double Uafter = Uexcite - exciteE;
-
-  G4double normC = 3.0;
-
-  const G4double upperLim = Uexcite;
-  const G4double lowerLim = Uafter;
-  const G4int numIters = 25;
-
-  // Need to integrate EmissionProbDensity from lowerLim to upperLim 
-  // and multiply by normC
-
-  G4double integ = normC *
-           EmissionIntegration(frag,exciteE,lowerLim,upperLim,numIters);
-
-  if(integ > 0.0) theProb = integ;
-
-  return theProb * ScaleFactor;
-
-}
-
-G4double G4E1SingleProbability01::EmissionIntegration(const G4Fragment& frag, 
-                             const G4double ,
-                             const G4double lowLim, const G4double upLim,
-                             const G4int numIters)
-
-{
-
-  // Simple Gaussian quadrature integration
-
-  G4double x;
-  G4double root3 = 1.0/std::sqrt(3.0);
-
-  G4double Step = (upLim-lowLim)/(2.0*numIters);
-  G4double Delta = Step*root3;
-
-  G4double mean = 0.0;
-
-  G4double theInt = 0.0;
-
-  for(G4int i = 0; i < numIters; i++) {
-
-    x = (2*i + 1)/Step;
-    G4double E1ProbDensityA = EmissionProbDensity(frag,x+Delta);
-    G4double E1ProbDensityB = EmissionProbDensity(frag,x-Delta);
-
-    mean += E1ProbDensityA + E1ProbDensityB;
-
-  }
-
-  if(mean*Step > 0.0) theInt = mean*Step;
-
-  return theInt;
-
-}
-
-G4E1SingleProbability01::~G4E1SingleProbability01() {}
-
-
Index: trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4E1SingleProbability10.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4E1SingleProbability10.cc	(revision 1350)
+++ 	(revision )
@@ -1,217 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-//
-//  Class G4E1SingleProbability10.cc
-//
-
-#include "G4E1SingleProbability10.hh"
-#include "G4ConstantLevelDensityParameter.hh"
-#include "Randomize.hh"
-
-// Constructors and operators
-//
-
-G4E1SingleProbability10::G4E1SingleProbability10(const G4E1SingleProbability10&
-						 ): G4VEmissionProbability()
-{
-
-  throw G4HadronicException(__FILE__, __LINE__, "G4E1SingleProbability10::copy_constructor meant to not be accessible");
-
-}
-
-const G4E1SingleProbability10& G4E1SingleProbability10::
-operator=(const G4E1SingleProbability10& ) 
-{
-
-  throw G4HadronicException(__FILE__, __LINE__, "G4E1SingleProbability10::operator= meant to not be accessible");
-  return *this;
-}
-
-G4bool G4E1SingleProbability10::operator==(const G4E1SingleProbability10& 
-					   ) const
-{
-
-  return false;
-
-}
-
-G4bool G4E1SingleProbability10::operator!=(const G4E1SingleProbability10& 
-					   )
-const
-{
-
-  return true;
-
-}
-
-// Calculate the emission probability
-//
-
-G4double G4E1SingleProbability10::EmissionProbDensity(const G4Fragment& frag, 
-						      const G4double exciteE)
-{
-
-  // Calculate the probability density here
-
-  // From nuclear fragment properties and the excitation energy, calculate
-  // the probability density for photon evaporation from U to U - exciteE
-  // (U = nucleus excitation energy, exciteE = total evaporated photon
-  // energy).
-  // fragment = nuclear fragment BEFORE de-excitation
-
-  G4double theProb = 0.0;
-
-  const G4double Afrag = frag.GetA();
-  const G4double Zfrag = frag.GetZ();
-  const G4double Uexcite = frag.GetExcitationEnergy();
-
-  if( (Uexcite-exciteE) < 0.0 || exciteE < 0 || Uexcite <= 0) return theProb;
-
-  // Need a level density parameter.
-  // For now, just use the constant approximation (not reliable near magic
-  // nuclei).
-
-  G4ConstantLevelDensityParameter a;
-  G4double aLevelDensityParam = a.LevelDensityParameter(static_cast<G4int>(Afrag),
-							static_cast<G4int>(Zfrag),
-							Uexcite);
-
-  G4double levelDensBef = std::exp(2.0*std::sqrt(aLevelDensityParam*Uexcite));
-  G4double levelDensAft = std::exp(2.0*std::sqrt(aLevelDensityParam*(Uexcite-exciteE)));
-
-  // Now form the probability density
-
-  // Define constants for the photoabsorption cross-section (the reverse
-  // process of our de-excitation)
-
-  G4double sigma0 = 2.5 * Afrag * millibarn;  // millibarns
-
-  G4double Egdp = (40.3 / std::pow(Afrag,0.2) )*MeV;
-  G4double GammaR = 0.30 * Egdp;
- 
-  G4double normC = 1.0 / ((pi * hbarc)*(pi * hbarc));
-
-  // CD
-  //cout<<"  PROB TESTS "<<G4endl;
-  //cout<<" hbarc = "<<hbarc<<G4endl;
-  //cout<<" pi = "<<pi<<G4endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite<<"  "<<exciteE<<G4endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<"  "<<exciteE*MeV<<G4endl;
-  //cout<<" lev density param = "<<aLevelDensityParam<<G4endl;
-  //cout<<" level densities = "<<levelDensBef<<"  "<<levelDensAft<<G4endl;
-  //cout<<" sigma0 = "<<sigma0<<G4endl;
-  //cout<<" Egdp, GammaR = "<<Egdp<<"  "<<GammaR<<G4endl;
-  //cout<<" normC = "<<normC<<G4endl;
-
-  G4double numerator = sigma0 * exciteE*exciteE * GammaR*GammaR;
-  G4double denominator = (exciteE*exciteE - Egdp*Egdp)*
-           (exciteE*exciteE - Egdp*Egdp) + GammaR*GammaR*exciteE*exciteE;
-
-  G4double sigmaAbs = numerator/denominator; 
-
-  theProb = normC * sigmaAbs * exciteE*exciteE *
-            levelDensAft/levelDensBef;
-
-  // CD
-  //cout<<" sigmaAbs = "<<sigmaAbs<<G4endl;
-  //cout<<" Probability = "<<theProb<<G4endl;
-
-  return theProb;
-
-}
-
-G4double G4E1SingleProbability10::EmissionProbability(const G4Fragment& frag, 
-						      const G4double exciteE)
-{
-
-  // From nuclear fragment properties and the excitation energy, calculate
-  // the probability for photon evaporation down to the level
-  // Uexcite-exciteE.
-  // fragment = nuclear fragment BEFORE de-excitation
-
-  G4double theProb = 0.0;
-
-  G4double ScaleFactor = 10.0;     // playing with scale factors
-
-  const G4double Uexcite = frag.GetExcitationEnergy();
-  G4double Uafter = Uexcite - exciteE;
-
-  G4double normC = 3.0;
-
-  const G4double upperLim = Uexcite;
-  const G4double lowerLim = Uafter;
-  const G4int numIters = 25;
-
-  // Need to integrate EmissionProbDensity from lowerLim to upperLim 
-  // and multiply by normC
-
-  G4double integ = normC *
-           EmissionIntegration(frag,exciteE,lowerLim,upperLim,numIters);
-
-  if(integ > 0.0) theProb = integ;
-
-  return theProb * ScaleFactor;
-
-}
-
-G4double G4E1SingleProbability10::EmissionIntegration(const G4Fragment& frag, 
-			     const G4double ,
-			     const G4double lowLim, const G4double upLim,
-                             const G4int numIters)
-
-{
-
-  // Simple Gaussian quadrature integration
-
-  G4double x;
-  G4double root3 = 1.0/std::sqrt(3.0);
-
-  G4double Step = (upLim-lowLim)/(2.0*numIters);
-  G4double Delta = Step*root3;
-
-  G4double mean = 0.0;
-
-  G4double theInt = 0.0;
-
-  for(G4int i = 0; i < numIters; i++) {
-
-    x = (2*i + 1)/Step;
-    G4double E1ProbDensityA = EmissionProbDensity(frag,x+Delta);
-    G4double E1ProbDensityB = EmissionProbDensity(frag,x-Delta);
-
-    mean += E1ProbDensityA + E1ProbDensityB;
-
-  }
-
-  if(mean*Step > 0.0) theInt = mean*Step;
-
-  return theInt;
-
-}
-
-G4E1SingleProbability10::~G4E1SingleProbability10() {}
-
-
Index: trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4E1SingleProbability100.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4E1SingleProbability100.cc	(revision 1350)
+++ 	(revision )
@@ -1,217 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-//
-//  Class G4E1SingleProbability100.cc
-//
-
-#include "G4E1SingleProbability100.hh"
-#include "G4ConstantLevelDensityParameter.hh"
-#include "Randomize.hh"
-
-// Constructors and operators
-//
-
-G4E1SingleProbability100::G4E1SingleProbability100(
-			  const G4E1SingleProbability100& ): G4VEmissionProbability()
-{
-
-  throw G4HadronicException(__FILE__, __LINE__, "G4E1SingleProbability100::copy_constructor meant to not be accessible");
-
-}
-
-const G4E1SingleProbability100& G4E1SingleProbability100::
-operator=(const G4E1SingleProbability100& ) 
-{
-
- throw G4HadronicException(__FILE__, __LINE__, "G4E1SingleProbability100::operator= meant to not be accessible");
- return *this;
-}
-
-G4bool G4E1SingleProbability100::operator==(const G4E1SingleProbability100& 
-					    ) const
-{
-
-  return false;
-
-}
-
-G4bool G4E1SingleProbability100::operator!=(const G4E1SingleProbability100& 
-					    )
-const
-{
-
-  return true;
-
-}
-
-// Calculate the emission probability
-//
-
-G4double G4E1SingleProbability100::EmissionProbDensity(const G4Fragment& frag, 
-						       const G4double exciteE)
-{
-
-  // Calculate the probability density here
-
-  // From nuclear fragment properties and the excitation energy, calculate
-  // the probability density for photon evaporation from U to U - exciteE
-  // (U = nucleus excitation energy, exciteE = total evaporated photon
-  // energy).
-  // fragment = nuclear fragment BEFORE de-excitation
-
-  G4double theProb = 0.0;
-
-  const G4double Afrag = frag.GetA();
-  const G4double Zfrag = frag.GetZ();
-  const G4double Uexcite = frag.GetExcitationEnergy();
-
-  if( (Uexcite-exciteE) < 0.0 || exciteE < 0 || Uexcite <= 0) return theProb;
-
-  // Need a level density parameter.
-  // For now, just use the constant approximation (not reliable near magic
-  // nuclei).
-
-  G4ConstantLevelDensityParameter a;
-  G4double aLevelDensityParam = a.LevelDensityParameter(static_cast<G4int>(Afrag),
-							static_cast<G4int>(Zfrag),
-							Uexcite);
-
-  G4double levelDensBef = std::exp(2.0*std::sqrt(aLevelDensityParam*Uexcite));
-  G4double levelDensAft = std::exp(2.0*std::sqrt(aLevelDensityParam*(Uexcite-exciteE)));
-
-  // Now form the probability density
-
-  // Define constants for the photoabsorption cross-section (the reverse
-  // process of our de-excitation)
-
-  G4double sigma0 = 2.5 * Afrag * millibarn;  // millibarns
-
-  G4double Egdp = (40.3 / std::pow(Afrag,0.2) )*MeV;
-  G4double GammaR = 0.30 * Egdp;
- 
-  G4double normC = 1.0 / ((pi * hbarc)*(pi * hbarc));
-
-  // CD
-  //cout<<"  PROB TESTS "<<G4endl;
-  //cout<<" hbarc = "<<hbarc<<G4endl;
-  //cout<<" pi = "<<pi<<G4endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite<<"  "<<exciteE<<G4endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<"  "<<exciteE*MeV<<G4endl;
-  //cout<<" lev density param = "<<aLevelDensityParam<<G4endl;
-  //cout<<" level densities = "<<levelDensBef<<"  "<<levelDensAft<<G4endl;
-  //cout<<" sigma0 = "<<sigma0<<G4endl;
-  //cout<<" Egdp, GammaR = "<<Egdp<<"  "<<GammaR<<G4endl;
-  //cout<<" normC = "<<normC<<G4endl;
-
-  G4double numerator = sigma0 * exciteE*exciteE * GammaR*GammaR;
-  G4double denominator = (exciteE*exciteE - Egdp*Egdp)*
-           (exciteE*exciteE - Egdp*Egdp) + GammaR*GammaR*exciteE*exciteE;
-
-  G4double sigmaAbs = numerator/denominator; 
-
-  theProb = normC * sigmaAbs * exciteE*exciteE *
-            levelDensAft/levelDensBef;
-
-  // CD
-  //cout<<" sigmaAbs = "<<sigmaAbs<<G4endl;
-  //cout<<" Probability = "<<theProb<<G4endl;
-
-  return theProb;
-
-}
-
-G4double G4E1SingleProbability100::EmissionProbability(const G4Fragment& frag, 
-						       const G4double exciteE)
-{
-
-  // From nuclear fragment properties and the excitation energy, calculate
-  // the probability for photon evaporation down to the level
-  // Uexcite-exciteE.
-  // fragment = nuclear fragment BEFORE de-excitation
-
-  G4double theProb = 0.0;
-
-  G4double ScaleFactor = 100.0;     // playing with scale factors
-
-  const G4double Uexcite = frag.GetExcitationEnergy();
-  G4double Uafter = Uexcite - exciteE;
-
-  G4double normC = 3.0;
-
-  const G4double upperLim = Uexcite;
-  const G4double lowerLim = Uafter;
-  const G4int numIters = 25;
-
-  // Need to integrate EmissionProbDensity from lowerLim to upperLim 
-  // and multiply by normC
-
-  G4double integ = normC *
-           EmissionIntegration(frag,exciteE,lowerLim,upperLim,numIters);
-
-  if(integ > 0.0) theProb = integ;
-
-  return theProb * ScaleFactor;
-
-}
-
-G4double G4E1SingleProbability100::EmissionIntegration(const G4Fragment& frag, 
-                             const G4double ,
-                             const G4double lowLim, const G4double upLim,
-                             const G4int numIters)
-
-{
-
-  // Simple Gaussian quadrature integration
-
-  G4double x;
-  G4double root3 = 1.0/std::sqrt(3.0);
-
-  G4double Step = (upLim-lowLim)/(2.0*numIters);
-  G4double Delta = Step*root3;
-
-  G4double mean = 0.0;
-
-  G4double theInt = 0.0;
-
-  for(G4int i = 0; i < numIters; i++) {
-
-    x = (2*i + 1)/Step;
-    G4double E1ProbDensityA = EmissionProbDensity(frag,x+Delta);
-    G4double E1ProbDensityB = EmissionProbDensity(frag,x-Delta);
-
-    mean += E1ProbDensityA + E1ProbDensityB;
-
-  }
-
-  if(mean*Step > 0.0) theInt = mean*Step;
-
-  return theInt;
-
-}
-
-G4E1SingleProbability100::~G4E1SingleProbability100() {}
-
-
Index: trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/test/G4GammaDeexcitationTest.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/test/G4GammaDeexcitationTest.cc	(revision 1350)
+++ 	(revision )
@@ -1,192 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-//
-// -------------------------------------------------------------------
-//      GEANT 4 class file --- Copyright CERN 1998
-//      CERN Geneva Switzerland
-//
-//
-//      File name:     G4GammaDeexcitationTest.cc 
-//
-//      Author:        Maria Grazia Pia (pia@genova.infn.it), 
-// 
-//      Creation date: 27 October 1998
-//
-//      Modifications: 
-//
-// -------------------------------------------------------------------
-
-#include "globals.hh"
-
-#include "G4ios.hh"
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <assert.h>
-
-#include "CLHEP/Hist/TupleManager.h"
-#include "CLHEP/Hist/HBookFile.h"
-#include "CLHEP/Hist/Histogram.h"
-#include "CLHEP/Hist/Tuple.h"
-
-#include "G4VGammaDeexcitation.hh"
-#include "G4DataVector.hh"
-#include "G4ContinuumGammaDeexcitation.hh"
-#include "G4DiscreteGammaDeexcitation.hh"
-#include "G4LorentzVector.hh"
-#include "G4NucleiProperties.hh"
-#include "G4NucleiPropertiesTable.hh"
-#include "G4Fragment.hh"
-#include "Randomize.hh"
-#include "G4FragmentVector.hh"
-
-int main()
-{
-  // MGP ---- HBOOK initialization
-  HepTupleManager* hbookManager;
-  hbookManager = new HBookFile("gammadeex.hbook", 58);
-  assert (hbookManager != 0);
-
-  // MGP ---- Book histograms
-
-  HepHistogram* hGammaE;
-  hGammaE = hbookManager->histogram("Gamma energy", 100,0.,10.);
-  assert (hGammaE != 0);  
-
-  HepHistogram* hNGammas;
-  hNGammas = hbookManager->histogram("Number of gammas", 20,0.,20.);
-  assert (hNGammas != 0);  
-
-  // MGP ---- Book a ntuple
-  HepTuple* ntuple;
-  ntuple = hbookManager->ntuple("G4GammaDeexcitation ntuple");
-  assert (ntuple != 0);
-
-  G4int Z;
-  G4int A;
-
-  G4cout << "Enter Z and A" << G4endl;
-  G4cin >> Z >> A;
-
-  assert (Z > 0);
-  assert (A > 0);
-  assert (A > Z);
-  
-  G4NuclearLevelManager levelManager(Z,A);
-
-  G4int verbose;
-  G4cout << "Enter verbose level " << G4endl;
-  G4cin >> verbose;
-
-  G4int mode = 0;
-  G4cout << "Enter continuum (0) or discrete (1) deexcitation mode" << G4endl;
-  G4cin >> mode;
-
-  G4int iter = 1;
-  G4cout << "Enter number of iterations " << G4endl;
-  G4cin >> iter;
-  if (iter <1) iter = 1;
-
-  G4double excMin;
-  G4double excMax;    
-  G4cout << "Enter initial min an max excitation energy" << G4endl;
-  G4cin >> excMin >> excMax;
-  assert (excMin >= 0.);
-  assert (excMax > 0.);
-  assert (excMax >= excMin);
-
-  G4int i;
-  for (i=0; i<iter; i++)
-    {
-      G4double excitation = excMin + G4UniformRand() * (excMax - excMin);
-      G4VGammaDeexcitation* deexcitation;
-
-      G4cout << G4endl << "TEST >>>>>>>>> Iteration " << i 
-	     << " <<<<<<<<< Initial excitation " << excitation << " ";
-
-      // Discrete deexcitation
-
-      if (mode > 0) 
-	{
-	  // Transform excitation energy into nearest level energy 
-	  const G4NuclearLevel* level = levelManager.NearestLevel(excitation);
-	  if (level != 0)
-	    {
-	      excitation = level->Energy();
-	      G4cout << "Transformed into excitation " << excitation << G4endl;
-	    }
-
-	  deexcitation = new G4DiscreteGammaDeexcitation();
-	  G4cout << "TEST ---- G4DiscreteGammaDeexcitation created ----" << G4endl;
-	}
-
-      // Continuum deexcitation
-      
-      else
-	{
-	  deexcitation = new G4ContinuumGammaDeexcitation();
-	  G4cout << G4endl << "TEST ---- G4ContinuumGammaDeexcitation created ----" << G4endl;
-	}
-      
-      deexcitation->SetVerboseLevel(verbose);
-
-      G4LorentzVector p4(0.,0.,0.,G4NucleiProperties::GetNuclearMass(A,Z));
-      G4Fragment nucleus(A,Z,p4);
-      nucleus.SetExcitationEnergy(excitation);
-      deexcitation->SetNucleus(nucleus);
-      
-      G4FragmentVector* gammas = deexcitation->DoChain();
-
-      // Fill histograms 
-      G4int nGammas = 0;
-      if (gammas !=0) nGammas = gammas->entries();
-      hNGammas->accumulate(nGammas);
-      G4cout << "TEST: " << nGammas << " photons generated: ";
-      G4int ig = 0;
-      for (ig=0; ig<nGammas; ig++)
-	{
-	  G4double gammaE = gammas->at(ig)->GetMomentum().e();
-	  G4cout << gammaE << " ";
-          hGammaE->accumulate(gammaE);
-	}
-      G4cout << G4endl;
-
-      if (gammas != 0) gammas->clearAndDestroy();
-      delete gammas;
-      gammas = 0;
-      delete deexcitation;
-      deexcitation = 0;
-    }
-
-  hbookManager->write();
-  
-  return EXIT_SUCCESS;
-}
-
-
-
-
-
Index: trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/test/G4NuclearLevelManagerTest.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/test/G4NuclearLevelManagerTest.cc	(revision 1350)
+++ 	(revision )
@@ -1,113 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-//
-// -------------------------------------------------------------------
-//      GEANT 4 class file --- Copyright CERN 1998
-//      CERN Geneva Switzerland
-//
-//
-//      File name:     G4NuclearLevelManagerTest.cc 
-//
-//      Author:        Maria Grazia Pia (pia@genova.infn.it), 
-// 
-//      Creation date: 27 October 1998
-//
-//      Modifications: 
-//
-// -------------------------------------------------------------------
-
-#include "globals.hh"
-
-#include "G4ios.hh"
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <assert.h>
-
-#include "CLHEP/Hist/TupleManager.h"
-#include "CLHEP/Hist/HBookFile.h"
-#include "CLHEP/Hist/Histogram.h"
-#include "CLHEP/Hist/Tuple.h"
-
-#include "G4NuclearLevelManager.hh"
-#include "G4NuclearLevel.hh"
-#include "G4DataVector.hh"
-
-int main()
-{
-
-  G4int Z;
-  G4int A;
-
-  G4cout << "Enter Z and A" << G4endl;
-  G4cin >> Z >> A;
-
-  assert (Z > 0);
-  assert (A > 0);
-  assert (A > Z);
-
-  G4int iter;
-  G4cout << "Enter number of iterations " << G4endl;
-  G4cin >> iter;
-
-   G4int i;
-   for (i=0; i<iter; i++)
-     {
-
-       // NuclearLevelManager for this (Z,A) material
-       //       G4NuclearLevelManager levelManager(Z,A);
-       //       G4NuclearLevelManager* levelManager = new G4NuclearLevelManager(Z,A);
-       G4NuclearLevelManager* levelManager = new G4NuclearLevelManager();
-       levelManager->SetNucleus(Z,A);
-       //       G4cout << i <<") ---- G4NuclearLevelManager created ----" << G4endl;
-       
-       // Is it a valid isotope?
-       if (! (levelManager->IsValid(Z,A)))
-	   	 { G4cout << "This (Z,A) has no ENSDF levels and gammas " << G4endl; }
-
-       levelManager->PrintAll();
-       delete levelManager;
-     }
-
-  return EXIT_SUCCESS;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/test/G4PhotonEvaporationTest.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/test/G4PhotonEvaporationTest.cc	(revision 1350)
+++ 	(revision )
@@ -1,287 +1,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-//
-// -------------------------------------------------------------------
-//      GEANT 4 class file --- Copyright CERN 1998
-//      CERN Geneva Switzerland
-//
-//
-//      File name:     G4PhotonEvaporationTest.cc 
-//
-//      Author:        Maria Grazia Pia (pia@genova.infn.it), 
-// 
-//      Creation date: 27 October 1998
-//
-//      Modifications: 
-//
-// -------------------------------------------------------------------
-
-#include "globals.hh"
-
-#include "G4ios.hh"
-#include <assert.h>
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-
-#include "CLHEP/Hist/TupleManager.h"
-#include "CLHEP/Hist/HBookFile.h"
-#include "CLHEP/Hist/Histogram.h"
-#include "CLHEP/Hist/Tuple.h"
-
-#include "G4PhotonEvaporation.hh"
-#include "G4VGammaDeexcitation.hh"
-#include "G4DataVector.hh"
-#include "G4ContinuumGammaDeexcitation.hh"
-#include "G4DiscreteGammaDeexcitation.hh"
-#include "G4LorentzVector.hh"
-#include "G4ThreeVector.hh"
-#include "G4NucleiProperties.hh"
-#include "G4NucleiPropertiesTable.hh"
-#include "G4Fragment.hh"
-#include "Randomize.hh"
-#include "G4FragmentVector.hh"
-#include "G4ParticleTypes.hh"
-#include "G4ParticleDefinition.hh"
-
-int main()
-{
-  // MGP ---- HBOOK initialization
-  HepTupleManager* hbookManager;
-  hbookManager = new HBookFile("mgcarlo.hbook", 58);
-  assert (hbookManager != 0);
-
-  // MGP ---- Book histograms
-
-  HepHistogram* hGammaE;
-  hGammaE = hbookManager->histogram("Gamma energy", 100,0.,10.);
-  assert (hGammaE != 0);  
-
-  HepHistogram* hNProducts;
-  hNProducts = hbookManager->histogram("Number of products", 20,0.,20.);
-  assert (hNProducts != 0);  
-
-  HepHistogram* hProb;
-  hProb = hbookManager->histogram("Probability * 1.e25", 100,0.,10.);
-  assert (hProb != 0);  
-
-  // MGP ---- Book a ntuple
-  HepTuple* ntuple;
-  ntuple = hbookManager->ntuple("G4PhotonEvaporation");
-  assert (ntuple != 0);
-
-  HepTuple* ntupleCons;
-  ntupleCons = hbookManager->ntuple("Conservation");
-  assert (ntupleCons != 0);
-
-  G4int Z;
-  G4int A;
-
-  G4cout << "Enter Z and A" << G4endl;
-  G4cin >> Z >> A;
-
-  assert (Z > 0);
-  assert (A > 0);
-  assert (A > Z);
-  
- 
-  G4int verbose;
-  G4cout << "Enter verbose level " << G4endl;
-  G4cin >> verbose;
-
-  G4int mode = 0;
-  G4cout << "Enter continuum (0) or discrete (1) deexcitation mode" << G4endl;
-  G4cin >> mode;
-
-  G4int iter = 1;
-  G4cout << "Enter number of iterations " << G4endl;
-  G4cin >> iter;
-  if (iter <1) iter = 1;
-
-  G4double excMin;
-  G4double excMax;    
-  G4cout << "Enter initial min an max excitation energy" << G4endl;
-  G4cin >> excMin >> excMax;
-  assert (excMin >= 0.);
-  assert (excMax > 0.);
-  assert (excMax >= excMin);
- 
-
-  G4ParticleDefinition* gamma = G4Gamma::GammaDefinition();
-
-  G4ParticleDefinition* proton = G4Proton::ProtonDefinition();
-  G4ParticleDefinition* antiProton = G4AntiProton::AntiProtonDefinition();
-  G4ParticleDefinition* neutron = G4Neutron::NeutronDefinition();   
-  G4ParticleDefinition* antiNeutron = G4AntiNeutron::AntiNeutronDefinition();   
-
-  G4ParticleDefinition* pionPlus = G4PionPlus::PionPlusDefinition();
-  G4ParticleDefinition* pionMinus = G4PionMinus::PionMinusDefinition();
-  G4ParticleDefinition* pionZero = G4PionZero::PionZeroDefinition();
-
-  G4ParticleDefinition* kaonPlus = G4KaonPlus::KaonPlusDefinition();
-  G4ParticleDefinition* kaonMinus = G4KaonMinus::KaonMinusDefinition();
-   
-  G4ParticleDefinition* lambda = G4Lambda::LambdaDefinition();
-
-  G4ParticleDefinition* theMuonPlus = G4MuonPlus::MuonPlusDefinition();
-  G4ParticleDefinition* theMuonMinus = G4MuonMinus::MuonMinusDefinition();
-
-  G4ParticleDefinition* theNeutrinoMu = G4NeutrinoMu::NeutrinoMuDefinition();
-  G4ParticleDefinition* theAntiNeutrinoMu = G4AntiNeutrinoMu::AntiNeutrinoMuDefinition();
-
-  // G4PhotonEvaporation for this (Z,A) material
-  G4PhotonEvaporation* photonEvaporation = new G4PhotonEvaporation;
-  G4cout << "TEST ---- G4PhotonEvaporation created ----" << G4endl;
-
-  photonEvaporation->SetVerboseLevel(verbose);
-
-  G4int i;
-  for (i=0; i<iter; i++)
-    {
-      G4double excitation = excMin + G4UniformRand() * (excMax - excMin);
-
-	  G4cout << G4endl << "TEST >>>>>>>>> Iteration " << i 
-		 << " <<<<<<<<< Initial excitation " << excitation << " ";
-
-      if (mode > 0) 
-	{
-	  // Transform excitation energy into nearest level energy 
-
-	  G4NuclearLevelManager levelManager;
-	  levelManager.SetNucleus(Z,A);
-          const G4NuclearLevel* level = levelManager.NearestLevel(excitation);
-	  if (level != 0)
-	    {
-	      excitation = level->Energy();
-	      G4cout << "Transformed into excitation " << excitation << G4endl;
-	    }
-	}
-      else
-	{
-	  G4cout << G4endl;
-	}
-
-      G4LorentzVector p4(0.,0.,0.,G4NucleiProperties::GetNuclearMass(A,Z)+excitation);
-      G4Fragment nucleus(A,Z,p4);
-      //      nucleus.SetExcitationEnergy(excitation);
-      G4double initialE = nucleus.GetMomentum().e();
-         
-      G4FragmentVector* products = photonEvaporation->BreakItUp(nucleus);
-      if(verbose >= 0) G4cout << "TEST: BreakItUp done" << G4endl;
-
-      G4double scale = 1./millibarn;
-      G4double prob = photonEvaporation->GetEmissionProbability() * scale;
-      if(verbose >= 0) G4cout << "TEST: probability " << prob << G4endl;
- 
-      // Fill histograms 
-
-      G4int nProducts = 0;
-      if (products !=0) nProducts = products->entries();
-      hNProducts->accumulate(nProducts);
-
-      hProb->accumulate(prob);
-
-      if(verbose >= 0) G4cout << "TEST: " << nProducts << " products generated: gammaE ";
-
-      G4double currentExcitation = excitation;
-      G4double sumPx = 0.;
-      G4double sumPy = 0.;
-      G4double sumPz = 0.;
-      G4double sumE = 0.;
-      G4double sumEgamma = 0.;
-
-      G4int ig = 0;
-      for (ig=0; ig<nProducts; ig++)
-	{
-	  G4double productE = products->at(ig)->GetMomentum().e();
-	  G4ThreeVector pProd(products->at(ig)->GetMomentum());
-	  sumPx = sumPx + pProd.x();
-	  sumPy = sumPy + pProd.y();
-	  sumPz = sumPz + pProd.z();
-	  sumE = sumE + productE;
-	  if (products->at(ig)->GetA() < 1)
-	    {
-	      if(verbose >= 0) G4cout << productE << " ";
-	      sumEgamma = sumEgamma + productE;
-	      hGammaE->accumulate(productE);
-	      ntuple->column("exc",currentExcitation);
-              ntuple->column("egamma",productE);
-              ntuple->column("prob",prob);
-	      ntuple->dumpData();
-	      // ntuple->column("px",pProd.x());
-	      // ntuple->column("py",pProd.y());
-	      // ntuple->column("pz",pProd.z());
-	      currentExcitation = currentExcitation - productE;
-	    }
-	  else
-	    { if(verbose >= 0) G4cout << "(" << products->at(ig)->GetZ() << "," << products->at(ig)->GetA() << ") "; }
-	}
-      if(verbose >= 0) G4cout << G4endl;
-
-      if(verbose >= 0) G4cout << "TEST: Sum of product energies = " << sumE 
-	     << ", Sum of gamma energies = " << sumEgamma << G4endl;
-
-      if (products != 0) 
-	{
-	  products->clearAndDestroy();
-
-	  ntupleCons->column("px",sumPx);
-	  ntupleCons->column("py",sumPy);
-	  ntupleCons->column("pz",sumPz);
-	  ntupleCons->column("eprod",sumE);
-	  ntupleCons->column("exc",excitation);
-	  ntupleCons->column("egammas",sumEgamma);
-	  ntupleCons->column("ein",initialE);
-	  ntupleCons->dumpData();
-	}
-      delete products;
-    }
-
-  hbookManager->write();
-
-  delete photonEvaporation;
-  
-  return EXIT_SUCCESS;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/test/GNUmakefile
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/test/GNUmakefile	(revision 1350)
+++ 	(revision )
@@ -1,28 +1,0 @@
-# $Id: GNUmakefile,v 1.1 2003/10/07 12:50:33 lara Exp $
-# ----------------------------------------------------------------
-# Makes test program in environment variable G4TARGET.
-# ----------------------------------------------------------------
-
-ifndef G4TARGET
-  G4TARGET := $(TESTTARGET)
-endif
-
-ifndef G4INSTALL
-  G4INSTALL = ../../../../../../../
-endif
-
-G4EXEC_BUILD = true
-
-include $(G4INSTALL)/config/architecture.gmk
-
-include $(G4INSTALL)/config/binmake.gmk
-
-
-
-
-
-
-
-
-
-
