Changeset 216 in Idarraga

Timestamp:

Jul 20, 2011, 1:30:42 AM (13 years ago)

Author:

idarraga

Message:

 

File:

• EUTelraw2mdm/AllPix_Frames_WriteToEntuple.cc (modified) (5 diffs)

EUTelraw2mdm/AllPix_Frames_WriteToEntuple.cc

@@ -6 +6 @@
 #include <iostream>
 
-#include "AllPix_Frames_WriteToEntuple.h"
-#include "allpix_dm.h"
+using namespace std;
 
-// geometry
-//#include "ReadGeoDescription.hh"
+#include "eudaq/AllPix_Frames_WriteToEntuple.h"
+#include "eudaq/allpix_dm.h"
+
 
 static WriteToNtuple ** instance = 0;
@@ -51 +51 @@
  *
  */
-WriteToNtuple * WriteToNtuple::GetInstance(TString dataset, TString tempdir, Int_t nOfDetectors, Int_t detID, TString openmode /* RECREATE */) {
+WriteToNtuple * WriteToNtuple::GetInstance(TString dataset, TString tempdir,
+                Int_t nOfDetectors, Int_t detID, int * detIdMap, TString openmode /* RECREATE */) {
 
         TString tempDataset = dataset;
 
         if (instance == 0) {
+
+                std::cout << "Creating Instances of WriteToNtuple" << std::endl;
 
                 instance = new WriteToNtuple * [nOfDetectors];
@@ -62 +65 @@
                 for(int detItr = 0 ; detItr < nOfDetectors ; detItr++) {
 
+                        //std::cout << "--> " << detIdMap[detItr] << std::endl;
+
                         tempDataset = dataset;
-                        tempDataset += detItr; // append detector id
+                        tempDataset += "_";
+                        tempDataset += detIdMap[detItr];
 
-                        instance[detItr] = new WriteToNtuple(tempDataset, tempdir, detItr, openmode);
-                        indexToDetectorIdMap[detItr] = detItr;
+                        instance[detItr] = new WriteToNtuple(tempDataset, tempdir, detIdMap[detItr], openmode);
+                        // this C-type array goes index --> detID
+                        indexToDetectorIdMap[detItr] = detIdMap[detItr];
 
                 }
@@ -79 +86 @@
 
         // If I get here is because I couldn't find the instance associated to the detID
-        std::cout << "[OUCH] ! det " << detID << " couldn't be found ... giving up." << std::endl;
+        std::cout << std::endl << "[OUCH] ! det " << detID << " couldn't be found ... giving up." << std::endl;
         exit(1);
 
@@ -93 +100 @@
         t2->Fill();
         // clean up
-        frameHandlerObj->RewindAll();
+        //frameHandlerObj->RewindAll();
+        // soft clean up (don't erase the pad size and det Id)
+        frameHandlerObj->RewindSoft();
 
 }