cout << "\t* GLOBAL.fdrtr = " << (GLOBAL.lfdrtr?'T':'F') << endl;
cout << "\t* Calling flukam again..." << endl;
}
- fApplication->InitGeometry();
- fApplication->BeginEvent();
- ProcessEvent();
+
+ Int_t todo = TMath::Abs(nevent);
+
+ for (Int_t ev = 0; ev < todo; ev++) {
+ fApplication->InitGeometry();
+ fApplication->BeginEvent();
+ ProcessEvent();
+ }
+
fApplication->FinishEvent();
if (fVerbosityLevel >=3)
cout << "<== TFluka::ProcessRun(" << nevent << ") called."
//
// set methods
//
-
-void TFluka::SetProcess(const char* flagName, Int_t flagValue, Int_t imat)
+ void TFluka::SetProcess(const char* flagName, Int_t flagValue, Int_t imat)
{
// Set process user flag for material imat
//
}
//______________________________________________________________________________
-void TFluka::SetProcess(const char* flagName, Int_t flagValue)
+
+#if ROOT_VERSION_CODE >= 262151
+ Bool_t TFluka::SetProcess(const char* flagName, Int_t flagValue)
+#else
+ void TFluka::SetProcess(const char* flagName, Int_t flagValue)
+#endif
{
// Set process user flag
//
if (strcmp(&fProcessFlag[i][0],flagName) == 0) {
fProcessValue[fNbOfProc] = flagValue;
fProcessMaterial[fNbOfProc] = -1;
- return;
+#if ROOT_VERSION_CODE >= 262151
+ return kFALSE;
+#else
+ return
+#endif
}
}
strcpy(&fProcessFlag[fNbOfProc][0],flagName);
}
else
cout << "Nb of SetProcess calls exceeds 100 - ignored" << endl;
+#if ROOT_VERSION_CODE >= 262151
+ return kTRUE;
+#endif
}
//______________________________________________________________________________
-void TFluka::SetCut(const char* cutName, Double_t cutValue, Int_t imed)
+ void TFluka::SetCut(const char* cutName, Double_t cutValue, Int_t imed)
{
// Set user cut value for material imed
//
}
//______________________________________________________________________________
-void TFluka::SetCut(const char* cutName, Double_t cutValue)
+#if ROOT_VERSION_CODE >= 262151
+ Bool_t TFluka::SetCut(const char* cutName, Double_t cutValue)
+#else
+ void TFluka::SetCut(const char* cutName, Double_t cutValue)
+#endif
{
// Set user cut value
//
for (i=0; i<fNbOfCut; i++) {
if (strcmp(&fCutFlag[i][0],cutName) == 0) {
fCutValue[fNbOfCut] = cutValue;
+#if ROOT_VERSION_CODE >= 262151
+ return kFALSE;
+#else
return;
+
+#endif
}
}
strcpy(&fCutFlag[fNbOfCut][0],cutName);
}
else
cout << "Nb of SetCut calls exceeds 100 - ignored" << endl;
+#if ROOT_VERSION_CODE >= 262151
+ return kTRUE;
+#endif
}
//______________________________________________________________________________
#include "TVirtualMC.h"
#include "TMCProcess.h"
+#include "RVersion.h"
//Forward declaration
class TFlukaMCGeometry;
{printf("WARNING: Gdraw not yet implemented !\n");}
// Euclid
- virtual void WriteEuclid(const char*, const char*, Int_t, Int_t);
+ virtual void WriteEuclid(const char*, const char*, Int_t, Int_t);
// get methods
virtual Int_t VolId(const Text_t* volName) const;
//
// set methods
- virtual void SetProcess(const char* flagName, Int_t flagValue);
- virtual void SetProcess(const char* flagName, Int_t flagValue, Int_t imed);
+#if ROOT_VERSION_CODE >= 262151
+ virtual Bool_t SetProcess(const char* flagName, Int_t flagValue);
+#else
+ virtual void SetProcess(const char* flagName, Int_t flagValue);
+#endif
+
+ virtual void SetProcess(const char* flagName, Int_t flagValue, Int_t imed);
+
+#if ROOT_VERSION_CODE >= 262151
+ virtual Bool_t
+ SetCut(const char* cutName, Double_t cutValue);
+#else
virtual void SetCut(const char* cutName, Double_t cutValue);
+#endif
virtual void SetCut(const char* cutName, Double_t cutValue, Int_t imed);
virtual Double_t Xsec(char*, Double_t, Int_t, Int_t);
virtual void Gspart(Int_t, const char*, Int_t, Double_t, Double_t, Double_t)
{printf("WARNING: Gspart not yet implemented !\n");}
- // Dummy methods
- virtual void DefineParticle(int, const char*, TMCParticleType, double, double, double){;}
- virtual void DefineIon(const char*, int, int, int, double, double){;}
+ // Dummy methods
+
+
+#if ROOT_VERSION_CODE >= 262151
+ virtual Bool_t DefineParticle(int, const char*, TMCParticleType, double, double, double){return kTRUE;}
+#else
+ virtual void DefineParticle(int, const char*, TMCParticleType, double, double, double){;}
+#endif
+
+#if ROOT_VERSION_CODE >= 262151
+ virtual Bool_t DefineIon(const char*, int, int, int, double, double){return kTRUE;}
+#else
+ virtual void DefineIon(const char*, int, int, int, double, double){;}
+#endif
+
virtual TString ParticleName(int) const {return "";}
virtual Double_t ParticleMass(int) const {return 0.;}
virtual Double_t ParticleCharge(int) const {return 0.;}
#else
virtual void ProcessRun(Int_t nevent);
#endif
-
+ virtual void StopRun() {;}
+
//
//New Getter and Setters
// ------------------------------------------------