Changeset 1920 for trunk/MagicSoft/Mars/manalysis

Timestamp:

04/08/03 10:13:47 (22 years ago)

Author:

stamerra

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• AnalysisLinkDef.h (modified) (1 diff)
• MMcTriggerLvl2.cc (modified) (1 diff)
• MMcTriggerLvl2.h (modified) (1 diff)
• MMcTriggerLvl2Calc.cc (modified) (6 diffs)
• MMcTriggerLvl2Calc.h (modified) (2 diffs)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h

@@ -62 +62 @@
 #pragma link C++ class MParameterD+;
 
+#pragma link C++ class MMcTriggerLvl2+;
+#pragma link C++ class MMcTriggerLvl2Calc+;
+
 #pragma link C++ class MCT1SupercutsCalc+;
 

trunk/MagicSoft/Mars/manalysis/MMcTriggerLvl2.cc

@@ -254 +254 @@
   fSizeBiggerCell = GetCellNumberFired(CalcBiggerFiredCell());
  
-
 }
 

trunk/MagicSoft/Mars/manalysis/MMcTriggerLvl2.h

@@ -51 +51 @@
   void SetCompactNN(Int_t neighpix)     {fCompactNN=neighpix;}
 
-  Int_t GetPseudoSize()     {return fPseudoSize;}
-  Int_t GetLutPseudoSize()  {return fLutPseudoSize;}
-  Int_t GetSizeBiggerCell() {return fSizeBiggerCell;}
-  Int_t GetCompactNN()      {return fCompactNN;}
+  Int_t GetPseudoSize()     const {return fPseudoSize;}
+  Int_t GetLutPseudoSize()  const {return fLutPseudoSize;}
+  Int_t GetSizeBiggerCell() const {return fSizeBiggerCell;}
+  Int_t GetCompactNN()      const {return fCompactNN;}
 
   Int_t GetCellNumberFired(int cell);

trunk/MagicSoft/Mars/manalysis/MMcTriggerLvl2Calc.cc

@@ -37 +37 @@
 #include "MMcTriggerLvl2Calc.h"
 #include "MMcTriggerLvl2.h"
-
+#include "MHMcTriggerLvl2.h"
 
 #include "MParList.h"
@@ -47 +47 @@
 #include "MMcRunHeader.hxx"
 
-#include <TH1.h>
 
 ClassImp(MMcTriggerLvl2Calc);
@@ -61 +60 @@
   fTitle = title ? title : "Task to Fill the MMcTriggerLvl2 object";
   
-  //  AddToBranchList("MMcEvt.fEnergy");
-  //AddToBranchList(Form("%s.fNumFirstLevel", "MMcTrig"));
-  //AddToBranchList(Form("%s.fPixelsFirst[73][4]", "MMcTrig"));
-
-
-  // h1 = new TH1F("h1","h1",30,0,30);
 } 
 
@@ -100 +93 @@
     }
 
+    fMHMcTriggerLvl2 = (MHMcTriggerLvl2*)pList->FindCreateObj("MHMcTriggerLvl2");
+    if (!fMHMcTriggerLvl2)
+    {
+        *fLog << err << dbginf << "MHMcTriggerLvl2 not found... exit." << endl;
+        return kFALSE;
+    }
+
     // Check if the variable fCompactNN has been correctly set;
     //  accepted values for fCompactNN are (up to now) 2 and 3.
@@ -125 +125 @@
 
   fMMcTriggerLvl2->SetLv1(fMcTrig);
+ 
   fMMcTriggerLvl2->Calc();
+
+  fMHMcTriggerLvl2->Fill(fMMcTriggerLvl2);
 
   //fMMcTriggerLvl2->DrawLv1();
   //fMMcTriggerLvl2->DrawCell(fMMcTriggerLvl2->GetBiggerFiredCell() );
   //fMMcTriggerLvl2->Print();
-
-  //      h1->Fill(fMMcTriggerLvl2->GetLutPseudoSize() );
-
 
   return kTRUE;
@@ -146 +146 @@
 { 
   
-  //   *fLog << inf << "Filling..." << endl;
- 
-  //    h1->Draw();
-      
     return kTRUE;
 }

trunk/MagicSoft/Mars/manalysis/MMcTriggerLvl2Calc.h

@@ -12 +12 @@
 
 class MMcTriggerLvl2;
+class MHMcTriggerLvl2;
 
 class TH1F;
@@ -22 +23 @@
 
   MMcTriggerLvl2 *fMMcTriggerLvl2;
+  MHMcTriggerLvl2 *fMHMcTriggerLvl2;
     
  public:

trunk/MagicSoft/Mars/manalysis/Makefile

@@ -69 +69 @@
            MNewImageParCalc.cc \
            MParameters.cc \
+           MMcTriggerLvl2.cc \
+           MMcTriggerLvl2Calc.cc \
            MCT1SupercutsCalc.cc