Changeset 8438

Timestamp:

04/23/07 21:04:21 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft

Files:

• Mars/mmovie/MMovieWrite.cc (modified) (1 diff)
• include-Classes/MMcFormat/MMcEvt.cxx (modified) (3 diffs)
• include-Classes/MMcFormat/MMcEvt.hxx (modified) (1 diff)

trunk/MagicSoft/Mars/mmovie/MMovieWrite.cc

@@ -778 +778 @@
     */
 
-    TString s = Form("%d: ", GetNumExecutions()+1);
-    s += "Evt #";
+    TString s = Form("%d:  Evt #", GetNumExecutions()+1);
     s += fHead->GetDAQEvtNumber();
     s += " of ";

trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx

@@ -58 +58 @@
 #include "MLogManip.h"
 
+#include "MString.h"
+
 ClassImp(MMcEvt);
 
@@ -224 +226 @@
 // Return a proper description of the monte carlo event
 //
-TString MMcEvt::GetDescription(TString s) const
+TString MMcEvt::GetDescription(const TString &s) const
 {
     TString txt("#splitline{");
@@ -233 +235 @@
     txt += "}{  E=";
     txt += GetEnergyStr();
-    txt += " r=";
-    txt += (int)(GetImpact()/100+.5);
-    txt += "m Zd=";
-    txt += 0.1*TMath::Nint(GetTelescopeTheta()*180/TMath::Pi()*10);
-    txt += "\\circ ";
+    txt += "  r=";
+    txt += TMath::Nint(GetImpact()/100);
+    txt += "m  Zd=";
+    txt += MString::Format("%.1f", GetTelescopeTheta()*TMath::RadToDeg());
+    txt += "\\circ  ";
     if (GetPhotElfromShower()>=10000)
-        txt += Form("%dk", (Int_t)(GetPhotElfromShower()/1000.+.5));
+        txt += MString::Format("%dk", TMath::Nint(GetPhotElfromShower()/1000.));
     else
         if (GetPhotElfromShower()>=1000)
-            txt += Form("%.1fk", GetPhotElfromShower()/1000.);
+            txt += MString::Format("%.1fk", GetPhotElfromShower()/1000.);
         else
             txt += GetPhotElfromShower();

trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.hxx

@@ -100 +100 @@
     Float_t GetMuonCphFraction() const { return fMuonCphFraction; }
 
-    TString GetDescription(TString s="") const;
+    TString GetDescription(const TString &s="") const;
 
     // Setter