Changeset 4087

Timestamp:

05/17/04 11:36:24 (21 years ago)

Author:

rico

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp/mifae

Files:

• Changelog (modified) (1 diff)
• library/MSrcPlace.cc (modified) (4 diffs)
• library/MSrcPlace.h (modified) (2 diffs)
• library/MSrcPosFromFile.cc (modified) (3 diffs)
• library/MSrcRotate.cc (modified) (1 diff)
• library/MSrcTranslate.cc (modified) (2 diffs)
• library/MSrcTranslate.h (modified) (1 diff)
• programs/srcpos.datacard (modified) (1 diff)

trunk/MagicSoft/Mars/mtemp/mifae/Changelog

@@ -23 +23 @@
      library/MSrcTranslate.cc
      - Assign the internal histogram a class-dependent name
+     - Add some log lines to trace the classes behaviour
+     - Remove function SearchForSrcPos
 
    * library/MSrcPosFromFile.[cc,h]
-     - Correct behaviour for not found runs.
+     - Correct behaviour for not found runs
+     - Keep latest good MSrcPosCam to fill for next events
      - Initialize pointers to NULL
+     - Fill also MDCA
 
         

trunk/MagicSoft/Mars/mtemp/mifae/library/MSrcPlace.cc

@@ -30 +30 @@
 // It keeps a 2D histogram with the assigned positions, so that the same
 // distribution can be applied later to any data set (tipically the OFF data)
+// Classes inheritating MSrcPlace should override the ComputeNewSrcPosition() 
+// method and probably include a call to MsrcPlace::PreProcess in their
+// PreProcess method (see, e.g., MSrcPosFromFile or MSrcRotate classes)
 //
 //  Input Containers:
@@ -92 +95 @@
   if(fHistPos)
     delete fHistPos;
-}
-// -------------------------------------------------------------------------
-//
-// Look for/create the needed containers
-// Check whether RA and DEC have been initialized
-//
-Int_t MSrcPlace::SearchForSrcPos(MParList *pList)
-{
-    // look for/create MSrcPosCam
-  fSrcPos = (MSrcPosCam*)pList->FindObject(AddSerialNumber(fSrcPosName), "MSrcPosCam");
-  if (!fSrcPos)
-    {
-      *fLog << warn << AddSerialNumber(fSrcPosName) << " [MSrcPosCam] not found... creating default container." << endl;
-      fSrcPos = (MSrcPosCam*)pList->FindCreateObj("MSrcPosCam", AddSerialNumber(fSrcPosName));
-      if(!fSrcPos)
-        return kFALSE;
-    }
-
-  // look for/create MDCA
-  fDCA = (MDCA*)pList->FindObject(AddSerialNumber(fDCAName), "MDCA");
-  if (!fDCA)
-    {
-      *fLog << warn << AddSerialNumber(fDCAName) << " [MDCA] not found... creating default container." << endl;
-      fDCA = (MDCA*)pList->FindCreateObj("MDCA", AddSerialNumber(fDCAName));
-      if(!fDCA)
-        return kFALSE;
-    }
-
-  return kTRUE;
 }
 
@@ -146 +120 @@
 // -------------------------------------------------------------------------
 //
-// Look for needed containers
-//
-Int_t MSrcPlace::PreProcess(MParList* plist)
+// Look for needed containers.
+// Check processing mode and if histogram is filled in case kOff mode
+//
+Int_t MSrcPlace::PreProcess(MParList* pList)
 { 
-  return SearchForSrcPos(plist);
+    // look for/create MSrcPosCam
+  fSrcPos = (MSrcPosCam*)pList->FindObject(AddSerialNumber(fSrcPosName), "MSrcPosCam");
+  if (!fSrcPos)
+    {
+      *fLog << warn << AddSerialNumber(fSrcPosName) << " [MSrcPosCam] not found... creating default container." << endl;
+      fSrcPos = (MSrcPosCam*)pList->FindCreateObj("MSrcPosCam", AddSerialNumber(fSrcPosName));
+      if(!fSrcPos)
+        return kFALSE;
+    }
+
+  // look for/create MDCA
+  fDCA = (MDCA*)pList->FindObject(AddSerialNumber(fDCAName), "MDCA");
+  if (!fDCA)
+    {
+      *fLog << warn << AddSerialNumber(fDCAName) << " [MDCA] not found... creating default container." << endl;
+      fDCA = (MDCA*)pList->FindCreateObj("MDCA", AddSerialNumber(fDCAName));
+      if(!fDCA)
+        return kFALSE;
+    }
+
+  // check mode, look for a filled histogram in case kOff
+  if(fMode==kOn)
+    *fLog << inf << "MSrcPlace PreProcess Message: source postions will be stored in internal histo (" << fHistPos->GetName() << ")" << endl;
+  else
+    {
+      if(fHistPos->GetEntries())
+        *fLog << inf << "MSrcPlace PreProcess Message: source postions will be read from internal histo (" << fHistPos->GetName() << ")" << endl;
+      else
+        {
+          *fLog << err << "MSrcPlace PreProcess Error: source postions attempted to be read from empty histo (" << fHistPos->GetName() << ")" << endl;
+          return kFALSE;
+        }
+    }
+  return kTRUE;
 }
 
