Changeset 5298 for trunk/MagicSoft/Mars/mjobs

Timestamp:

10/20/04 16:21:23 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibrateSignal.cc (modified) (1 diff)
• MJPedestal.cc (modified) (10 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -332 +332 @@
     MHCamEvent evt6(0, "Times",       "Arrival Time;;T [slice]");
     evt0.EnableVariance();
+    evt1.EnableVariance();
     evt2.EnableVariance();
     evt3.EnableVariance();
+    evt4.EnableVariance();
     evt6.EnableVariance();
 

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -17 +17 @@
 !
 !   Author(s): Thomas Bretz, 1/2004 <mailto:tbretz@astro.uni-wuerzburg.de>
-!              Markus Gaug ,04/2004 <mailto:markus@ifae.es>
+!   Author(s): Markus Gaug, 4/2004 <mailto:markus@ifae.es>
 !
 !   Copyright: MAGIC Software Development, 2000-2004
@@ -84 +84 @@
 const Float_t  MJPedestal::fgRefPedRmsExtraGalacticOuter = 3.35;
 const Float_t  MJPedestal::fgRefPedRmsGalacticOuter      = 4.2;
+
 // --------------------------------------------------------------------------
 //
@@ -99 +100 @@
       fDataCheck(kFALSE), fUseData(kFALSE)
 {
-
-  fName  = name  ? name  : "MJPedestal";
-  fTitle = title ? title : "Tool to create a pedestal file (MPedestalCam)";
-  
-  SetNormalStorage();
-
+    fName  = name  ? name  : "MJPedestal";
+    fTitle = title ? title : "Tool to create a pedestal file (MPedestalCam)";
+
+    SetNormalStorage();
 }
 
@@ -128 +127 @@
 Bool_t MJPedestal::ReadPedestalCam()
 {
-
-  if (IsNoStorage())
-    return kFALSE;
-  
-  const TString fname = GetOutputFile();
-  
-  if (gSystem->AccessPathName(fname, kFileExists))
-    {
-      *fLog << warn << "Input file " << fname << " doesn't exist, will create it." << endl;
-      return kFALSE;
-    }
-  
-  *fLog << inf << "Reading from file: " << fname << endl;
-  
-  TFile file(fname, "READ");
-  if (fPedestalCam.Read()<=0)
-    {
-      *fLog << err << "Unable to read MPedestalCam from " << fname << endl;
-      return kFALSE;
-    }
-  
-  if (file.FindKey("MBadPixelsCam"))
-    {
-      MBadPixelsCam bad;
+    if (IsNoStorage())
+        return kFALSE;
+
+    const TString fname = GetOutputFile();
+
+    if (gSystem->AccessPathName(fname, kFileExists))
+    {
+        *fLog << warn << "Input file " << fname << " doesn't exist, will create it." << endl;
+        return kFALSE;
+    }
+
+    *fLog << inf << "Reading from file: " << fname << endl;
+
+    TFile file(fname, "READ");
+    if (fPedestalCam.Read()<=0)
+    {
+        *fLog << err << "Unable to read MPedestalCam from " << fname << endl;
+        return kFALSE;
+    }
+
+    if (file.FindKey("MBadPixelsCam"))
+    {
+        MBadPixelsCam bad;
         if (bad.Read()<=0)
-          {
+        {
             *fLog << err << "Unable to read MBadPixelsCam from " << fname << endl;
             return kFALSE;
-          }
+        }
         fBadPixels.Merge(bad);
     }
 
-  if (fDisplay && !fDisplay->GetCanvas("Pedestals"))
-    fDisplay->Read();
-  
-  return kTRUE;
+    if (fDisplay && !fDisplay->GetCanvas("Pedestals"))
+        fDisplay->Read();
+
+    return kTRUE;
 }
 
@@ -371 +369 @@
 void  MJPedestal::DisplayReferenceLines(MHCamera *cam, const Int_t what) const
 {
-
   Double_t x = cam->GetNbinsX();
   
@@ -441 +438 @@
 void MJPedestal::FixDataCheckHist(TH1D *hist) const 
 {
-
     hist->SetDirectory(NULL);
     hist->SetStats(0);
@@ -459 +455 @@
     xaxe->SetLabelSize(0.05);
     yaxe->SetLabelSize(0.05);    
-
-}
+}
+
 /*
 Bool_t MJPedestal::WriteEventloop(MEvtLoop &evtloop) const
@@ -494 +490 @@
 //   Prefix.DataCheck:        Yes, No
 //   Prefix.UseData:          Yes, No
+//   Prefix.DisableOutput:    Yes, No
 //
 Bool_t MJPedestal::CheckEnvLocal()
@@ -502 +499 @@
     SetDataCheck(GetEnv("DataCheck", fDataCheck));
     SetUseData(GetEnv("UseData", fUseData));
+    SetNoStorage(GetEnv("DisableOutput", IsNoStorage()));
 
     return kTRUE;
@@ -516 +514 @@
 Bool_t MJPedestal::WriteResult()
 {
-  
-  if (IsNoStorage())
+    if (IsNoStorage())
+        return kTRUE;
+
+    if (fPathOut.IsNull())
+        return kTRUE;
+
+    const TString oname(GetOutputFile());
+
+    *fLog << inf << "Writing to file: " << oname << endl;
+
+    TFile file(oname, "UPDATE", "File created by MJPedestal", 9);
+    if (!file.IsOpen())
+    {
+        *fLog << err << "ERROR - Couldn't open file " << oname << " for writing..." << endl;
+        return kFALSE;
+    }
+
+    if (fDisplay && fDisplay->Write()<=0)
+    {
+        *fLog << err << "Unable to write MStatusDisplay to " << oname << endl;
+        return kFALSE;
+    }
+
+    if (fPedestalCam.Write()<=0)
+    {
+        *fLog << err << "Unable to write MPedestalCam to " << oname << endl;
+        return kFALSE;
+    }
+
+    if (fBadPixels.Write()<=0)
+    {
+        *fLog << err << "Unable to write MBadPixelsCam to " << oname << endl;
+        return kFALSE;
+    }
+
     return kTRUE;
-
-  if (fPathOut.IsNull())
-    return kTRUE;
-  
-  const TString oname(GetOutputFile());
-  
-  *fLog << inf << "Writing to file: " << oname << endl;
-
-  TFile file(oname, "UPDATE", "File created by MJPedestal", 9);
-  if (!file.IsOpen())
-    {
-      *fLog << err << "ERROR - Couldn't open file " << oname << " for writing..." << endl;
-      return kFALSE;
-    }
-  
-  if (fDisplay && fDisplay->Write()<=0)
-    {
-      *fLog << err << "Unable to write MStatusDisplay to " << oname << endl;
-      return kFALSE;
-    }
-
-  if (fPedestalCam.Write()<=0)
-    {
-      *fLog << err << "Unable to write MPedestalCam to " << oname << endl;
-      return kFALSE;
-    }
-
-  if (fBadPixels.Write()<=0)
-    {
-      *fLog << err << "Unable to write MBadPixelsCam to " << oname << endl;
-      return kFALSE;
-    }
-
-  return kTRUE;
 }