Changeset 9574 for trunk

Timestamp:

04/21/10 16:46:18 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• macros/rootlogon.C (modified) (1 diff)
• mbase/MStatusDisplay.cc (modified) (4 diffs)
• mmuon/MHSingleMuon.cc (modified) (2 diffs)
• mraw/MRawEvtHeader.h (modified) (2 diffs)
• msimcamera/MSimRandomPhotons.cc (modified) (1 diff)
• msimcamera/MSimTrigger.cc (modified) (7 diffs)
• msimcamera/MSimTrigger.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2010/04/21 Thomas Bretz
+
+   * macros/rootlogon.C:
+     - a small fix which gets rid of the annoying error about an
+       unlocked mutex when starting the MStatusDisplay in the
+       interpreter. It makes sure that fGThreadFactory gets initialized
+       from the main thread.
+
+   * mbase/MStatusDisplay.cc:
+     - added a console output if TryLock fails
+     - the return value of TString::Index was misinterpreted
+
+   * mmuon/MHSingleMuon.cc:
+     - removed another reference to gMinuit
+
+   * msimcamera/MSimRandomPhotons.cc:
+     - re-did the output
+     - choose the other rate f2 instead of f1
+
+   * msimcamera/MSimTrigger.[h,cc]:
+     - keep the index of the trigger channel which finnaly issued
+       the trigger and propagate it to the event header
+
+   * mraw/MrawEvtHeader.h:
+     - implementd setter for fNumTriggerLvl1
+
+
 
  2010/04/19 Thomas Bretz

trunk/MagicSoft/Mars/NEWS

@@ -12 +12 @@
    * Allow for individual mirrors with parabolic shape (for details see
      MReflector::ReadFile)
+
+   * As an additional output artificial star-files are written. They
+     contain star output compatible output based on the signal as
+     in the artificial callisto output files.
+
+   * The trigger channel which issued the trigger is now stored in
+     MRawEvtHeader::fNumTriggerLvl1
 
 

trunk/MagicSoft/Mars/macros/rootlogon.C

@@ -124 +124 @@
     MLog::RedirectErrorHandler(MLog::kColor);
 
+    // This initialized the thread factory. This is needed to supress
+    // an error which is displayed if the thread factory is initialized
+    // from another than the main thread (e.g. in the constructor
+    // of MStatusDisplay)
+    TThread::Self();
+
     gInterpreter->AddIncludePath(dir+"macros");
     gInterpreter->AddIncludePath(dir+"manalysis");

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -1223 +1223 @@
     // in the same thread
     //
-    if (fMutex->TryLock())
+    const Int_t rc = fMutex->TryLock();
+    if (rc==13)
+        gLog << warn << "MStatusDisplay::UpdateTab - mutex is already locked by this thread." << endl;
+
+    if (rc)
         return;
 