@@ -183 +191 @@
 Int_t MSrcPlace::PostProcess()
 {
-  *fLog << inf << endl;
-  *fLog << inf << "MSrcPlace::PostProcess Message: Created internal histogram with: ";
-  *fLog << inf << "Entries: " << fHistPos->GetEntries() << endl;
-  *fLog << inf << "X projection mean: " << fHistPos->ProjectionX()->GetMean() << endl;
-  *fLog << inf << "X projection rms:  " << fHistPos->ProjectionX()->GetRMS() << endl;
-  *fLog << inf << "Y projection mean: " << fHistPos->ProjectionY()->GetMean() << endl;
-  *fLog << inf << "Y projection rms:  " << fHistPos->ProjectionY()->GetRMS() << endl;
-  
+  if(fMode==kOn)
+    {
+      *fLog << inf << endl;
+      *fLog << inf << "MSrcPlace::PostProcess Message: Created internal histogram with: " << endl;
+      *fLog << inf << "Entries: " << fHistPos->GetEntries() << endl;
+      *fLog << inf << "X projection mean: " << fHistPos->ProjectionX()->GetMean() << endl;
+      *fLog << inf << "X projection rms:  " << fHistPos->ProjectionX()->GetRMS() << endl;
+      *fLog << inf << "Y projection mean: " << fHistPos->ProjectionY()->GetMean() << endl;
+      *fLog << inf << "Y projection rms:  " << fHistPos->ProjectionY()->GetRMS() << endl;
+    }
   return kTRUE;
 }

trunk/MagicSoft/Mars/mtemp/mifae/library/MSrcPlace.h

@@ -25 +25 @@
   OnOffMode_t  fMode;        //  On/Off data mode (write/read to/from the histogram)
 
-  virtual Int_t PreProcess(MParList *plist);
+  void  SavePosIntoHisto();
+  void  ReadPosFromHisto();
+
   virtual Int_t Process();
   virtual Int_t PostProcess();
 
-  void  SavePosIntoHisto();
-  void  ReadPosFromHisto();
-
+ protected:
+  virtual Int_t PreProcess(MParList *plist);
 
  public:
@@ -49 +50 @@
   MDCA*         GetDCA()             {return fDCA;}
   
-  Int_t SearchForSrcPos(MParList *plist);
   virtual Int_t ComputeNewSrcPosition() {return kTRUE;}
 

trunk/MagicSoft/Mars/mtemp/mifae/library/MSrcPosFromFile.cc

@@ -42 +42 @@
 #include "MRawRunHeader.h"
 #include "MSrcPosCam.h"
+#include "MDCA.h"
 
 #include "MLog.h"
