Changeset 6234 for trunk

Timestamp:

02/03/05 13:39:19 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibTest.cc (modified) (1 diff)
• MJCalibration.cc (modified) (4 diffs)
• MJPedestal.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc

@@ -294 +294 @@
     {
       TString dat = GetEnv("DataType", "");
+      dat = dat.Strip(TString::kBoth);
       if (dat.BeginsWith("raw", TString::kIgnoreCase))
         {

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -1384 +1384 @@
 const char* MJCalibration::GetOutputFileName() const
 {
-    if (fSequence.IsValid())
-        return Form("calib%08d.root", fSequence.GetSequence());
-    if (!fRuns)
-        return "";
-
-    return Form("%s-F1.root", (const char*)fRuns->GetRunsAsFileName());
+
+  if (fSequence.IsValid())
+    return Form("calib%08d.root", fSequence.GetSequence());
+  if (!fRuns)
+    return "";
+  
+  return Form("%s-F1.root", (const char*)fRuns->GetRunsAsFileName());
 }
 
@@ -1422 +1423 @@
     {
       TString dat = GetEnv("DataType", "");
+      dat = dat.Strip(TString::kBoth);
       if (dat.BeginsWith("raw", TString::kIgnoreCase))
         {
@@ -1879 +1881 @@
 
     tlist.PrintStatistics();
-    
+
     /*
+
     MHCalibrationRelTimeCam *hcam = (MHCalibrationRelTimeCam*)plist.FindObject("MHCalibrationRelTimeCam");
-    MHCalibrationPix &pix1 = (*hcam)(100);
+    MHCalibrationPix &pix1 = (*hcam)[100];
     pix1.DrawClone("");
     gPad->SaveAs("test_time_100.ps");
 
     MHCalibrationChargeCam *hccam = (MHCalibrationChargeCam*)plist.FindObject("MHCalibrationChargeCam");
-    MHCalibrationPix &pix11 = (*hccam)(100);
+    MHCalibrationPix &pix11 = (*hccam)[100];
     pix11.DrawClone("");
     gPad->SaveAs("test_charge_100.ps");
 
-    MHCalibrationPix &pix2 = (MHCalibrationPix&)(*hcam)(400);
+    MHCalibrationPix &pix2 = (MHCalibrationPix&)(*hcam)[400];
     pix2.DrawClone("");    
     gPad->SaveAs("test_time_400.ps");
 
-    MHCalibrationPix &pix22 = (*hccam)(400);
+    MHCalibrationPix &pix22 = (*hccam)[400];
     pix22.DrawClone("");
     gPad->SaveAs("test_charge_400.ps");
@@ -1903 +1906 @@
     *fLog << err << "Blackout 400: " << fRelTimeCam[400].GetNumBlackout() << endl;
     *fLog << err << "Picup    400: " << fRelTimeCam[400].GetNumPickup  () << endl;    
+
     */
 

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -94 +94 @@
 //
 // Sets:
-// - fRuns to 0, 
 // - fExtractor to NULL, 
 // - fExtractType to kUsePedRun
@@ -748 +747 @@
     {
       TString dat = GetEnv("DataType", "");
+      dat = dat.Strip(TString::kBoth);
       if (dat.BeginsWith("raw", TString::kIgnoreCase))
         {
@@ -766 +766 @@
     
     if (HasEnv("UseData"))
-        fExtractType = GetEnv("UseData",kFALSE) ? kUseData : kUsePedRun;
+      fExtractType = GetEnv("UseData",kFALSE) ? kUseData : kUsePedRun;
 
     if (HasEnv("UseHists"))
-        if (GetEnv("UseHists",kFALSE))
-            fExtractType = kUseHists;
-
+      if (GetEnv("UseHists",kFALSE))
+        fExtractType = kUseHists;
+    
     SetNoStorage(GetEnv("DisableOutput", IsNoStorage()));
 
@@ -889 +889 @@
     if (fSequence.IsValid())
     {
-        const Int_t n0 = IsUseData() ? fSequence.SetupDatRuns(iter, fPathData, "D", IsUseRawData()) : fSequence.SetupPedRuns(iter, fPathData, "P", IsUseRawData());
-        const Int_t n1 = IsUseData() ? fSequence.GetNumDatRuns() : fSequence.GetNumPedRuns();
+        const Int_t n0 = IsUseData() 
+          ? fSequence.SetupDatRuns(iter, fPathData, "D", IsUseRawData()) 
+          : fSequence.SetupPedRuns(iter, fPathData, "P", IsUseRawData());
+        const Int_t n1 = IsUseData() 
+          ? fSequence.GetNumDatRuns() 
+          : fSequence.GetNumPedRuns();
         if (n0==0)
         {
-            *fLog << err << "ERROR - No " << type << " input files of sequence found in " << (fPathData.IsNull()?"<defaul>":fPathData.Data()) << endl;
+            *fLog << err << "ERROR - No " << type << " input files of sequence found in " << (fPathData.IsNull()?"<default>":fPathData.Data()) << endl;
             return kFALSE;
         }
         if (n0!=n1)
         {
-            *fLog << err << "ERROR - Number of " << type << " files found (" << n0 << ") in " << (fPathData.IsNull()?"<defaul>":fPathData.Data())  << " doesn't match number of files in sequence (" << n1 << ")" << endl;
+            *fLog << err << "ERROR - Number of " << type << " files found (" << n0 << ") in " << (fPathData.IsNull()?"<default>":fPathData.Data())  << " doesn't match number of files in sequence (" << n1 << ")" << endl;
             return kFALSE;
         }
@@ -913 +917 @@
         read.DisableAutoScheme();
         if (fRuns || fSequence.IsValid())
-            read.AddFiles(fSequence.IsValid() ? iter : *fRuns);
+          read.AddFiles(fSequence.IsValid() ? iter : *fRuns);
         tlist.AddToList(&read);
     }