Changeset 9068 for trunk/MagicSoft/Mars

Timestamp:

08/02/08 12:11:21 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (3 diffs)
• NEWS (modified) (1 diff)
• datacenter/scripts/dbchk (modified) (4 diffs)
• mjobs/MJPedestal.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2008/08/02 Thomas Bretz
+
+   * datacenter/scripts/dbchk:
+     - if the regular expression in sed doesn't find anything
+       nothing is replaced (this case is now handled)
+
+   * mjobs/MJPedestal.cc:
+     - removed the obsolete shift variable in PosePosCheck
+     - do not allow lo-gain starts < 0
+
+   * msignal/MExtractTimeAndCharge.cc:
+     - changed lo-gain stat sift to -1.0 (which is the valie which
+       in use anyway)
+
+   * msignal/MExtractTimeAndCharge.h:
+    - do not add the lo-gain offset wehen setting the start-shift
+
+   * msignal/MExtractor.cc:
+     - make sure Print() prints the class description 
+
+
+
  2008/08/01 Thomas Bretz
 
@@ -26 +48 @@
    * resources/starguider00328198.txt:
      - added
+
+   * datacenter/macros/plotdb.C:
+     - added fMedNumPheInner/outer
+     - added fRelChargeRmsOuter
+
+   * mbase/MStatusDisplay.[h,cc]:
+     - added %%title%% as a possibility in the filename
+     - added some code to write an XML instead of a csv file
+       (still not in-use)
+
+   * mjobs/MJCut.cc, mjobs/MJSpectrum.cc:
+     - replaced RunNumber by FileId
+
 
 
@@ -1140 +1175 @@
 
    * mbase/MStatusDisplay.cc:
-     - replacedMTime by TDatime
+     - replaced MTime by TDatime
 
    * mcamera/MCameraRecTemp.[h,cc], mcamera/MCameraTD.[h,cc],

trunk/MagicSoft/Mars/NEWS

@@ -28 +28 @@
    * MReadTree can now read also files not written by MARS and store
      the data encapsulated in emulated MParContainers
+
+   * Added the median number of photo electrons from the calibration
+     pulses to the db (fMedNumPheInner, fMedNumPheOuter) and the relative
+     error of their raw counts (fRelChargeRmsInner, fRelChargeRmsOuter)
 
    * added a new starguider calibration valid since 15.1.08

trunk/MagicSoft/Mars/datacenter/scripts/dbchk

@@ -89 +89 @@
 do
    sequence=`echo $file | sed -e "s/^.*\/sequence0\+\([0-9]\+\)\.txt$/\1/"`
-   if [ "$sequence" = "" ]
+   if [ "$sequence" = "" ] || [ "$sequence" = "$file" ]
    then
       echo "No sequence file: $file" >> $scriptlog 2>&1
@@ -95 +95 @@
       continue
    fi
-   
+ 
    var=`echo SELECT fSequenceFirst FROM Sequences WHERE fSequenceFirst=$sequence | mymysql`
    if ! [ "$sequence" = "$var" ]
@@ -111 +111 @@
 do
    sequence=`echo $dir | sed -e "s/^.*\/0\+\([0-9]\+\)$/\1/"`
-   if [ "$sequence" = "" ]
+   if [ "$sequence" = "" ] || [ "$sequence" = "$dir" ]
    then
       echo "Invalid directory: $dir" >> $scriptlog 2>&1
@@ -133 +133 @@
 do
    sequence=`echo $dir | sed -e "s/^.*\/0\+\([0-9]\+\)$/\1/"`
-   if [ "$sequence" = "" ]
+   if [ "$sequence" = "" ] || [ "$sequence" = "$dir" ]
    then
       echo "Invalid directory: $dir" >> $scriptlog 2>&1

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -890 +890 @@
         // Set and store the new ranges
         //
-        Int_t shift = 0;
         while (poslo2-fExtractWinLeft < lo0+0.5)
         {
@@ -903 +902 @@
         }
 
-        *fLog << "Changed extraction window by " << shift;
-        *fLog << "slices to hi-gain [" << hi0 << "," << hi1;
+        if (lo0<0)
+            lo0=0;
+
+        *fLog << "Changed extraction to hi-gain [" << hi0 << "," << hi1;
         *fLog << "] and lo-gain [" << lo0 << "," << lo1 << "]" << endl;