Changeset 9574 for trunk/MagicSoft/Mars/msimcamera

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msimcamera

Files:

• MSimRandomPhotons.cc (modified) (1 diff)
• MSimTrigger.cc (modified) (7 diffs)
• MSimTrigger.h (modified) (1 diff)

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