Changeset 4133 for trunk/MagicSoft

Timestamp:

05/22/04 19:45:45 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrationChargeCalc.cc (modified) (7 diffs)
• MCalibrationChargeCalc.h (modified) (2 diffs)
• MCalibrationRelTimeCalc.cc (modified) (2 diffs)
• MCalibrationRelTimeCalc.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -769 +769 @@
 {
 
-  /*
-  const Float_t mean    = cal.IsHiGainSaturation() ? cal.GetConvertedLoGainMean()    : cal.GetMean();
-  const Float_t meanerr = cal.IsHiGainSaturation() ? cal.GetConvertedLoGainMeanErr() : cal.GetMeanErr();
-  const Float_t sigma   = cal.IsHiGainSaturation() ? cal.GetConvertedLoGainSigma()   : cal.GetSigma();
-  */
+  if (bad.IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
+    return kFALSE;
+
   if (cal.GetMean() < fChargeLimit*cal.GetPedRms())
     {
@@ -795 +793 @@
       bad.SetUncalibrated( MBadPixelsPix::kChargeSigmaNotValid );
     }
-
-  if (bad.IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
-    return kFALSE;
 
   if (!cal.CalcReducedSigma())
@@ -861 +856 @@
       if (bad.IsUncalibrated( MBadPixelsPix::kDeviatingNumPhes ))
         bad.SetUnsuitable(   MBadPixelsPix::kUnsuitableRun    );
-      //        bad.SetUnsuitable(   MBadPixelsPix::kUnreliableRun    );
 
       if (bad.IsUnsuitable(   MBadPixelsPix::kUnsuitableRun    ))
@@ -1003 +997 @@
           bad.SetUnsuitable  ( MBadPixelsPix::kUnsuitableRun    );
           pix.SetExcluded();
-          //          bad.SetUnsuitable  ( MBadPixelsPix::kUnreliableRun    );
           continue;
         }
@@ -1525 +1518 @@
   UInt_t countinner = 0;
   UInt_t countouter = 0;
+
   for (Int_t i=0; i<fBadPixels->GetSize(); i++)
     {
@@ -1545 +1539 @@
 // Set the path for output file
 // 
-void MCalibrationChargeCalc::SetOutputPath(const char *path)
+void MCalibrationChargeCalc::SetOutputPath(TString path)
 {
   fOutputPath = path;
@@ -1552 +1546 @@
 }
 
+void MCalibrationChargeCalc::SetOutputFile(TString file)
+{ 
+  fOutputFile        = file; 
+}
+
 // --------------------------------------------------------------------------
 //
 // Get the output file
 // 
-TString MCalibrationChargeCalc::GetOutputFile()
+const char* MCalibrationChargeCalc::GetOutputFile()
 {
   return Form("%s/%s", (const char*)fOutputPath, (const char*)fOutputFile);

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h

@@ -83 +83 @@
 
   // functions
-  TString GetOutputFile();
+  const char* GetOutputFile();
   void   FinalizePedestals      ( const MPedestalPix &ped, MCalibrationChargePix &cal, const Int_t aidx );
   Bool_t FinalizeCharges        ( MCalibrationChargePix &cal, MBadPixelsPix &bad      );
@@ -114 +114 @@
   void SetLambdaErrLimit    ( const Float_t f=fgLambdaErrLimit         ) { fLambdaErrLimit    = f;   }
   void SetLambdaCheckLimit  ( const Float_t f=fgLambdaCheckLimit       ) { fLambdaCheckLimit  = f;   }
-  void SetOutputPath        ( const char   *path="."                   );
-  void SetOutputFile        ( const char   *file="ChargeCalibStat.txt" ) { fOutputFile        = file; }
+  void SetOutputPath        ( TString path="."                   );
+  void SetOutputFile        ( TString file="ChargeCalibStat.txt" );
   void SetPheErrLimit       ( const Float_t f=fgPheErrLimit            ) { fPheErrLimit       = f;   }  
   void SetPulserColor       ( const MCalibrationCam::PulserColor_t col ) { fPulserColor       = col; }

trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc

@@ -509 +509 @@
 // Set the path for output file
 // 
-void MCalibrationRelTimeCalc::SetOutputPath(const char *path)
+void MCalibrationRelTimeCalc::SetOutputPath(TString path)
 {
   fOutputPath = path;
@@ -520 +520 @@
 // Get the output file
 // 
-TString MCalibrationRelTimeCalc::GetOutputFile()
+const char* MCalibrationRelTimeCalc::GetOutputFile()
 {
   return Form("%s/%s", (const char*)fOutputPath, (const char*)fOutputFile);

trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.h

@@ -50 +50 @@
 
   // functions
-  TString GetOutputFile();
+  const char* GetOutputFile();
   void   FinalizeAverageResolution();
   void   FinalizeRelTimes     ();
@@ -69 +69 @@
   void Clear(const Option_t *o="");
   
-  void SetOutputPath        ( const char   *path="."                   );
-  void SetOutputFile        ( const char   *file="TimeCalibStat.txt"   ) { fOutputFile        = file; }
+  void SetOutputPath        ( TString path="."                   );
+  void SetOutputFile        ( TString file="TimeCalibStat.txt"   ) { fOutputFile        = file; }
   void SetRelTimeResolutionLimit ( const Float_t f=fgRelTimeResolutionLimit    ) { fRelTimeResolutionLimit = f;   }