@@ -92 +93 @@
 Int_t MSrcPosFromFile::PreProcess(MParList *pList)
 {
-  // Count the number of runs in the card with the source poistions
-  ReadSourcePositionsFile(kCount);
-  
-  if(!fRunList)
-    fRunList = new Int_t[fNumRuns];
-  if(!fRunSrcPos)
-    fRunSrcPos = new MSrcPosCam[fNumRuns];
-  if(!fRunMap)
-    fRunMap = new TExMap(fNumRuns);
-  
-  // Read card with the source poistions
-  ReadSourcePositionsFile(kRead);
-
-
-  if(!SearchForSrcPos(pList))
+  if(GetMode()==MSrcPlace::kOn)
+    {
+      // Count the number of runs in the card with the source poistions
+      ReadSourcePositionsFile(kCount);
+      
+      if(!fRunList)
+        fRunList = new Int_t[fNumRuns];
+      if(!fRunSrcPos)
+        fRunSrcPos = new MSrcPosCam[fNumRuns];
+      if(!fRunMap)
+        fRunMap = new TExMap(fNumRuns);
+      
+      // Read card with the source poistions
+      ReadSourcePositionsFile(kRead);
+    }
+
+  if(!MSrcPlace::PreProcess(pList))
     return kFALSE;
   
@@ -131 +134 @@
       fLastRun=run;
       MSrcPosCam* srcpos = (MSrcPosCam*)fRunMap->GetValue(run);
-      
-      Float_t x;
-      Float_t y;
-        
+
       *fLog << inf << "Source position for run " << run;
-      if (srcpos)
+
+      if(srcpos)
+        fLastValidSrcPosCam = srcpos;
+      else
+        *fLog << inf << " not found in file. Taking previous position: ";
+
+      if(fLastValidSrcPosCam)
         {
-          fLastValidSrcPosCam = srcpos;
-          x = srcpos->GetX();
-          y = srcpos->GetY();
-        }           
-      else if(fLastValidSrcPosCam)
-        {
-          x = fLastValidSrcPosCam->GetX();
-          y = fLastValidSrcPosCam->GetY();
-          
-          *fLog << inf << " not found in file. Taking previous position: ";
+          *fLog << inf << "\tX\t" << setprecision(3) << fLastValidSrcPosCam->GetX();
+          *fLog << inf << "\tY\t" << setprecision(3) << fLastValidSrcPosCam->GetY() << endl;      
         }
-      else
-        {
-          *fLog << err << "MSrcPosFromFile::ComputeNewSrcPosition error: no value for the first run. Don't know what values to take" << endl;
-          return kFALSE;
-        }
-
-      GetSrcPosCam()->SetXY(x,y);
-      
-      *fLog << inf << "\tX\t" << setprecision(3) << x;
-      *fLog << inf << "\tY\t" << setprecision(3) << y << endl;      
-    }
-  
+    }
+
+  if(fLastValidSrcPosCam)
+    {
+      GetSrcPosCam()->SetXY(fLastValidSrcPosCam->GetX(),fLastValidSrcPosCam->GetY());
+      GetDCA()->SetRefPoint(fLastValidSrcPosCam->GetX(),fLastValidSrcPosCam->GetY());
+    }
+  else
+    {
+      *fLog << err << "MSrcPosFromFile::ComputeNewSrcPosition error: no value for the first run. Don't know what values to take" << endl;
+      return kFALSE;
+    }
+
   return kTRUE;
 }

trunk/MagicSoft/Mars/mtemp/mifae/library/MSrcRotate.cc

@@ -83 +83 @@
 Int_t MSrcRotate::PreProcess(MParList *pList)
 {
-  if(!SearchForSrcPos(pList))
+  if(!MSrcPlace::PreProcess(pList))
     return kFALSE;
   

trunk/MagicSoft/Mars/mtemp/mifae/library/MSrcTranslate.cc

@@ -28 +28 @@
 // Task to translate the position of the source, starting from previous source
 // position (fTranslationIsRelative=kTRUE) or from camera center 
-// (fTranslationIsRelative=kFALSE)
+// (fTranslationIsRelative=kFALSE). This task allows you to modify the position
+// of the source in an event-by-event basis
 //
 //  Input Containers:
@@ -82 +83 @@
 {
   // look for/create MSrcPosCam and DCA
-  if(!SearchForSrcPos(pList))
+  if(!MSrcPlace::PreProcess(pList))
     return kFALSE;
 

trunk/MagicSoft/Mars/mtemp/mifae/library/MSrcTranslate.h

@@ -24 +24 @@
   virtual Int_t ComputeNewSrcPosition();
 
-  ClassDef(MSrcTranslate, 0) // task to rotate the position of the source as a function of Azimuth and Zenith angles
+  ClassDef(MSrcTranslate, 0) // task to set the position of the source within the camera in an event by event basis
 };
 

trunk/MagicSoft/Mars/mtemp/mifae/programs/srcpos.datacard

@@ -1 +1 @@
 
 // Maximun number of on and off events to be processed)
-NEVENTS 99999999
+NEVENTS 20000
 
 // Input file name pattern