Changeset 4577

Timestamp:

08/11/04 12:01:44 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft

Files:

• Mars/Changelog (modified) (4 diffs)
• Mars/manalysis/MGeomApply.cc (modified) (3 diffs)
• Mars/mbase/MParList.cc (modified) (2 diffs)
• Mars/mbase/MParList.h (modified) (1 diff)
• Mars/mgui/MCamEvent.cc (modified) (1 diff)
• Mars/mgui/MCamEvent.h (modified) (1 diff)
• Mars/mraw/MRawEvtData.h (modified) (1 diff)
• Mars/mraw/MRawEvtHeader.cc (modified) (1 diff)
• Mars/mraw/MRawEvtHeader.h (modified) (1 diff)
• Mars/mraw/MRawFileRead.cc (modified) (1 diff)
• Mars/mraw/MRawSocketRead.cc (modified) (1 diff)
• Mars/mraw/RawLinkDef.h (modified) (1 diff)
• Mars/msignal/MArrivalTime.cc (modified) (1 diff)
• Mars/msignal/MArrivalTime.h (modified) (1 diff)
• Mars/msql/MSQLServer.cc (modified) (4 diffs)
• Mars/msql/MSQLServer.h (modified) (2 diffs)
• include-Classes/MMcFormat/MMcTrig.cxx (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -20 +20 @@
                                                  -*-*- END OF LINE -*-*-
 
+  2004/08/10: Thomas Bretz
+
+   * mreport/MReportFileReadCC.[h,cc]:
+     - added
+
+   * mreport/Makefile, mreport/ReportsLinkDef.h:
+     - added MReportFileReadCC
+
+   * mreport/MReport*.[h,cc]:
+     - prpagate file version number to all Interpreters
+
+   * merpp.cc:
+     - added new commandline options to support different CC files
+     - changed help-output
+
+   * readraw.cc:
+     - a small fix (a '.' was missing)
+
+   * mraw/MRawEvtData.cc:
+     - fixed bug in Print
+
+   * manalysis/MGeomApply.cc:
+     - changed to Init all MCamEvents in the parlist
+
+   * mbase/MParList.[h,cc]:
+     - added a cast operator to TIterator*
+     - check whether a automatic created class inherits from MParConatiner
+
+   * mgui/MCamEvent.[h,cc]:
+     - added Init
+     - added InitSize
+
+   * mmc/MMcTrig.cxx:
+     - added a new option to Print()
+
+   * mraw/MRawEvtData.[h,cc], mraw/MRawEvtHeader.[h,cc],
+     mraw/MRawFileRead.cc, mraw/MRawSocketRead.cc
+     - changed Init() to InitRead()
+
+   * msignal/MArrivalTime.[h,cc]:
+     - changed argument of InitSize according to MCamEvent
+
+   * msql/MSQLServer.[h,cc]:
+     - small changes to interface
+
+
+
   2004/08/10: Robert Wagner
 
-   * mreports/MReportCamera.[h,cc]
+   * mreport/MReportCamera.[h,cc]
      - added function InterpreteHOT which interprete the HOT* part of 
        the report. The variable HVs_modified_by_HOT_Pixels is 
@@ -29 +76 @@
 
 
+
   2004/08/10: Markus Gaug
 
@@ -42 +90 @@
      - implemented different way to calculate error of signal 
        in method kFlatCharge (as discussed with Keiichi).
+
 
 
@@ -53 +102 @@
      - change format of "Format"
      - change default value for fgMaxHiGainVar to 40
+
+
 
   2004/08/10: Nadia Tonello

trunk/MagicSoft/Mars/manalysis/MGeomApply.cc

@@ -118 +118 @@
 Bool_t MGeomApply::ReInit(MParList *pList)
 {
-    MGeomCam *cam = (MGeomCam*)pList->FindObject(AddSerialNumber("MGeomCam"));
-    if (!cam)
+    MGeomCam *geom = (MGeomCam*)pList->FindObject(AddSerialNumber("MGeomCam"));
+    if (!geom)
     {
        *fLog << err << GetDescriptor() << ": No MGeomCam found... aborting." << endl;
@@ -128 +128 @@
     // the use of some camera files from the 0.7 beta version in which the 
     // array containing pixel ratios is not initialized.
-    cam->CalcPixRatio();
-
+    geom->CalcPixRatio();
+
+    TIter Next(*pList);
+    TObject *o = 0;
+
+    while ((o=Next()))
+    {
+        MCamEvent *cam = dynamic_cast<MCamEvent*>(o);
+        if (cam)
+            cam->Init(*geom);
+    }
+/*
     MPedestalCam *ped = (MPedestalCam*)pList->FindObject(AddSerialNumber("MPedestalCam"));
     if (ped)
-        ped->Init(*cam);
+        ped->Init(*geom);
 
     MCalibrationCam *cal = (MCalibrationCam*)pList->FindObject(AddSerialNumber("MCalibrationChargeCam"));
     if (cal)
-        cal->Init(*cam);
+        cal->Init(*geom);
 
     MCalibrationCam *cat = (MCalibrationCam*)pList->FindObject(AddSerialNumber("MCalibrationRelTimeCam"));
     if (cat)
-        cat->Init(*cam);
+        cat->Init(*geom);
 
     MCalibrationCam *qe = (MCalibrationCam*)pList->FindObject(AddSerialNumber("MCalibrationQECam"));
     if (qe)
-        qe->Init(*cam);
+        qe->Init(*geom);
 
     MCalibrationCam *pcam = (MCalibrationCam*)pList->FindObject(AddSerialNumber("MCalibrationPedCam"));
     if (pcam)
-        pcam->Init(*cam);
+        pcam->Init(*geom);
 
     MPedPhotCam *pedphot = (MPedPhotCam*)pList->FindObject(AddSerialNumber("MPedPhotCam"));
     if (pedphot)
-        pedphot->Init(*cam);
+        pedphot->Init(*geom);
 
     MExtractedSignalCam *ext = (MExtractedSignalCam*)pList->FindObject(AddSerialNumber("MExtractedSignalCam"));
     if (ext)
-        ext->InitSize(cam->GetNumPixels());
+        ext->Init(*cam);
 
     MArrivalTimeCam *tme = (MArrivalTimeCam*)pList->FindObject(AddSerialNumber("MArrivalTimeCam"));
@@ -168 +178 @@
     MBadPixelsCam *bad = (MBadPixelsCam*)pList->FindObject(AddSerialNumber("MBadPixelsCam"));
     if (bad)
-      bad->InitSize(cam->GetNumPixels());
+        bad->InitSize(cam->GetNumPixels());
+    */
 
     return kTRUE;

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -515 +515 @@
     }
 
+    if (!cls->InheritsFrom(MParContainer::Class()))
+    {
+        *fLog << " - Class doesn't inherit from MParContainer." << endl;
+        return NULL;
+    }
+
     //
     // create the parameter container of the the given class type
@@ -936 +942 @@
     return kTRUE;
 }
+
+// --------------------------------------------------------------------------
+//
+// Can be used to create an iterator over all containers, eg:
+//   MParList plist;
+//   TIter Next(plist); // Be aware: Use a object here rather than a pointer!
+//   TObject *o=0;
+//   while ((o=Next()))
+//   {
+//       [...]
+//   }
+//
+MParList::operator TIterator*() const
+{
+    return new TOrdCollectionIter(fContainer);
+}

trunk/MagicSoft/Mars/mbase/MParList.h

@@ -94 +94 @@
     Bool_t WriteEnv(TEnv &env, TString prefix, Bool_t print=kFALSE) const;
 
+    operator TIterator*() const;
+
     ClassDef(MParList, 1) // list of parameter containers (MParContainer)
 };