@@ -2638 +2642 @@
     {
         Bool_t found = kFALSE;
-        if (name.Index("%%%%name%%%%"))
+        if (name.Index("%%%%name%%%%")>=0)
         {
             name.ReplaceAll("%%name%%", c->GetName());
@@ -2644 +2648 @@
         }
 
-        if (name.Index("%%%%title%%%%"))
+        if (name.Index("%%%%title%%%%")>=0)
         {
             name.ReplaceAll("%%title%%", c->GetTitle());
@@ -2650 +2654 @@
         }
 
-        if (name.Index("%%%%tab%%%%"))
+        if (name.Index("%%%%tab%%%%")>=0)
         {
             name.ReplaceAll("%%tab%%", MString::Format("%d", i));

trunk/MagicSoft/Mars/mmuon/MHSingleMuon.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHSingleMuon.cc,v 1.20 2010-04-19 12:40:16 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHSingleMuon.cc,v 1.21 2010-04-21 15:42:24 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -433 +433 @@
     //           Q  quiet mode
 //    fHistWidth.Fit(&f1, "QRO");
-    fHistWidth.Fit(&f1, "QRN");
-
-    if (!gMinuit)
+    if (fHistWidth.Fit(&f1, "QRN"))
         return kFALSE;
 

trunk/MagicSoft/Mars/mraw/MRawEvtHeader.h

@@ -56 +56 @@
 
     UInt_t   fNumTrigLvl1;     // Number of 1st level tiggers between 2 events
+                               // Used in MSimTrigger for the index of the trigger channel
     UInt_t   fNumTrigLvl2;     // Number of 2nd level tiggers between 2 events
     UInt_t   fTrigPattern[2];  // Trigger configuration
@@ -98 +99 @@
     void  SetCalibrationPattern( const UInt_t pattern )  {  fTrigPattern[1] = pattern; }
     void  SetDAQEvtNumber(const UInt_t n) { fDAQEvtNumber = n; }
+    void  SetNumTrigLvl1(UInt_t num) { fNumTrigLvl1 = num; }
 
     // TObject

trunk/MagicSoft/Mars/msimcamera/MSimRandomPhotons.cc

@@ -363 +363 @@
     // *fLog << 1.75e6/(600-300) * f2 * eff->GetSpline()->Integral() << " MHz" << endl;
 
-    *fLog << "Conversion factor Fnu:      " << f  << endl;
-    *fLog << "Total reflective area:      " << Form("%.2f", Ar) << " m" << UTF8::kSquare << endl;
-    *fLog << "Acceptance area of cone 0:  " << Form("%.2f", A0*1e6) << " mm" << UTF8::kSquare << " = ";
+    *fLog << "Conversion factor Fnu:         " << f  << endl;
+    *fLog << "Total reflective area:         " << Form("%.2f", Ar) << " m" << UTF8::kSquare << endl;
+    *fLog << "Acceptance area of cone 0:     " << Form("%.2f", A0*1e6) << " mm" << UTF8::kSquare << " = ";
     *fLog << A0*conv*conv << " sr" << endl;
-    *fLog << "Cones angular acceptance:   " << sr << " sr" << endl;
-    *fLog << "ConeArea*MirrorAngle (f1):  " << f1 << " m^2 sr" << endl;
-    *fLog << "MirrorArea*ConeAngle (f2):  " << f2 << " m^2 sr" << endl;
-    *fLog << "Effective. transmission:    " << Form("%.1f", nm) << " nm" << endl;
+    *fLog << "Cones angular acceptance:      " << sr << " sr" << endl;
+    *fLog << "ConeArea*ConeSolidAngle (f1):  " << f1 << " m^2 sr" << endl;
+    *fLog << "MirrorArea*ConeSkyAngle (f2):  " << f2 << " m^2 sr" << endl;
+    *fLog << "Effective. transmission:       " << Form("%.1f", nm) << " nm" << endl;
     *fLog << "NSB freq. in " << fNameGeomCam << "[0] (f1): " << Form("%.2f", rate * f1) << " MHz" << endl;
     *fLog << "NSB freq. in " << fNameGeomCam << "[0] (f2): " << Form("%.2f", rate * f2) << " MHz" << endl;
-    *fLog << "Using f1." << endl;
+    *fLog << "Using f2." << endl;
 
     // Scale the rate per mm^2 and to GHz
-    fScale = rate * f1 / (*fGeom)[0].GetA() / 1000;
+    fScale = rate * f2 / (*fGeom)[0].GetA() / 1000;
 
     // FIXME: Scale with the number of pixels
-    if (rate*f1>1000)
+    if (rate*f2>1000)
     {
         *fLog << err << "ERROR - Frequency exceeds 1GHz, this might leed to too much memory consumption." << endl;

trunk/MagicSoft/Mars/msimcamera/MSimTrigger.cc

@@ -422 +422 @@
         return sig ? sig->GetStart() : -1;
     }
+    Int_t GetFirstIndex() const
+    {
+        MDigitalSignal *sig = static_cast<MDigitalSignal*>(fSignals[0]);
+        return sig ? sig->GetIndex() : -1;
+    }
     Bool_t GetPixelContent(Double_t&, Int_t, const MGeomCam&, Int_t) const
     {
@@ -441 +446 @@
 
 
-void MSimTrigger::SetTrigger(Double_t pos)
+void MSimTrigger::SetTrigger(Double_t pos, Int_t idx)
 {
     // FIXME: Jitter! (Own class?)
@@ -453 +458 @@
     // Flag this event as triggered by the lvl1 trigger (FIXME?)
     fEvtHeader->SetTriggerPattern(pos<0 ? 0 : pat);
+    fEvtHeader->SetNumTrigLvl1((UInt_t)idx);
     fEvtHeader->SetReadyToSave();
 }
@@ -473 +479 @@
     if (!fSimulateElectronics)
     {
-        SetTrigger(min);
+        SetTrigger(min, -1);
         return kTRUE;
     }
@@ -611 +617 @@
             }
 
-            // Set trigger channel index
-            ttl->SetIndex(j);
+            // Set trigger-channel index to keep this information
+            //ttl->SetIndex(j);
         }
 
@@ -623 +629 @@
         // FIXME: Simulate trigger dead-time!
         if (arr->GetEntriesFast()>0)
-            triggers.Add(static_cast<MDigitalSignal*>(arr->RemoveAt(0)));
+        {
+            ttl = static_cast<MDigitalSignal*>(arr->RemoveAt(0));
+            // Set trigger-channel index to keep this information
+            ttl->SetIndex(j);
+            triggers.Add(ttl);
+        }
 
         // delete the allocated space
@@ -636 +647 @@
     // FIXME: Store triggers! (+ Reversed pixels?)
 
-    SetTrigger(triggers.GetFirstTrigger());
+    SetTrigger(triggers.GetFirstTrigger(), triggers.GetFirstIndex());
 
     // No trigger issued. Go on.

trunk/MagicSoft/Mars/msimcamera/MSimTrigger.h

@@ -48 +48 @@
     TObjArray *CalcMinMultiplicity(const MArrayI &idx, const TObjArray &ttls, Int_t threshold) const;
     TObjArray *CalcCoincidences(const MArrayI &idx, const TObjArray &ttls) const;
-    void SetTrigger(Double_t pos);
+    void SetTrigger(Double_t pos, Int_t idx);
 
     // MTask