Changeset 5372 for trunk/MagicSoft

Timestamp:

11/10/04 17:12:20 (20 years ago)

Author:

otte

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mpedestal

Files:

• MPedCalcFromLoGain.cc (modified) (4 diffs)
• MPedCalcFromLoGain.h (modified) (1 diff)

trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc

@@ -615 +615 @@
     Int_t ls = fCheckWinLast;
 
-    if (IsEnvDefined(env, prefix, "SetCheckRange", print))
-    {
+    if (IsEnvDefined(env, prefix, "FirstCheckWindowSlice", print)){
         fs = GetEnvValue(env, prefix, "FirstCheckWindowSlice", fs);
+        rc = kTRUE;
+    }
+    if (IsEnvDefined(env, prefix, "LastCheckWindowSlice", print)){
         ls = GetEnvValue(env, prefix, "LastCheckWindowSlice", ls);
         rc = kTRUE;
-
-    }
+    }
+
     SetCheckRange(fs,ls);
 
@@ -628 +630 @@
     Int_t wf = fExtractWinFirst;
 
-    if (IsEnvDefined(env, prefix, "SetExtractWindow", print))
-    {
-        lw = GetEnvValue(env, prefix, "ExtractWindowSize", lw);
-        wf = GetEnvValue(env, prefix, "ExtractWindowFirst", wf);
-        rc = kTRUE;
-
-    }
+    if (IsEnvDefined(env, prefix, "ExtractWindowSize", print)){
+      lw = GetEnvValue(env, prefix, "ExtractWindowSize", lw);
+      rc = kTRUE;
+    }
+
+    if (IsEnvDefined(env, prefix, "ExtractWindowFirst", print)){
+      wf = GetEnvValue(env, prefix, "ExtractWindowFirst", wf);
+    rc = kTRUE;
+    }
+
     SetExtractWindow(wf,lw);
 
     Int_t num = fNumEventsDump;
-    if (IsEnvDefined(env, prefix, "SetNumEventsDump", print))
+    if (IsEnvDefined(env, prefix, "NumEventsDump", print))
     {
         num = GetEnvValue(env, prefix, "NumEventsDump", num);
@@ -645 +650 @@
     SetNumEventsDump(num);
 
-    Byte_t max = fMaxSignalVar;
-    if (IsEnvDefined(env, prefix, "SetMaxSignalVar", print))
+    Int_t max = fMaxSignalVar;
+    if (IsEnvDefined(env, prefix, "MaxSignalVar", print))
     {
         max = GetEnvValue(env, prefix, "MaxSignalVar", max);
@@ -654 +659 @@
 
     Bool_t upd = fPedestalUpdate;
-    if (IsEnvDefined(env, prefix, "SetPedestalUpdate", print))
+    if (IsEnvDefined(env, prefix, "PedestalUpdate", print))
     {
         upd = GetEnvValue(env, prefix, "PedestalUpdate", upd);

trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.h

@@ -69 +69 @@
     void SetCheckRange(Int_t checkfirst=0, Int_t checklast=29);
     void SetExtractWindow(Int_t extractfirst=15, Int_t windowsize=6);
-    void SetMaxSignalVar(Int_t maxvar=0)         { fMaxSignalVar = maxvar;    }
-    void SetNumEventsDump(UInt_t dumpevents = 0) { fNumEventsDump = dumpevents;}
+    void SetMaxSignalVar(Int_t maxvar=40)         { fMaxSignalVar = maxvar;    }
+    void SetNumEventsDump(UInt_t dumpevents = 500) { fNumEventsDump = dumpevents;}
     void SetPedestalUpdate(Bool_t pedupdate)  {fPedestalUpdate = pedupdate;}