trunk/MagicSoft/Mars/mgui/MCamEvent.cc

@@ -40 +40 @@
 #include "MCamEvent.h"
 
+#include "MGeomCam.h"
+
 ClassImp(MCamEvent);
+
+// --------------------------------------------------------------------------
+//
+// You can overwrite this function if you want the container to be
+// initialized by MGeomApply with the geometry. If it is not overloaded
+// it calls InitSize with the corresponding pixel number. If this information
+// is enough for you it is enough to overload InitSize.
+//
+void MCamEvent::Init(const MGeomCam &geom)
+{
+    InitSize(geom.GetNumPixels());
+}

trunk/MagicSoft/Mars/mgui/MCamEvent.h

@@ -14 +14 @@
     virtual void   DrawPixelContent(Int_t num) const = 0;
 
+    virtual void   Init(const MGeomCam &geom);
+    virtual void   InitSize(const UInt_t i) { } // Used by MGeomApply see Init()
+
     ClassDef(MCamEvent, 0) // A camera event
 };

trunk/MagicSoft/Mars/mraw/MRawEvtData.h

@@ -50 +50 @@
     ~MRawEvtData();
 
-    void Init(MRawRunHeader *rh, MRawCrateArray *arr)
+    void InitRead(MRawRunHeader *rh, MRawCrateArray *arr)
     {
         //

trunk/MagicSoft/Mars/mraw/MRawEvtHeader.cc

@@ -140 +140 @@
 // a raw binary file
 //
-void MRawEvtHeader::Init(MRawRunHeader *rh, MTime *t)
+void MRawEvtHeader::InitRead(MRawRunHeader *rh, MTime *t)
 {
     //

trunk/MagicSoft/Mars/mraw/MRawEvtHeader.h

@@ -53 +53 @@
     ~MRawEvtHeader();
 
-    void Init(MRawRunHeader *rh, MTime *t);
+    void InitRead(MRawRunHeader *rh, MTime *t);
 
     void Clear(Option_t * = NULL);

trunk/MagicSoft/Mars/mraw/MRawFileRead.cc

@@ -206 +206 @@
     // Run header must be valid!
     //
-    fRawEvtHeader->Init(fRawRunHeader, fRawEvtTime);
-    fRawEvtData  ->Init(fRawRunHeader, fRawCrateArray);
+    fRawEvtHeader->InitRead(fRawRunHeader, fRawEvtTime);
+    fRawEvtData  ->InitRead(fRawRunHeader, fRawCrateArray);
 
     //

trunk/MagicSoft/Mars/mraw/MRawSocketRead.cc

@@ -262 +262 @@
     // Run header must be valid!
     //
-    fRawEvtHeader->Init(fRawRunHeader, fRawEvtTime);
-    fRawEvtData  ->Init(fRawRunHeader, fRawCrateArray);
+    fRawEvtHeader->InitRead(fRawRunHeader, fRawEvtTime);
+    fRawEvtData  ->InitRead(fRawRunHeader, fRawCrateArray);
 
     if (!ReadEvent(*fIn))

trunk/MagicSoft/Mars/mraw/RawLinkDef.h

@@ -5 +5 @@
 #pragma link off all functions;
 
-#pragma link C++ class MRawRunHeader;
+#pragma link C++ class MRawRunHeader+;
 
-#pragma link C++ class MRawEvtHeader;
-#pragma link C++ class MRawEvtData;
+#pragma link C++ class MRawEvtHeader+;
+#pragma link C++ class MRawEvtData+;
 #pragma link C++ class MRawEvtPixelIter+;
 

trunk/MagicSoft/Mars/msignal/MArrivalTime.cc

@@ -67 +67 @@
 }
 
-void MArrivalTime::InitSize(Int_t i)
+void MArrivalTime::InitSize(const UInt_t i)
 {
   fData.Set(i);

trunk/MagicSoft/Mars/msignal/MArrivalTime.h

@@ -30 +30 @@
 
     void   Reset();
-    void   InitSize(Int_t i);
+    void   InitSize(const UInt_t i);
 
     UInt_t GetSize() const { return fData.GetSize(); }

trunk/MagicSoft/Mars/msql/MSQLServer.cc

@@ -221 +221 @@
 }
 
-void MSQLServer::PrintLine(const TArrayI &max) const /*FOLD00*/
+void MSQLServer::PrintLine(const TArrayI &max) /*FOLD00*/
 {
     cout << "+" << setfill('-');
@@ -229 +229 @@
 }
 
-void MSQLServer::PrintTable(TSQLResult *res) const /*FOLD00*/
-{
-    Int_t n = res->GetFieldCount();
+void MSQLServer::PrintTable(TSQLResult &res) /*FOLD00*/
+{
+    Int_t n = res.GetFieldCount();
 
     TArrayI max(n);
 
     for (int i=0; i<n; i++)
-        max[i] = strlen(res->GetFieldName(i));
+        max[i] = strlen(res.GetFieldName(i));
 
     TSQLRow *row;
 
     TList rows;
-    while ((row=res->Next()))
+    while ((row=res.Next()))
     {
         for (int i=0; i<n; i++)
@@ -254 +254 @@
     cout << "|" << setfill(' ');
     for (int i=0; i<n; i++)
-        cout << setw(max[i]+1) << res->GetFieldName(i) << " |";
+        cout << setw(max[i]+1) << res.GetFieldName(i) << " |";
     cout << endl;
 
@@ -305 +305 @@
     if (res)
     {
-        PrintTable(res);
+        PrintTable(*res);
         delete res;
     }

trunk/MagicSoft/Mars/msql/MSQLServer.h

@@ -28 +28 @@
     Bool_t PrintError(const char *txt, const char *q) const;
 
-    void PrintLine(const TArrayI &max) const;
-    void PrintTable(TSQLResult *res) const;
     TString GetFields() const;
 
@@ -84 +82 @@
     ~MSQLServer();
 
+    static void PrintLine(const TArrayI &max);
+    static void PrintTable(TSQLResult &res);
+
     const char *GetName() const;
 

trunk/MagicSoft/include-Classes/MMcFormat/MMcTrig.cxx

@@ -93 +93 @@
 }
 
-void MMcTrig::Print(Option_t *Option) const {
-  //
-  //  print out the data member on screen
-  //
-  Int_t i,j;
+void MMcTrig::Print(Option_t *option) const
+{
+    //
+    //  print out the data member on screen
+    //
+    cout << "Monte Carlo Trigger output:" << endl;
+    cout << " First Level Trigger in this Event: " << fNumFirstLevel << endl;
+    if (!TString(option).Contains("short"))
+    {
+        cout << " Times of first Level Trigger in this Event: ";
+        for (int i=0; i<fNumFirstLevel; i++)
+            cout << fTimeFirst[i] << " ";
+        cout << endl;
 
-  cout <<endl << "Monte Carlo Trigger output:" <<endl;
-  cout << " First  Level Trigger in this Event: "<<fNumFirstLevel<<endl; 
-  cout << " Times of first  Level Trigger in this Event: ";
-  for (i=0;i<fNumFirstLevel;i++){
-    cout<< fTimeFirst[i]<<"-";
-  }
-  cout<<endl;
-  cout << " Pixels of first  Level Trigger in this Event : ";
-  for (i=0;i<fNumFirstLevel;i++){
-    for(j=0;j<CAMERA_PIXELS/8+1;j++){
-      cout<<fPixelsFirst[j][i]<<"-";
+        cout << " Pixels of first  Level Trigger in this Event: ";
+        for (int i=0; i<fNumFirstLevel; i++)
+            for(int j=0; j<CAMERA_PIXELS/8+1; j++)
+                cout << (int)fPixelsFirst[j][i] << " ";
+        cout << endl;
     }
-  }
-  cout<<endl;
-  cout << " Second Level Trigger in this Event: " << fNumSecondLevel << endl; 
-  cout << endl ; 
+
+    cout << " Second Level Trigger in this Event: " << fNumSecondLevel << endl;
+    cout << endl;
 }