Changeset 7033

Timestamp:

05/13/05 19:26:28 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• manalysis/MEventRateCalc.cc (modified) (4 diffs)
• mbadpixels/MBadPixelsCalc.cc (modified) (4 diffs)
• mhist/HistLinkDef.h (modified) (2 diffs)
• mhist/MHWeather.cc (added)
• mhist/MHWeather.h (added)
• mhist/Makefile (modified) (2 diffs)
• mhvstime/MHVsTime.cc (modified) (2 diffs)
• mhvstime/MHVsTime.h (modified) (1 diff)
• mjobs/MJStar.cc (modified) (4 diffs)
• mmuon/MHSingleMuon.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -51 +51 @@
      - integration ranges were shifted by 0.2 FADC slices to the right. 
        Fixed in the new algorithm according to Markus' change.
+
+   * mcalib/MCalibrationChargeCalc.h:
+     - Incremented ClassVersion number by 1
+   
+   * mhcalib/MHCalibrationPulseTimeCam.cc:
+     - removed a commented debug output
+
+   * mjobs/MJCalibration.cc
+     - new undocumented adjust of "Unsuitable"- and "Unreliable"-displays 
+       for new exclusion criteria taken from bcn
+
+   * manalysis/MEventRateCalc.cc:
+     - some fixes. In some cases the event rate wasn't calculated
+       anymore
+
+   * mbadpixels/MBadPixelsCalc.cc:
+     - fixed a bug when checking whether the check should be done
+       or not (>0 was missing)
+
+   * mhist/Makefile:
+     - added MHWeather
+
+   * mhvstime/MHVsTime.[h,cc]:
+     - implemented new function the set minimum
+
+   * mjobs/MJStar.cc:
+     - read weather data (CC tree)
+     - set minimum of rate-display to 0
+     - display weather data for non-MC files
+
+   * mmuon/MHSingleMuon.cc:
+     - slight change to a comment
+
+
+
+ 2005/05/13 Markus Gaug (2005/05/12)
+
+   * msignal/MExtractTimeAndChargeDigitalFilter.cc
+     - set default extraction range in the high gain to 4.
+     - set default weights file to cosmics_weights46.dat
+
+   * mhcalib/MHCalibrationHiLoCam.cc
+     - set Oscillations to kFALSE
+
+   * mhcalib/MHCalibrationChargeCam.cc
+     - set default for fNumHiGainSaturationLimit to 0.15
+
+   * mjobs/MJCalibrateSignal.[h,cc]
+     - put MHCalibrationHiLoCam and MHCalibrationPulseTimeCam directly 
+       into tasklist if needed. Otherwise, it does not read the 
+       resources from the config. file.
+
+
+ 2005/05/11 Markus Gaug (2005/05/11)
+
+   * mjobs/MJPedestal.cc
+     - adjust the fit ranges for the histogramming with moon data slightly.
+
+   * mcalib/MCalibrationChargeCam.cc, mcalib/MCalibrationChargeCalc.cc
+     - make a distinction between newly excluded pixels (by calibration)
+       and previously excluded pixels in the displays and print-functions
+
+   * mcalib/MCalibrationChargeCalc.cc
+     - introduce the check for fluctuating arrival times.
+     - set charge limit to from 2.5 to 4.5
+     - introduce asymmetric exclusion due to "deviating number of phes":
+       Default: -9.0 +4.5
+     - make deviating number of phes unsuitable (see David's findings).
+   
+   * mbadpixels/MBadPixelsPix.h 
+     - add kDeviatingNumPhes to function GetUnsuitableCalLevel()
 
 

trunk/MagicSoft/Mars/NEWS

@@ -108 +108 @@
        Default: -9.0 +4.5
      + make deviating number of phes unsuitable (see David's findings).
+
+   - The weather data is now displayed in star
 
 

trunk/MagicSoft/Mars/manalysis/MEventRateCalc.cc

@@ -172 +172 @@
     const UInt_t cnt = n1<n2 ? n : n1-n2;
 
-    if (cnt<n/10)
-        return kTRUE;
-
-
-    // Calculate the rate
-    const Double_t rate = (Double_t)cnt/(fTimes[n1%n]-fTimes[n2%n]);
-
     // Store the time difference between two consecutive events
     fTimeDiff->SetVal(exec==0 ? -1 : fTimes[n1%n] - fTimes[(n1+n-1)%n]);
@@ -185 +178 @@
     // Make sure, that the beginning of data-takeing (open
     // a new file) doesn't effect the rate too much
-    if (exec<fNumFirstEvent+n)
-    {
-        fRate->SetRate(-1, 0);
+    if (cnt<n/10)
         return kTRUE;
-    }
+
+    // Calculate the rate
+    const Double_t rate = (Double_t)cnt/(fTimes[n1%n]-fTimes[n2%n]);
 
     // Store the rate
@@ -195 +188 @@
     fRate->SetReadyToSave();
 
-    Double_t diff = fTimes[n1%n]- fTimes[n2%n];
-    Double_t time = fTimes[n2%n]+ (cnt-n/10.)/(n-n/10.)*diff/2;
+    // Calculate and store the corresponding time
+    const Double_t diff = fTimes[n1%n] - fTimes[n2%n];
+    const Double_t time = fTimes[n2%n] + (cnt-n/10.)/(n-n/10.)*diff/2;
 
     fTimeRate->SetMean(time, time);
-
-    //if (cnt>1000)
-    //*fLog << all << *fTimeRate << " " << *fTime << " " << diff << " " << cnt << " " << n << " " << (float)(cnt-n/2)/n << endl;
-
+    fTimeRate->SetReadyToSave();
+
+   /*
     // Store the corresponding time
     if (exec==fNumFirstEvent+n)
@@ -208 +201 @@
     else
         fTimeRate->SetMean(fTimes[n1%n], fTimes[n2%n]);
+        */
 
     return kTRUE;

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc

@@ -208 +208 @@
 
         //Calculate the corrected means:
-
         if (rms<=0.5*meanrms[aidx] || rms>=1.5*meanrms[aidx])
             continue;
@@ -254 +253 @@
         const Byte_t  aidx = (*fGeomCam)[i].GetAidx();
 
-        if ((fPedestalLevel<0         || (rms>lolim1[aidx] && rms<=uplim1[aidx])) &&
-            (fPedestalLevelVariance<0 || (rms>lolim2[aidx] && rms<=uplim2[aidx])))
+        if ((fPedestalLevel<=0         || (rms>lolim1[aidx] && rms<=uplim1[aidx])) &&
+            (fPedestalLevelVariance<=0 || (rms>lolim2[aidx] && rms<=uplim2[aidx])))
             continue;
 
@@ -261 +260 @@
         bads++;
     }
-
 
     // Check if the number of pixels to blind is > 60% of total number of pixels
@@ -280 +278 @@
 Int_t MBadPixelsCalc::Process()
 {
-    if (fPedestalLevel>0 || fPedestalLevelVariance)
-    {
+    if (fPedestalLevel>0 || fPedestalLevelVariance>0)
         CheckPedestalRms();
-        //fPedPhotCam->ReCalc(*fGeomCam, fBadPixels);
-    }
 
     return kTRUE;

trunk/MagicSoft/Mars/mhist/HistLinkDef.h

@@ -10 +10 @@
 #pragma link C++ class MHEvent+;
 #pragma link C++ class MHCamEvent+;
+#pragma link C++ class MHCamEventRot+;
 #pragma link C++ class MHTriggerLvl0+;
 
@@ -19 +20 @@
 #pragma link C++ class MHCamera+;
 
-#pragma link C++ class MHCamEventRot+;
+#pragma link C++ class MHWeather+;
 
 #endif

trunk/MagicSoft/Mars/mhist/Makefile

@@ -21 +21 @@
 INCLUDES = -I. -I../mbase -I../mhbase -I../mraw -I../manalysis      \
            -I../mgui -I../mgeom -I../mdata -I../mfilter -I../mimage \
-           -I../mmain -I../mmc -I../mreflector -I../mpointing       \
-           -I../mastro -I../mpedestal -I../msignal -I../mbadpixels  \
-           -I../mcalib
+           -I../mpointing -I../mmc  -I../mastro -I../msignal        \
+           -I../mbadpixels -I../mcalib -I../mreport
 
 SRCFILES = MHEvent.cc \
@@ -34 +33 @@
            MHHadronness.cc \
            MHTriggerLvl0.cc \
-           MHCamera.cc
+           MHCamera.cc \
+           MHWeather.cc
 
 ############################################################

trunk/MagicSoft/Mars/mhvstime/MHVsTime.cc

@@ -121 +121 @@
 // --------------------------------------------------------------------------
 //
+// Call SetMinimum of fGraph
+//
+void MHVsTime::SetMinimum(Double_t min)
+{
+    if (fGraph)
+        fGraph->SetMinimum(0);
+}
+
+// --------------------------------------------------------------------------
+//
 // Return the data members used by the data chain to be used in
 // MTask::AddBranchToList
@@ -151 +161 @@
     fGraph->SetPoint(0, 0, 0); // Dummy point!
     fGraph->SetEditable();     // Used as flag: First point? yes/no
-
 
     TString title(fData ? GetRule() : (TString)"Graph");

trunk/MagicSoft/Mars/mhvstime/MHVsTime.h

@@ -45 +45 @@
 
     void SetScale(Double_t scale) { fScale = scale; }
+    void SetMinimum(Double_t min=-1111);
 
     Int_t GetNbins() const;

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -193 +193 @@
     readreal.AddTree("Events", "MTime.", kTRUE);
     readreal.AddTree("Drive");
+    readreal.AddTree("CC");
     //read.AddTree("Trigger");
     //read.AddTree("Camera");
-    //read.AddTree("CC");
     //read.AddTree("Currents");
     readreal.AddFiles(iter);
@@ -260 +260 @@
     hvs.SetTitle("Rate per 500 events;;R [Hz]");
     hvs.SetNumEvents(500);
+    hvs.SetMinimum(0);
 
     //MContinue cont1("MEventRate2.fRate/MEventRate.fRate>1.1");
@@ -423 +424 @@
     // ------------------------------------------------------------
 
+    MFillH fillw("MHWeather", "MTimeCC", "FillWeather");
     //tlist2.AddToList(&fill6);
     //tlist2.AddToList(&fill7);
@@ -432 +434 @@
     tlist.AddToList(&pcalc,  ismc ? "Events" : "Drive");
     tlist.AddToList(&tlist2, "Events");
+    if (!ismc)
+        tlist.AddToList(&fillw,  "CC");
     tlist.AddToList(&write);
 

trunk/MagicSoft/Mars/mmuon/MHSingleMuon.cc

@@ -204 +204 @@
             fHistPhi.Fill(TMath::ATan2(dx, dy)*TMath::RadToDeg(), pix.GetNumPhotons());
 
-        // use only the inner pixles. This is geometry dependent. This has to
-        // be fixed!
+        // use only the inner pixles. FIXME: This is geometry dependent
         if(i>397)
             continue;