Changeset 4134 for trunk/MagicSoft/Mars/mjobs

Timestamp:

05/22/04 19:58:38 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibration.cc (modified) (1 diff)
• MJCalibration.h (modified) (1 diff)
• MJExtractCalibTest.cc (modified) (1 diff)
• MJExtractCalibTest.h (modified) (1 diff)
• MJPedestal.cc (modified) (1 diff)
• MJPedestal.h (modified) (1 diff)

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -799 +799 @@
 // Retrieve the output file written by WriteResult()
 // 
-TString MJCalibration::GetOutputFile() const
+const char* MJCalibration::GetOutputFile() const
 {
 
-    if (!fRuns)
-        return "";
-
-    return Form("%s/%s-F1.root", (const char*)fOutputPath, (const char*)fRuns->GetRunsAsFileName());
+  if (!fRuns)
+    return "";
+  
+  return Form("%s/%s-F1.root", (const char*)fOutputPath, (const char*)fRuns->GetRunsAsFileName());
 }
 

trunk/MagicSoft/Mars/mjobs/MJCalibration.h

@@ -61 +61 @@
   void SetOutputPath(const char *path=".");
   
-  TString GetOutputFile() const;
+  const char* GetOutputFile() const;
 
   MCalibrationChargeCam  &GetCalibrationCam()     { return fCalibrationCam; }  

trunk/MagicSoft/Mars/mjobs/MJExtractCalibTest.cc

@@ -196 +196 @@
 }
 
-TString MJExtractCalibTest::GetOutputFile() const
+const char* MJExtractCalibTest::GetOutputFile() const
 {
   if (!fRuns)

trunk/MagicSoft/Mars/mjobs/MJExtractCalibTest.h

@@ -58 +58 @@
   void SetOutputPath(const char *path=".");
   
-  TString GetOutputFile() const;
+  const char* GetOutputFile() const;
   
   MHCalibrationTestCam     &GetTestCam()      { return fTestCam; }

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -77 +77 @@
 }
 
-TString MJPedestal::GetOutputFile() const
-{
-    if (!fRuns)
-        return "";
-
-    return Form("%s/%s-F0.root", (const char*)fOutputPath, (const char*)fRuns->GetRunsAsFileName());
+const char* MJPedestal::GetOutputFile() const
+{
+  if (!fRuns)
+    return "";
+
+  return Form("%s/%s-F0.root", (const char*)fOutputPath, (const char*)fRuns->GetRunsAsFileName());
 }
 

trunk/MagicSoft/Mars/mjobs/MJPedestal.h

@@ -43 +43 @@
   const MBadPixelsCam &GetBadPixels() const { return fBadPixels;   }
   
-  TString GetOutputFile() const;
+  const char* GetOutputFile() const;
   
   Bool_t Process();