Possibility to pass SDUM for scoring options.

diff --git a/TFluka/TFluka.cxx b/TFluka/TFluka.cxx
index 1c8c51b..91de886 100644 (file)
--- a/TFluka/TFluka.cxx
+++ b/TFluka/TFluka.cxx
@@ -1118,21 +1118,22 @@ Bool_t TFluka::SetCut(const char* cutName, Double_t cutValue)
 }
 
 
-void TFluka::SetUserScoring(const char* option, Int_t npr, char* outfile, Float_t* what)
+void TFluka::SetUserScoring(const char* option, const char* sdum, Int_t npr, char* outfile, Float_t* what)
 {
 //
 // Adds a user scoring option to the list
 //
-    TFlukaScoringOption* opt = new TFlukaScoringOption(option, "User Scoring", npr,outfile,what);
+    TFlukaScoringOption* opt = new TFlukaScoringOption(option, sdum, npr,outfile,what);
     fUserScore->Add(opt);
 }
 //______________________________________________________________________________
-void TFluka::SetUserScoring(const char* option, Int_t npr, char* outfile, Float_t* what, const char* det1, const char* det2, const char* det3)
+void TFluka::SetUserScoring(const char* option, const char* sdum, Int_t npr, char* outfile, Float_t* what, 
+                           const char* det1, const char* det2, const char* det3)
 {
 //
 // Adds a user scoring option to the list
 //
-    TFlukaScoringOption* opt = new TFlukaScoringOption(option, "User Scoring", npr, outfile, what, det1, det2, det3);
+    TFlukaScoringOption* opt = new TFlukaScoringOption(option, sdum, npr, outfile, what, det1, det2, det3);
     fUserScore->Add(opt);
 }
 

diff --git a/TFluka/TFluka.h b/TFluka/TFluka.h
index 811310e..2c0e8b3 100644 (file)
--- a/TFluka/TFluka.h
+++ b/TFluka/TFluka.h
@@ -311,8 +311,8 @@ class TFluka : public TVirtualMC {
   // FLUKA Scoring specific methods
   // ------------------------------
   //
-  virtual void SetUserScoring(const char* option, Int_t npr,char* outfile, Float_t* what);
-  virtual void SetUserScoring(const char* option, Int_t npr,char* outfile, Float_t* what,
+  virtual void SetUserScoring(const char* option, const char* sdum, Int_t npr,char* outfile, Float_t* what);
+  virtual void SetUserScoring(const char* option, const char* sdum, Int_t npr,char* outfile, Float_t* what,
                              const char* det1, const char* det2, const char* det3);
   //
   // New Getter and Setters

diff --git a/TFluka/TFlukaScoringOption.cxx b/TFluka/TFlukaScoringOption.cxx
index 62a2290..632cb63 100644 (file)
--- a/TFluka/TFlukaScoringOption.cxx
+++ b/TFluka/TFlukaScoringOption.cxx
@@ -108,18 +108,18 @@ void TFlukaScoringOption::WriteFlukaInputCards()
 //
     if(strncmp(GetName(), "USRBIN", 6) == 0){
         if (Par() == 0) {
-            fprintf(fgFile, "USRBIN    %10.1f%10.1f%10.1f%10.1f%10.1f%10.1f\n",
-                    What(1), What(2), GetLun(), What(4), What(5), What(6));
+            fprintf(fgFile, "USRBIN    %10.1f%10.1f%10.1f%10.1f%10.1f%10.1f%s\n",
+                    What(1), What(2), GetLun(), What(4), What(5), What(6), GetTitle());
         } else if (Par() == 1) {
-            fprintf(fgFile, "USRBIN    %10.1f%10.1f%10.1f%10.1f%10.1f%10.1f\n",
-                    What(1), What(2), GetLun(), What(4), What(5),  What(6));
+            fprintf(fgFile, "USRBIN    %10.1f%10.1f%10.1f%10.1f%10.1f%10.1f%s\n",
+                    What(1), What(2), GetLun(), What(4), What(5),  What(6), GetTitle());
             fprintf(fgFile, "USRBIN    %10.1f%10.4g%10.1f%10.1f%10.1f%10.1f  %s\n",
                     What(7), What(8), What(9), What(10), What(11), What(12), cont_line);
         } else if (Par() == 2) {
             if(What(1) == 2.0 || What(1) == 12){
-                fprintf(fgFile, "USRBIN    %10.1f%10.1f%10.1f%10.1f%10.1f%10.1f\n",
+                fprintf(fgFile, "USRBIN    %10.1f%10.1f%10.1f%10.1f%10.1f%10.1f%s\n",
                         What(1), What(2), GetLun(), Float_t(GetRegionByName(GetRegName(1))),
-                        Float_t(GetRegionByName(GetRegName(2))), Float_t(GetRegionByName(GetRegName(3))));
+                        Float_t(GetRegionByName(GetRegName(2))), Float_t(GetRegionByName(GetRegName(3))), GetTitle());
                 fprintf(fgFile, "USRBIN    %10.1f%10.4g%10.1f%10.1f%10.1f%10.1f  %s\n",
                         Float_t(GetRegionByName(GetRegName(1))), Float_t(GetRegionByName(GetRegName(2))),
                         Float_t(GetRegionByName(GetRegName(3))), 1., 1., 1., cont_line);