Author: [log in to unmask]
Date: Wed Aug 12 13:33:20 2015
New Revision: 3365
Log:
Revert r3363 on trunk.
Removed:
java/trunk/recon/src/main/java/org/hps/recon/filtering/FEEFilterDriver.java
java/trunk/steering-files/src/main/resources/org/hps/steering/users/baltzell/EngRun2015EcalOnly_GainFile.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/baltzell/EngRun2015EcalOnly_GainFile_FilterFEE.lcsim
Modified:
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverterDriver.java
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java Wed Aug 12 13:33:20 2015
@@ -4,11 +4,7 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.Map;
import org.hps.conditions.database.DatabaseConditionsManager;
@@ -55,42 +51,6 @@
*/
public class EcalRawConverter {
- private Map<Integer,Double> gainFileGains = new HashMap<Integer,Double>();
- public String gainFileName = null;
-
- private void readGainFile() {
- gainFileGains.clear();
- System.out.println("Reading ECal Gains from: "+gainFileName);
- File file = new File(gainFileName);
- try {
- FileReader reader = new FileReader(file);
- char[] chars = new char[(int) file.length()];
- reader.read(chars);
- String content = new String(chars);
- reader.close();
- String lines[]=content.split("\n");
- int nlines = 0;
- for (String line : lines) {
- String columns[] = line.split(" ");
- if (nlines++ > 0) {
- final int channelid = Integer.valueOf(columns[0]);
- final double gain = Double.valueOf(columns[1]);
- if (gainFileGains.containsKey(channelid)) {
- System.err.println("Duplicate Entries in ECal Gain File.");
- System.exit(2);
- }
- gainFileGains.put(channelid,gain);
- }
- }
- if (nlines != 442+1) {
- System.err.println("Invalid Gain File.");
- System.exit(3);
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
private boolean useTimeWalkCorrection = false;
private boolean useRunningPedestal = false;
private boolean constantGain = false;
@@ -615,12 +575,7 @@
if(useDAQConfig) {
//float gain = ConfigurationManager.getInstance().getFADCConfig().getGain(ecalConditions.getChannelCollection().findGeometric(cellID));
return config.getGain(cellID) * adcSum * EcalUtils.MeV;
- }
- else if (gainFileName!=null) {
- //System.err.println(findChannelId(cellID)+" "+gainFileGains.get(findChannelId(cellID)));
- return gainFileGains.get(findChannelId(cellID)) * adcSum * EcalUtils.MeV; //gain is defined as MeV/integrated ADC
- }
- else if(use2014Gain) {
+ } else if(use2014Gain) {
if (constantGain) {
return adcSum * EcalUtils.gainFactor * EcalUtils.ecalReadoutPeriod;
} else {
@@ -644,7 +599,6 @@
// ECAL combined conditions object.
ecalConditions = DatabaseConditionsManager.getInstance().getEcalConditions();
pulseFitter.setDetector(detector);
- if (gainFileName != null) readGainFile();
}
/**
@@ -656,8 +610,5 @@
public EcalChannelConstants findChannel(long cellID) {
return ecalConditions.getChannelConstants(ecalConditions.getChannelCollection().findGeometric(cellID));
}
- public Integer findChannelId(long cellID) {
- return ecalConditions.getChannelCollection().findGeometric(cellID).getChannelId();
- }
}
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverterDriver.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverterDriver.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverterDriver.java Wed Aug 12 13:33:20 2015
@@ -47,8 +47,6 @@
converter = new EcalRawConverter();
}
- public void setGainFile(String filename) { converter.gainFileName=filename; }
-
/*
* Set to <code>true</code> to use pulse fitting instead of arithmetic integration:<br/>
*/
